diff --git a/src/assets/animations/list.c b/src/assets/animations/list.c index 5e2dc823e..191939bf0 100644 --- a/src/assets/animations/list.c +++ b/src/assets/animations/list.c @@ -1,4 +1,5 @@ #include +#include "data.h" #include "types.h" extern u8 anim0000; diff --git a/src/assets/mpconfigs.c b/src/assets/mpconfigs.c index 2eaeaaff9..84f477de0 100644 --- a/src/assets/mpconfigs.c +++ b/src/assets/mpconfigs.c @@ -1,5 +1,6 @@ #include #include "constants.h" +#include "data.h" #include "types.h" struct mpconfig g_MpConfigs[] = { diff --git a/src/assets/mpstrings/jpn-final/mpstringsE.c b/src/assets/mpstrings/jpn-final/mpstringsE.c index 388ff82a8..5238ed119 100644 --- a/src/assets/mpstrings/jpn-final/mpstringsE.c +++ b/src/assets/mpstrings/jpn-final/mpstringsE.c @@ -1,5 +1,6 @@ #include #include "constants.h" +#include "data.h" #include "types.h" static struct mpstrings strings[] = { diff --git a/src/assets/mpstrings/jpn-final/mpstringsF.c b/src/assets/mpstrings/jpn-final/mpstringsF.c index 6d0ab7879..800f29a72 100644 --- a/src/assets/mpstrings/jpn-final/mpstringsF.c +++ b/src/assets/mpstrings/jpn-final/mpstringsF.c @@ -1,5 +1,6 @@ #include #include "constants.h" +#include "data.h" #include "types.h" static struct mpstrings strings[] = { diff --git a/src/assets/mpstrings/jpn-final/mpstringsG.c b/src/assets/mpstrings/jpn-final/mpstringsG.c index e6c1cf080..53390d28e 100644 --- a/src/assets/mpstrings/jpn-final/mpstringsG.c +++ b/src/assets/mpstrings/jpn-final/mpstringsG.c @@ -1,5 +1,6 @@ #include #include "constants.h" +#include "data.h" #include "types.h" static struct mpstrings strings[] = { diff --git a/src/assets/mpstrings/jpn-final/mpstringsI.c b/src/assets/mpstrings/jpn-final/mpstringsI.c index 889192f75..dcc68b171 100644 --- a/src/assets/mpstrings/jpn-final/mpstringsI.c +++ b/src/assets/mpstrings/jpn-final/mpstringsI.c @@ -1,5 +1,6 @@ #include #include "constants.h" +#include "data.h" #include "types.h" static struct mpstrings strings[] = { diff --git a/src/assets/mpstrings/jpn-final/mpstringsJ.c b/src/assets/mpstrings/jpn-final/mpstringsJ.c index 22bb99836..eedadcdad 100644 --- a/src/assets/mpstrings/jpn-final/mpstringsJ.c +++ b/src/assets/mpstrings/jpn-final/mpstringsJ.c @@ -1,5 +1,6 @@ #include #include "constants.h" +#include "data.h" #include "types.h" static struct mpstrings strings[] = { diff --git a/src/assets/mpstrings/jpn-final/mpstringsP.c b/src/assets/mpstrings/jpn-final/mpstringsP.c index 388ff82a8..5238ed119 100644 --- a/src/assets/mpstrings/jpn-final/mpstringsP.c +++ b/src/assets/mpstrings/jpn-final/mpstringsP.c @@ -1,5 +1,6 @@ #include #include "constants.h" +#include "data.h" #include "types.h" static struct mpstrings strings[] = { diff --git a/src/assets/mpstrings/jpn-final/mpstringsS.c b/src/assets/mpstrings/jpn-final/mpstringsS.c index a30e4c3f8..75aac9604 100644 --- a/src/assets/mpstrings/jpn-final/mpstringsS.c +++ b/src/assets/mpstrings/jpn-final/mpstringsS.c @@ -1,5 +1,6 @@ #include #include "constants.h" +#include "data.h" #include "types.h" static struct mpstrings strings[] = { diff --git a/src/assets/mpstrings/ntsc-1.0/mpstringsE.c b/src/assets/mpstrings/ntsc-1.0/mpstringsE.c index 388ff82a8..5238ed119 100644 --- a/src/assets/mpstrings/ntsc-1.0/mpstringsE.c +++ b/src/assets/mpstrings/ntsc-1.0/mpstringsE.c @@ -1,5 +1,6 @@ #include #include "constants.h" +#include "data.h" #include "types.h" static struct mpstrings strings[] = { diff --git a/src/assets/mpstrings/ntsc-1.0/mpstringsF.c b/src/assets/mpstrings/ntsc-1.0/mpstringsF.c index 9a62f0d13..a2bbbb7d4 100644 --- a/src/assets/mpstrings/ntsc-1.0/mpstringsF.c +++ b/src/assets/mpstrings/ntsc-1.0/mpstringsF.c @@ -1,5 +1,6 @@ #include #include "constants.h" +#include "data.h" #include "types.h" static struct mpstrings strings[] = { diff --git a/src/assets/mpstrings/ntsc-1.0/mpstringsG.c b/src/assets/mpstrings/ntsc-1.0/mpstringsG.c index 9a62f0d13..a2bbbb7d4 100644 --- a/src/assets/mpstrings/ntsc-1.0/mpstringsG.c +++ b/src/assets/mpstrings/ntsc-1.0/mpstringsG.c @@ -1,5 +1,6 @@ #include #include "constants.h" +#include "data.h" #include "types.h" static struct mpstrings strings[] = { diff --git a/src/assets/mpstrings/ntsc-1.0/mpstringsI.c b/src/assets/mpstrings/ntsc-1.0/mpstringsI.c index 9a62f0d13..a2bbbb7d4 100644 --- a/src/assets/mpstrings/ntsc-1.0/mpstringsI.c +++ b/src/assets/mpstrings/ntsc-1.0/mpstringsI.c @@ -1,5 +1,6 @@ #include #include "constants.h" +#include "data.h" #include "types.h" static struct mpstrings strings[] = { diff --git a/src/assets/mpstrings/ntsc-1.0/mpstringsJ.c b/src/assets/mpstrings/ntsc-1.0/mpstringsJ.c index e21768cb2..453f896d1 100644 --- a/src/assets/mpstrings/ntsc-1.0/mpstringsJ.c +++ b/src/assets/mpstrings/ntsc-1.0/mpstringsJ.c @@ -1,5 +1,6 @@ #include #include "constants.h" +#include "data.h" #include "types.h" static struct mpstrings strings[] = { diff --git a/src/assets/mpstrings/ntsc-1.0/mpstringsP.c b/src/assets/mpstrings/ntsc-1.0/mpstringsP.c index 9a62f0d13..a2bbbb7d4 100644 --- a/src/assets/mpstrings/ntsc-1.0/mpstringsP.c +++ b/src/assets/mpstrings/ntsc-1.0/mpstringsP.c @@ -1,5 +1,6 @@ #include #include "constants.h" +#include "data.h" #include "types.h" static struct mpstrings strings[] = { diff --git a/src/assets/mpstrings/ntsc-1.0/mpstringsS.c b/src/assets/mpstrings/ntsc-1.0/mpstringsS.c index 9a62f0d13..a2bbbb7d4 100644 --- a/src/assets/mpstrings/ntsc-1.0/mpstringsS.c +++ b/src/assets/mpstrings/ntsc-1.0/mpstringsS.c @@ -1,5 +1,6 @@ #include #include "constants.h" +#include "data.h" #include "types.h" static struct mpstrings strings[] = { diff --git a/src/assets/mpstrings/ntsc-beta/mpstringsE.c b/src/assets/mpstrings/ntsc-beta/mpstringsE.c index dc849f174..c51ec97f1 100644 --- a/src/assets/mpstrings/ntsc-beta/mpstringsE.c +++ b/src/assets/mpstrings/ntsc-beta/mpstringsE.c @@ -1,5 +1,6 @@ #include #include "constants.h" +#include "data.h" #include "types.h" static struct mpstrings strings[] = { diff --git a/src/assets/mpstrings/ntsc-beta/mpstringsF.c b/src/assets/mpstrings/ntsc-beta/mpstringsF.c index 9a62f0d13..a2bbbb7d4 100644 --- a/src/assets/mpstrings/ntsc-beta/mpstringsF.c +++ b/src/assets/mpstrings/ntsc-beta/mpstringsF.c @@ -1,5 +1,6 @@ #include #include "constants.h" +#include "data.h" #include "types.h" static struct mpstrings strings[] = { diff --git a/src/assets/mpstrings/ntsc-beta/mpstringsG.c b/src/assets/mpstrings/ntsc-beta/mpstringsG.c index 9a62f0d13..a2bbbb7d4 100644 --- a/src/assets/mpstrings/ntsc-beta/mpstringsG.c +++ b/src/assets/mpstrings/ntsc-beta/mpstringsG.c @@ -1,5 +1,6 @@ #include #include "constants.h" +#include "data.h" #include "types.h" static struct mpstrings strings[] = { diff --git a/src/assets/mpstrings/ntsc-beta/mpstringsI.c b/src/assets/mpstrings/ntsc-beta/mpstringsI.c index 9a62f0d13..a2bbbb7d4 100644 --- a/src/assets/mpstrings/ntsc-beta/mpstringsI.c +++ b/src/assets/mpstrings/ntsc-beta/mpstringsI.c @@ -1,5 +1,6 @@ #include #include "constants.h" +#include "data.h" #include "types.h" static struct mpstrings strings[] = { diff --git a/src/assets/mpstrings/ntsc-beta/mpstringsJ.c b/src/assets/mpstrings/ntsc-beta/mpstringsJ.c index e21768cb2..453f896d1 100644 --- a/src/assets/mpstrings/ntsc-beta/mpstringsJ.c +++ b/src/assets/mpstrings/ntsc-beta/mpstringsJ.c @@ -1,5 +1,6 @@ #include #include "constants.h" +#include "data.h" #include "types.h" static struct mpstrings strings[] = { diff --git a/src/assets/mpstrings/ntsc-beta/mpstringsP.c b/src/assets/mpstrings/ntsc-beta/mpstringsP.c index 9a62f0d13..a2bbbb7d4 100644 --- a/src/assets/mpstrings/ntsc-beta/mpstringsP.c +++ b/src/assets/mpstrings/ntsc-beta/mpstringsP.c @@ -1,5 +1,6 @@ #include #include "constants.h" +#include "data.h" #include "types.h" static struct mpstrings strings[] = { diff --git a/src/assets/mpstrings/ntsc-beta/mpstringsS.c b/src/assets/mpstrings/ntsc-beta/mpstringsS.c index 9a62f0d13..a2bbbb7d4 100644 --- a/src/assets/mpstrings/ntsc-beta/mpstringsS.c +++ b/src/assets/mpstrings/ntsc-beta/mpstringsS.c @@ -1,5 +1,6 @@ #include #include "constants.h" +#include "data.h" #include "types.h" static struct mpstrings strings[] = { diff --git a/src/assets/mpstrings/ntsc-final/mpstringsE.c b/src/assets/mpstrings/ntsc-final/mpstringsE.c index 388ff82a8..5238ed119 100644 --- a/src/assets/mpstrings/ntsc-final/mpstringsE.c +++ b/src/assets/mpstrings/ntsc-final/mpstringsE.c @@ -1,5 +1,6 @@ #include #include "constants.h" +#include "data.h" #include "types.h" static struct mpstrings strings[] = { diff --git a/src/assets/mpstrings/ntsc-final/mpstringsF.c b/src/assets/mpstrings/ntsc-final/mpstringsF.c index 9a62f0d13..a2bbbb7d4 100644 --- a/src/assets/mpstrings/ntsc-final/mpstringsF.c +++ b/src/assets/mpstrings/ntsc-final/mpstringsF.c @@ -1,5 +1,6 @@ #include #include "constants.h" +#include "data.h" #include "types.h" static struct mpstrings strings[] = { diff --git a/src/assets/mpstrings/ntsc-final/mpstringsG.c b/src/assets/mpstrings/ntsc-final/mpstringsG.c index 9a62f0d13..a2bbbb7d4 100644 --- a/src/assets/mpstrings/ntsc-final/mpstringsG.c +++ b/src/assets/mpstrings/ntsc-final/mpstringsG.c @@ -1,5 +1,6 @@ #include #include "constants.h" +#include "data.h" #include "types.h" static struct mpstrings strings[] = { diff --git a/src/assets/mpstrings/ntsc-final/mpstringsI.c b/src/assets/mpstrings/ntsc-final/mpstringsI.c index 9a62f0d13..a2bbbb7d4 100644 --- a/src/assets/mpstrings/ntsc-final/mpstringsI.c +++ b/src/assets/mpstrings/ntsc-final/mpstringsI.c @@ -1,5 +1,6 @@ #include #include "constants.h" +#include "data.h" #include "types.h" static struct mpstrings strings[] = { diff --git a/src/assets/mpstrings/ntsc-final/mpstringsJ.c b/src/assets/mpstrings/ntsc-final/mpstringsJ.c index e21768cb2..453f896d1 100644 --- a/src/assets/mpstrings/ntsc-final/mpstringsJ.c +++ b/src/assets/mpstrings/ntsc-final/mpstringsJ.c @@ -1,5 +1,6 @@ #include #include "constants.h" +#include "data.h" #include "types.h" static struct mpstrings strings[] = { diff --git a/src/assets/mpstrings/ntsc-final/mpstringsP.c b/src/assets/mpstrings/ntsc-final/mpstringsP.c index 9a62f0d13..a2bbbb7d4 100644 --- a/src/assets/mpstrings/ntsc-final/mpstringsP.c +++ b/src/assets/mpstrings/ntsc-final/mpstringsP.c @@ -1,5 +1,6 @@ #include #include "constants.h" +#include "data.h" #include "types.h" static struct mpstrings strings[] = { diff --git a/src/assets/mpstrings/ntsc-final/mpstringsS.c b/src/assets/mpstrings/ntsc-final/mpstringsS.c index 9a62f0d13..a2bbbb7d4 100644 --- a/src/assets/mpstrings/ntsc-final/mpstringsS.c +++ b/src/assets/mpstrings/ntsc-final/mpstringsS.c @@ -1,5 +1,6 @@ #include #include "constants.h" +#include "data.h" #include "types.h" static struct mpstrings strings[] = { diff --git a/src/assets/mpstrings/pal-beta/mpstringsE.c b/src/assets/mpstrings/pal-beta/mpstringsE.c index 388ff82a8..5238ed119 100644 --- a/src/assets/mpstrings/pal-beta/mpstringsE.c +++ b/src/assets/mpstrings/pal-beta/mpstringsE.c @@ -1,5 +1,6 @@ #include #include "constants.h" +#include "data.h" #include "types.h" static struct mpstrings strings[] = { diff --git a/src/assets/mpstrings/pal-beta/mpstringsF.c b/src/assets/mpstrings/pal-beta/mpstringsF.c index 8ffc87619..b379effb9 100644 --- a/src/assets/mpstrings/pal-beta/mpstringsF.c +++ b/src/assets/mpstrings/pal-beta/mpstringsF.c @@ -1,5 +1,6 @@ #include #include "constants.h" +#include "data.h" #include "types.h" static struct mpstrings strings[] = { diff --git a/src/assets/mpstrings/pal-beta/mpstringsG.c b/src/assets/mpstrings/pal-beta/mpstringsG.c index 5a6aedfc1..3c9e49c9b 100644 --- a/src/assets/mpstrings/pal-beta/mpstringsG.c +++ b/src/assets/mpstrings/pal-beta/mpstringsG.c @@ -1,5 +1,6 @@ #include #include "constants.h" +#include "data.h" #include "types.h" static struct mpstrings strings[] = { diff --git a/src/assets/mpstrings/pal-beta/mpstringsI.c b/src/assets/mpstrings/pal-beta/mpstringsI.c index 987b53af0..e8e2a61e9 100644 --- a/src/assets/mpstrings/pal-beta/mpstringsI.c +++ b/src/assets/mpstrings/pal-beta/mpstringsI.c @@ -1,5 +1,6 @@ #include #include "constants.h" +#include "data.h" #include "types.h" static struct mpstrings strings[] = { diff --git a/src/assets/mpstrings/pal-beta/mpstringsJ.c b/src/assets/mpstrings/pal-beta/mpstringsJ.c index e21768cb2..453f896d1 100644 --- a/src/assets/mpstrings/pal-beta/mpstringsJ.c +++ b/src/assets/mpstrings/pal-beta/mpstringsJ.c @@ -1,5 +1,6 @@ #include #include "constants.h" +#include "data.h" #include "types.h" static struct mpstrings strings[] = { diff --git a/src/assets/mpstrings/pal-beta/mpstringsP.c b/src/assets/mpstrings/pal-beta/mpstringsP.c index 388ff82a8..5238ed119 100644 --- a/src/assets/mpstrings/pal-beta/mpstringsP.c +++ b/src/assets/mpstrings/pal-beta/mpstringsP.c @@ -1,5 +1,6 @@ #include #include "constants.h" +#include "data.h" #include "types.h" static struct mpstrings strings[] = { diff --git a/src/assets/mpstrings/pal-beta/mpstringsS.c b/src/assets/mpstrings/pal-beta/mpstringsS.c index eadc4e902..b243f1ebf 100644 --- a/src/assets/mpstrings/pal-beta/mpstringsS.c +++ b/src/assets/mpstrings/pal-beta/mpstringsS.c @@ -1,5 +1,6 @@ #include #include "constants.h" +#include "data.h" #include "types.h" static struct mpstrings strings[] = { diff --git a/src/assets/mpstrings/pal-final/mpstringsE.c b/src/assets/mpstrings/pal-final/mpstringsE.c index 388ff82a8..5238ed119 100644 --- a/src/assets/mpstrings/pal-final/mpstringsE.c +++ b/src/assets/mpstrings/pal-final/mpstringsE.c @@ -1,5 +1,6 @@ #include #include "constants.h" +#include "data.h" #include "types.h" static struct mpstrings strings[] = { diff --git a/src/assets/mpstrings/pal-final/mpstringsF.c b/src/assets/mpstrings/pal-final/mpstringsF.c index 6d0ab7879..800f29a72 100644 --- a/src/assets/mpstrings/pal-final/mpstringsF.c +++ b/src/assets/mpstrings/pal-final/mpstringsF.c @@ -1,5 +1,6 @@ #include #include "constants.h" +#include "data.h" #include "types.h" static struct mpstrings strings[] = { diff --git a/src/assets/mpstrings/pal-final/mpstringsG.c b/src/assets/mpstrings/pal-final/mpstringsG.c index e6c1cf080..53390d28e 100644 --- a/src/assets/mpstrings/pal-final/mpstringsG.c +++ b/src/assets/mpstrings/pal-final/mpstringsG.c @@ -1,5 +1,6 @@ #include #include "constants.h" +#include "data.h" #include "types.h" static struct mpstrings strings[] = { diff --git a/src/assets/mpstrings/pal-final/mpstringsI.c b/src/assets/mpstrings/pal-final/mpstringsI.c index 889192f75..dcc68b171 100644 --- a/src/assets/mpstrings/pal-final/mpstringsI.c +++ b/src/assets/mpstrings/pal-final/mpstringsI.c @@ -1,5 +1,6 @@ #include #include "constants.h" +#include "data.h" #include "types.h" static struct mpstrings strings[] = { diff --git a/src/assets/mpstrings/pal-final/mpstringsJ.c b/src/assets/mpstrings/pal-final/mpstringsJ.c index e21768cb2..453f896d1 100644 --- a/src/assets/mpstrings/pal-final/mpstringsJ.c +++ b/src/assets/mpstrings/pal-final/mpstringsJ.c @@ -1,5 +1,6 @@ #include #include "constants.h" +#include "data.h" #include "types.h" static struct mpstrings strings[] = { diff --git a/src/assets/mpstrings/pal-final/mpstringsP.c b/src/assets/mpstrings/pal-final/mpstringsP.c index 388ff82a8..5238ed119 100644 --- a/src/assets/mpstrings/pal-final/mpstringsP.c +++ b/src/assets/mpstrings/pal-final/mpstringsP.c @@ -1,5 +1,6 @@ #include #include "constants.h" +#include "data.h" #include "types.h" static struct mpstrings strings[] = { diff --git a/src/assets/mpstrings/pal-final/mpstringsS.c b/src/assets/mpstrings/pal-final/mpstringsS.c index a30e4c3f8..75aac9604 100644 --- a/src/assets/mpstrings/pal-final/mpstringsS.c +++ b/src/assets/mpstrings/pal-final/mpstringsS.c @@ -1,5 +1,6 @@ #include #include "constants.h" +#include "data.h" #include "types.h" static struct mpstrings strings[] = { diff --git a/src/assets/textures/config.c b/src/assets/textures/config.c index 824964464..6b7f5b7af 100644 --- a/src/assets/textures/config.c +++ b/src/assets/textures/config.c @@ -1,4 +1,5 @@ #include +#include "data.h" #include "types.h" Gfx gdl000[] = { diff --git a/src/boot/entry.c b/src/boot/entry.c index 5f2ed72c7..0ca4d9707 100644 --- a/src/boot/entry.c +++ b/src/boot/entry.c @@ -1,13 +1,6 @@ #include #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" /** diff --git a/src/boot/init.c b/src/boot/init.c index 4ba7bc918..52fe7533a 100644 --- a/src/boot/init.c +++ b/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 diff --git a/src/boot/reset.c b/src/boot/reset.c index 0f2ee3e38..c0c31e1eb 100644 --- a/src/boot/reset.c +++ b/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( diff --git a/src/boot/sched.c b/src/boot/sched.c index 5a35cc470..5e5324339 100644 --- a/src/boot/sched.c +++ b/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) diff --git a/src/game/activemenu/activemenu.c b/src/game/activemenu/activemenu.c index 1ab6cf436..638b31e48 100644 --- a/src/game/activemenu/activemenu.c +++ b/src/game/activemenu/activemenu.c @@ -1,15 +1,6 @@ #include #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: diff --git a/src/game/activemenu/tick.c b/src/game/activemenu/tick.c index 677ee9b15..4727eb412 100644 --- a/src/game/activemenu/tick.c +++ b/src/game/activemenu/tick.c @@ -1,13 +1,6 @@ #include #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) diff --git a/src/game/atan2f.c b/src/game/atan2f.c index 6284ba75c..02a2ad0f5 100644 --- a/src/game/atan2f.c +++ b/src/game/atan2f.c @@ -1,5 +1,6 @@ #include #include "game/game_0969d0.h" +#include "data.h" #include "types.h" f32 atan2f(f32 x, f32 z) diff --git a/src/game/bondbike.c b/src/game/bondbike.c index 8161fad52..9c15b1c99 100644 --- a/src/game/bondbike.c +++ b/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) diff --git a/src/game/bondcutscene.c b/src/game/bondcutscene.c index 53903a24a..71c3dc675 100644 --- a/src/game/bondcutscene.c +++ b/src/game/bondcutscene.c @@ -1,14 +1,8 @@ #include #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) diff --git a/src/game/bondeyespy.c b/src/game/bondeyespy.c index df6fa869b..f978cdf0d 100644 --- a/src/game/bondeyespy.c +++ b/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; diff --git a/src/game/bondgrab.c b/src/game/bondgrab.c index 67462a644..4128aecd7 100644 --- a/src/game/bondgrab.c +++ b/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"; diff --git a/src/game/bondhead.c b/src/game/bondhead.c index 8a4235757..141454099 100644 --- a/src/game/bondhead.c +++ b/src/game/bondhead.c @@ -1,13 +1,6 @@ #include #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[] = { diff --git a/src/game/bondmove.c b/src/game/bondmove.c index 569cdf768..fa32340f6 100644 --- a/src/game/bondmove.c +++ b/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"; diff --git a/src/game/bondview.c b/src/game/bondview.c index 9847bbb03..b91ea716f 100644 --- a/src/game/bondview.c +++ b/src/game/bondview.c @@ -1,12 +1,5 @@ #include #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" diff --git a/src/game/bondwalk.c b/src/game/bondwalk.c index d3fee62c2..1ab975587 100644 --- a/src/game/bondwalk.c +++ b/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) diff --git a/src/game/camdraw.c b/src/game/camdraw.c index c309abb1b..fcd0965d5 100644 --- a/src/game/camdraw.c +++ b/src/game/camdraw.c @@ -1,13 +1,6 @@ #include #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"; diff --git a/src/game/casing/reset.c b/src/game/casing/reset.c index bd5085a18..83e26ae2c 100644 --- a/src/game/casing/reset.c +++ b/src/game/casing/reset.c @@ -1,6 +1,7 @@ #include #include "constants.h" #include "gvars/gvars.h" +#include "data.h" #include "types.h" GLOBAL_ASM( diff --git a/src/game/casing/tick.c b/src/game/casing/tick.c index 2e855b989..5ca827495 100644 --- a/src/game/casing/tick.c +++ b/src/game/casing/tick.c @@ -1,18 +1,12 @@ #include #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}; diff --git a/src/game/ceil.c b/src/game/ceil.c index 128dfa21d..a7bfc4e10 100644 --- a/src/game/ceil.c +++ b/src/game/ceil.c @@ -1,13 +1,7 @@ #include #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) diff --git a/src/game/cheats.c b/src/game/cheats.c index 7cf99974b..b548c3d95 100644 --- a/src/game/cheats.c +++ b/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 diff --git a/src/game/chr/chr.c b/src/game/chr/chr.c index 4acedef57..de50896d2 100644 --- a/src/game/chr/chr.c +++ b/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"; diff --git a/src/game/chr/chraction.c b/src/game/chr/chraction.c index 34db1e307..3e5aea3a2 100644 --- a/src/game/chr/chraction.c +++ b/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"; diff --git a/src/game/chr/chrai.c b/src/game/chr/chrai.c index 88fd9d58d..a427e262d 100644 --- a/src/game/chr/chrai.c +++ b/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) = { diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c index f3dcff6a2..499be7609 100644 --- a/src/game/chr/chraicommands.c +++ b/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" /** diff --git a/src/game/core.c b/src/game/core.c index a8ca8faaa..b384ba9c0 100644 --- a/src/game/core.c +++ b/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"; diff --git a/src/game/credits.c b/src/game/credits.c index 0da30e72f..e6b765d06 100644 --- a/src/game/credits.c +++ b/src/game/credits.c @@ -1,12 +1,5 @@ #include #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"; diff --git a/src/game/data/ailists.c b/src/game/data/ailists.c index 8c82868d4..d5575dab1 100644 --- a/src/game/data/ailists.c +++ b/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[] = { diff --git a/src/game/data/data_000000.c b/src/game/data/data_000000.c index ff39e7a50..fd41b79ee 100644 --- a/src/game/data/data_000000.c +++ b/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; diff --git a/src/game/data/data_003dc0.c b/src/game/data/data_003dc0.c index e2e6c87e6..810b0b025 100644 --- a/src/game/data/data_003dc0.c +++ b/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; diff --git a/src/game/data/data_020df0.c b/src/game/data/data_020df0.c index 9015bd203..d0913aa48 100644 --- a/src/game/data/data_020df0.c +++ b/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 diff --git a/src/game/debug.c b/src/game/debug.c index 2782581ad..7d95e8e3f 100644 --- a/src/game/debug.c +++ b/src/game/debug.c @@ -1,14 +1,8 @@ #include #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; diff --git a/src/game/dlights.c b/src/game/dlights.c index 6b7b56f9c..939166d43 100644 --- a/src/game/dlights.c +++ b/src/game/dlights.c @@ -1,13 +1,6 @@ #include #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"; diff --git a/src/game/endscreen.c b/src/game/endscreen.c index 3ec6b6a8e..924b2390c 100644 --- a/src/game/endscreen.c +++ b/src/game/endscreen.c @@ -1,13 +1,6 @@ #include #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) diff --git a/src/game/explosions/explosions.c b/src/game/explosions/explosions.c index 8dc4ebdfe..c265df780 100644 --- a/src/game/explosions/explosions.c +++ b/src/game/explosions/explosions.c @@ -1,13 +1,6 @@ #include #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"; diff --git a/src/game/explosions/init.c b/src/game/explosions/init.c index e6f0b58be..340dad720 100644 --- a/src/game/explosions/init.c +++ b/src/game/explosions/init.c @@ -1,14 +1,8 @@ #include #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) diff --git a/src/game/explosions/reset.c b/src/game/explosions/reset.c index 8b9708270..3b103bcd3 100644 --- a/src/game/explosions/reset.c +++ b/src/game/explosions/reset.c @@ -1,15 +1,9 @@ #include #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) diff --git a/src/game/file.c b/src/game/file.c index 9d780e9c5..9d2deb70e 100644 --- a/src/game/file.c +++ b/src/game/file.c @@ -1,12 +1,5 @@ #include #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; diff --git a/src/game/floor.c b/src/game/floor.c index 6e60a8a4a..3a25b9ae6 100644 --- a/src/game/floor.c +++ b/src/game/floor.c @@ -1,13 +1,7 @@ #include #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) diff --git a/src/game/game_000000.c b/src/game/game_000000.c index 36373bdc0..a8262ab12 100644 --- a/src/game/game_000000.c +++ b/src/game/game_000000.c @@ -1,15 +1,8 @@ #include #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) diff --git a/src/game/game_000090.c b/src/game/game_000090.c index 29acd1a51..343a41ac0 100644 --- a/src/game/game_000090.c +++ b/src/game/game_000090.c @@ -1,16 +1,10 @@ #include #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) diff --git a/src/game/game_000130.c b/src/game/game_000130.c index 0883b664e..c0281c903 100644 --- a/src/game/game_000130.c +++ b/src/game/game_000130.c @@ -1,16 +1,10 @@ #include #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}; diff --git a/src/game/game_000880.c b/src/game/game_000880.c index c7627cb4b..ebe6e8703 100644 --- a/src/game/game_000880.c +++ b/src/game/game_000880.c @@ -1,14 +1,8 @@ #include #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) diff --git a/src/game/game_005fd0.c b/src/game/game_005fd0.c index f771fe274..22d82fa41 100644 --- a/src/game/game_005fd0.c +++ b/src/game/game_005fd0.c @@ -1,18 +1,12 @@ #include #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[] = { diff --git a/src/game/game_006bd0.c b/src/game/game_006bd0.c index 175194fef..5117bf575 100644 --- a/src/game/game_006bd0.c +++ b/src/game/game_006bd0.c @@ -1,13 +1,6 @@ #include #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) diff --git a/src/game/game_00b190.c b/src/game/game_00b190.c index 0d17cfe6f..3794c3bcf 100644 --- a/src/game/game_00b190.c +++ b/src/game/game_00b190.c @@ -1,15 +1,9 @@ #include #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) diff --git a/src/game/game_00b210.c b/src/game/game_00b210.c index d548d3094..4708f2f99 100644 --- a/src/game/game_00b210.c +++ b/src/game/game_00b210.c @@ -1,15 +1,9 @@ #include #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) diff --git a/src/game/game_00b320.c b/src/game/game_00b320.c index d286a4a9c..ded2c9e11 100644 --- a/src/game/game_00b320.c +++ b/src/game/game_00b320.c @@ -1,16 +1,10 @@ #include #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) diff --git a/src/game/game_00b480.c b/src/game/game_00b480.c index c46c6ae82..a84a53782 100644 --- a/src/game/game_00b480.c +++ b/src/game/game_00b480.c @@ -1,17 +1,11 @@ #include #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) diff --git a/src/game/game_00b820.c b/src/game/game_00b820.c index 058952856..e04d9427c 100644 --- a/src/game/game_00b820.c +++ b/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] = { diff --git a/src/game/game_00c240.c b/src/game/game_00c240.c index 2884c1a31..f08faa845 100644 --- a/src/game/game_00c240.c +++ b/src/game/game_00c240.c @@ -1,16 +1,10 @@ #include #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) diff --git a/src/game/game_00c490.c b/src/game/game_00c490.c index bba803e10..1749b2cac 100644 --- a/src/game/game_00c490.c +++ b/src/game/game_00c490.c @@ -1,16 +1,6 @@ #include #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 = { diff --git a/src/game/game_0108d0.c b/src/game/game_0108d0.c index 65616e23a..5e19fa563 100644 --- a/src/game/game_0108d0.c +++ b/src/game/game_0108d0.c @@ -1,14 +1,8 @@ #include #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) diff --git a/src/game/game_010b20.c b/src/game/game_010b20.c index 9e1a662e4..b26a60d71 100644 --- a/src/game/game_010b20.c +++ b/src/game/game_010b20.c @@ -1,17 +1,11 @@ #include #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; diff --git a/src/game/game_011110.c b/src/game/game_011110.c index dd6740272..4061840bf 100644 --- a/src/game/game_011110.c +++ b/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) diff --git a/src/game/game_0125a0.c b/src/game/game_0125a0.c index 712ac38f7..14a53ea1a 100644 --- a/src/game/game_0125a0.c +++ b/src/game/game_0125a0.c @@ -1,12 +1,5 @@ #include #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( diff --git a/src/game/game_012d50.c b/src/game/game_012d50.c index 0c8a51802..459f99af5 100644 --- a/src/game/game_012d50.c +++ b/src/game/game_012d50.c @@ -1,15 +1,9 @@ #include #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/pad.h" #include "gvars/gvars.h" #include "lib/memory.h" +#include "data.h" #include "types.h" void waypointsLoad(void) diff --git a/src/game/game_013550.c b/src/game/game_013550.c index 8e0b62354..c384b58d0 100644 --- a/src/game/game_013550.c +++ b/src/game/game_013550.c @@ -1,14 +1,8 @@ #include #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" /** diff --git a/src/game/game_013b80.c b/src/game/game_013b80.c index 4cf3bd771..fbcfcd85a 100644 --- a/src/game/game_013b80.c +++ b/src/game/game_013b80.c @@ -1,14 +1,8 @@ #include #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 func0f013b80(void) diff --git a/src/game/game_013cf0.c b/src/game/game_013cf0.c index 6d4b2794b..5b6af3782 100644 --- a/src/game/game_013cf0.c +++ b/src/game/game_013cf0.c @@ -1,16 +1,10 @@ #include #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_013cf0.h" #include "game/room.h" #include "game/file.h" #include "gvars/gvars.h" +#include "data.h" #include "types.h" void stageLoadTiles(void) diff --git a/src/game/game_013ee0.c b/src/game/game_013ee0.c index 97667d402..397658184 100644 --- a/src/game/game_013ee0.c +++ b/src/game/game_013ee0.c @@ -1,18 +1,12 @@ #include #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_013ee0.h" #include "game/room.h" #include "game/pad.h" #include "gvars/gvars.h" #include "lib/memory.h" #include "lib/lib_233c0.h" +#include "data.h" #include "types.h" void func0f013ee0(void) diff --git a/src/game/game_0147a0.c b/src/game/game_0147a0.c index daf6e4f8b..7a044327b 100644 --- a/src/game/game_0147a0.c +++ b/src/game/game_0147a0.c @@ -1,13 +1,7 @@ #include #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" void func0f0147a0(u32 stagenum) diff --git a/src/game/game_0147d0.c b/src/game/game_0147d0.c index e7b923a97..b280e4f76 100644 --- a/src/game/game_0147d0.c +++ b/src/game/game_0147d0.c @@ -1,12 +1,5 @@ #include #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_0147d0.h" #include "game/chr/chr.h" #include "game/game_02cde0.h" @@ -18,6 +11,7 @@ #include "lib/model.h" #include "lib/rng.h" #include "lib/lib_16110.h" +#include "data.h" #include "types.h" void func0f0147d0(void) diff --git a/src/game/game_014f10.c b/src/game/game_014f10.c index 73949d096..edabb8634 100644 --- a/src/game/game_014f10.c +++ b/src/game/game_014f10.c @@ -1,17 +1,11 @@ #include #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_014f10.h" #include "game/chr/chr.h" #include "game/prop.h" #include "game/propobj.h" #include "gvars/gvars.h" +#include "data.h" #include "types.h" void chrsReset(void) diff --git a/src/game/game_015010.c b/src/game/game_015010.c index 576a9cc06..81f35c4c1 100644 --- a/src/game/game_015010.c +++ b/src/game/game_015010.c @@ -1,16 +1,10 @@ #include #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_015010.h" #include "game/game_091e10.h" #include "game/propobj.h" #include "gvars/gvars.h" +#include "data.h" #include "types.h" void func0f015010(void) diff --git a/src/game/game_0150a0.c b/src/game/game_0150a0.c index 2d307bd9e..620af2aeb 100644 --- a/src/game/game_0150a0.c +++ b/src/game/game_0150a0.c @@ -1,15 +1,9 @@ #include #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_0e9d0.h" #include "lib/lib_317f0.h" +#include "data.h" #include "types.h" void func0f0150a0(void) diff --git a/src/game/game_015470.c b/src/game/game_015470.c index b544238fa..1a1e9fa99 100644 --- a/src/game/game_015470.c +++ b/src/game/game_015470.c @@ -1,18 +1,12 @@ #include #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_015470.h" #include "game/game_01afc0.h" #include "gvars/gvars.h" #include "lib/lib_09660.h" #include "lib/dma.h" #include "lib/lib_317f0.h" +#include "data.h" #include "types.h" const u32 var7f1a83b0[] = {0x459c4000}; diff --git a/src/game/game_01afc0.c b/src/game/game_01afc0.c index 2ff5e6439..d394dbbab 100644 --- a/src/game/game_01afc0.c +++ b/src/game/game_01afc0.c @@ -1,14 +1,8 @@ #include #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_09660.h" +#include "data.h" #include "types.h" Gfx *func0f01afc0(Gfx *gdl) diff --git a/src/game/game_01b0a0.c b/src/game/game_01b0a0.c index 63ad7a687..ea5d7d206 100644 --- a/src/game/game_01b0a0.c +++ b/src/game/game_01b0a0.c @@ -1,12 +1,5 @@ #include #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_01b0a0.h" #include "game/game_097ba0.h" #include "game/game_0b0fd0.h" @@ -14,6 +7,7 @@ #include "game/game_127910.h" #include "game/options.h" #include "gvars/gvars.h" +#include "data.h" #include "types.h" f32 pdmodeGetReaction(void) diff --git a/src/game/game_01bea0.c b/src/game/game_01bea0.c index 1a1809032..a510396b3 100644 --- a/src/game/game_01bea0.c +++ b/src/game/game_01bea0.c @@ -1,13 +1,5 @@ #include #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 "game/game_005fd0.h" #include "game/title.h" #include "game/game_01b0a0.h" @@ -31,6 +23,7 @@ #include "lib/lib_09660.h" #include "lib/main.h" #include "lib/lib_0e9d0.h" +#include "data.h" #include "types.h" const char var7f1a85b0[] = "lvup: %d\n"; diff --git a/src/game/game_01d860.c b/src/game/game_01d860.c index db2be872d..0c8c87820 100644 --- a/src/game/game_01d860.c +++ b/src/game/game_01d860.c @@ -1,15 +1,8 @@ #include #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 "game/game_1668e0.h" #include "gvars/gvars.h" +#include "data.h" #include "types.h" void func0f01d860(void) diff --git a/src/game/game_01d990.c b/src/game/game_01d990.c index 48fd8a065..9e219bf4f 100644 --- a/src/game/game_01d990.c +++ b/src/game/game_01d990.c @@ -1,14 +1,8 @@ #include #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_01d990.h" #include "gvars/gvars.h" +#include "data.h" #include "types.h" void func0f01d990(void) diff --git a/src/game/game_02cde0.c b/src/game/game_02cde0.c index fee2d2807..e305d2f5e 100644 --- a/src/game/game_02cde0.c +++ b/src/game/game_02cde0.c @@ -2,13 +2,6 @@ #include "constants.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/chr/chr.h" #include "game/game_02cde0.h" #include "game/prop.h" @@ -25,6 +18,7 @@ #include "lib/rng.h" #include "lib/lib_16110.h" #include "lib/lib_233c0.h" +#include "data.h" #include "types.h" s32 g_NumBondBodies = 0; diff --git a/src/game/game_091e10.c b/src/game/game_091e10.c index 3b99fe3e5..dd2be68ff 100644 --- a/src/game/game_091e10.c +++ b/src/game/game_091e10.c @@ -1,12 +1,5 @@ #include #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 "game/game_091e10.h" #include "game/game_0b28d0.h" @@ -14,6 +7,7 @@ #include "game/game_1a7560.h" #include "game/propobj.h" #include "gvars/gvars.h" +#include "data.h" #include "types.h" u32 setupGetCommandLength(u32 *cmd) diff --git a/src/game/game_092610.c b/src/game/game_092610.c index b76448ebe..4bdd067c8 100644 --- a/src/game/game_092610.c +++ b/src/game/game_092610.c @@ -1,13 +1,6 @@ #include #include "constants.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_02da90.h" #include "game/dlights.h" #include "game/game_092610.h" #include "game/atan2f.h" @@ -21,6 +14,7 @@ #include "lib/rng.h" #include "lib/lib_16110.h" #include "lib/lib_317f0.h" +#include "data.h" #include "types.h" const char var7f1ab400[] = "Propsnd : USING TIME 60\n"; diff --git a/src/game/game_096360.c b/src/game/game_096360.c index c123ac762..b77c47941 100644 --- a/src/game/game_096360.c +++ b/src/game/game_096360.c @@ -1,12 +1,5 @@ #include #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_095320.h" #include "game/game_096360.h" #include "game/game_0b3350.h" @@ -16,6 +9,7 @@ #include "lib/rng.h" #include "lib/lib_159b0.h" #include "lib/lib_16110.h" +#include "data.h" #include "types.h" const u32 var7f1ab800[] = {0x40c907a9}; diff --git a/src/game/game_096700.c b/src/game/game_096700.c index 6dcf6b278..2349ceb46 100644 --- a/src/game/game_096700.c +++ b/src/game/game_096700.c @@ -1,14 +1,8 @@ #include #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_16110.h" +#include "data.h" #include "types.h" f32 func0f096700(f32 value) diff --git a/src/game/game_096890.c b/src/game/game_096890.c index c1229dcee..58421f785 100644 --- a/src/game/game_096890.c +++ b/src/game/game_096890.c @@ -1,14 +1,8 @@ #include #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_096890.h" #include "gvars/gvars.h" +#include "data.h" #include "types.h" u16 var8006ae90[] = { diff --git a/src/game/game_0969d0.c b/src/game/game_0969d0.c index 8fc9e3a59..ed6e04bd1 100644 --- a/src/game/game_0969d0.c +++ b/src/game/game_0969d0.c @@ -1,14 +1,8 @@ #include #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_096890.h" #include "gvars/gvars.h" +#include "data.h" #include "types.h" f32 func0f0969d0(f32 value) diff --git a/src/game/game_096b20.c b/src/game/game_096b20.c index 7c3f686ce..ba6474cec 100644 --- a/src/game/game_096b20.c +++ b/src/game/game_096b20.c @@ -1,13 +1,7 @@ #include #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" void func0f096b20(struct coord *arg0, struct coord *arg1, f32 standfrac, struct coord *vel) diff --git a/src/game/game_096ca0.c b/src/game/game_096ca0.c index 98e29fb14..e28eb2632 100644 --- a/src/game/game_096ca0.c +++ b/src/game/game_096ca0.c @@ -1,16 +1,10 @@ #include #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_0969d0.h" #include "game/game_096ca0.h" #include "gvars/gvars.h" #include "lib/lib_16110.h" +#include "data.h" #include "types.h" const u32 var7f1ab870[] = {0x3c23d70a}; diff --git a/src/game/game_097a50.c b/src/game/game_097a50.c index a6e1d7eee..d0646bb5c 100644 --- a/src/game/game_097a50.c +++ b/src/game/game_097a50.c @@ -1,13 +1,7 @@ #include #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 func0f097a50(f32 value) diff --git a/src/game/game_097aa0.c b/src/game/game_097aa0.c index bb851bafc..2c74fc693 100644 --- a/src/game/game_097aa0.c +++ b/src/game/game_097aa0.c @@ -1,15 +1,9 @@ #include #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_097a50.h" #include "game/game_097aa0.h" #include "gvars/gvars.h" +#include "data.h" #include "types.h" GLOBAL_ASM( diff --git a/src/game/game_097ba0.c b/src/game/game_097ba0.c index 8ae07536f..6d355222f 100644 --- a/src/game/game_097ba0.c +++ b/src/game/game_097ba0.c @@ -3,13 +3,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/inventory/items.h" #include "game/game_005fd0.h" #include "game/chr/chr.h" @@ -52,6 +45,7 @@ #include "lib/lib_16110.h" #include "lib/lib_233c0.h" #include "lib/lib_317f0.h" +#include "data.h" #include "types.h" u32 var80070090 = 0x96969600; diff --git a/src/game/game_0abe70.c b/src/game/game_0abe70.c index 6d688475a..cde6364de 100644 --- a/src/game/game_0abe70.c +++ b/src/game/game_0abe70.c @@ -1,12 +1,5 @@ #include #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_0969d0.h" #include "game/game_097ba0.h" #include "game/game_0abe70.h" @@ -19,6 +12,7 @@ #include "lib/rng.h" #include "lib/lib_159b0.h" #include "lib/lib_16110.h" +#include "data.h" #include "types.h" const u32 var7f1acc10[] = {0x73703100}; diff --git a/src/game/game_0b0fd0.c b/src/game/game_0b0fd0.c index 6796f665f..e8469edb7 100644 --- a/src/game/game_0b0fd0.c +++ b/src/game/game_0b0fd0.c @@ -1,13 +1,6 @@ #include #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/inventory/items.h" #include "game/game_097ba0.h" #include "game/game_0b0fd0.h" @@ -20,6 +13,7 @@ #include "game/mplayer/mplayer.h" #include "game/options.h" #include "gvars/gvars.h" +#include "data.h" #include "types.h" struct weapon *weaponFindById(s32 itemid) diff --git a/src/game/game_0b2150.c b/src/game/game_0b2150.c index c9fdabc46..2979943fc 100644 --- a/src/game/game_0b2150.c +++ b/src/game/game_0b2150.c @@ -1,15 +1,9 @@ #include #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_0b2150.h" #include "gvars/gvars.h" #include "lib/lib_09660.h" +#include "data.h" #include "types.h" const char var7f1aceb0[] = "MOT : Type 1 = %d/%d (%d)"; diff --git a/src/game/game_0b28d0.c b/src/game/game_0b28d0.c index 420a39dea..5fb006a44 100644 --- a/src/game/game_0b28d0.c +++ b/src/game/game_0b28d0.c @@ -1,15 +1,9 @@ #include #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_0b28d0.h" #include "gvars/gvars.h" #include "lib/memory.h" +#include "data.h" #include "types.h" u32 var800705a0 = 0x00000000; diff --git a/src/game/game_0b3350.c b/src/game/game_0b3350.c index 9f18e7644..8e67d9a45 100644 --- a/src/game/game_0b3350.c +++ b/src/game/game_0b3350.c @@ -1,12 +1,5 @@ #include #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/atan2f.h" #include "game/game_0b3350.h" #include "game/game_127910.h" @@ -15,6 +8,7 @@ #include "game/game_173a00.h" #include "gvars/gvars.h" #include "lib/lib_16110.h" +#include "data.h" #include "types.h" s32 func0f0b3350(s32 value) diff --git a/src/game/game_0b63b0.c b/src/game/game_0b63b0.c index 27108bc66..431ad641c 100644 --- a/src/game/game_0b63b0.c +++ b/src/game/game_0b63b0.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/inventory/items.h" #include "game/nbomb.h" #include "game/title.h" @@ -66,6 +59,7 @@ #include "lib/lib_16110.h" #include "lib/lib_233c0.h" #include "lib/lib_317f0.h" +#include "data.h" #include "types.h" const char var7f1ad160[] = "ACOUSTIC -> Allocating %d bytes for %d portal AV structures\n"; diff --git a/src/game/game_0b69d0.c b/src/game/game_0b69d0.c index b5f3a9a05..9d184afca 100644 --- a/src/game/game_0b69d0.c +++ b/src/game/game_0b69d0.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/inventory/items.h" #include "game/nbomb.h" #include "game/title.h" @@ -69,6 +62,7 @@ #include "lib/lib_16110.h" #include "lib/lib_233c0.h" #include "lib/lib_317f0.h" +#include "data.h" #include "types.h" const char var7f1ad420[] = "Gunmem: 0x%08x\n"; diff --git a/src/game/game_0c33f0.c b/src/game/game_0c33f0.c index bbf2fd05d..b2712cf98 100644 --- a/src/game/game_0c33f0.c +++ b/src/game/game_0c33f0.c @@ -1,13 +1,7 @@ #include #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" GLOBAL_ASM( diff --git a/src/game/game_0d4690.c b/src/game/game_0d4690.c index a8774ccb0..24ecd7857 100644 --- a/src/game/game_0d4690.c +++ b/src/game/game_0d4690.c @@ -1,12 +1,5 @@ #include #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_0b3350.h" #include "game/game_0d4690.h" #include "game/file.h" @@ -16,6 +9,7 @@ #include "lib/main.h" #include "lib/lib_159b0.h" #include "lib/lib_16110.h" +#include "data.h" #include "types.h" const u32 var7f1adba0[] = {0x74786d75}; diff --git a/src/game/game_0e0770.c b/src/game/game_0e0770.c index 9a7d3f33b..5756292e6 100644 --- a/src/game/game_0e0770.c +++ b/src/game/game_0e0770.c @@ -1,12 +1,5 @@ #include #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/game_097ba0.h" #include "game/game_0b3350.h" @@ -21,6 +14,7 @@ #include "lib/rng.h" #include "lib/lib_159b0.h" #include "lib/lib_16110.h" +#include "data.h" #include "types.h" const u32 var7f1adf00[] = {0x63636363}; diff --git a/src/game/game_0f09f0.c b/src/game/game_0f09f0.c index 271c5dbf4..9ad13091e 100644 --- a/src/game/game_0f09f0.c +++ b/src/game/game_0f09f0.c @@ -1,13 +1,6 @@ #include #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_005fd0.h" #include "game/game_006bd0.h" #include "game/game_02cde0.h" @@ -46,8 +39,17 @@ #include "lib/lib_159b0.h" #include "lib/lib_16110.h" #include "lib/lib_317f0.h" +#include "data.h" #include "types.h" +struct menudialog g_PakCannotReadGameBoyMenuDialog; +struct menudialog g_PakDamagedMenuDialog; +struct menudialog g_PakDataLostMenuDialog; +struct menudialog g_PakFullMenuDialog; +struct menudialog g_PakRemovedMenuDialog; +struct menudialog g_PakRepairFailedMenuDialog; +struct menudialog g_PakRepairSuccessMenuDialog; + const struct menucolourpalette g_MenuColourPalettes[] = { { 0x20202000, 0x20202000, 0x20202000, 0x4f4f4f00, 0x00000000, 0x00000000, 0x4f4f4f00, 0x4f4f4f00, 0x4f4f4f00, 0x4f4f4f00, 0x00000000, 0x00000000, 0x4f4f4f00, 0x00000000, 0x00000000 }, { 0x0060bf7f, 0x0000507f, 0x00f0ff7f, 0xffffffff, 0x00002f7f, 0x00006f7f, 0x00ffffff, 0x007f7fff, 0xffffffff, 0x8fffffff, 0x000044ff, 0x000030ff, 0x7f7fffff, 0xffffffff, 0x6644ff7f }, diff --git a/src/game/game_102240.c b/src/game/game_102240.c index ad3628f14..59138ae20 100644 --- a/src/game/game_102240.c +++ b/src/game/game_102240.c @@ -1,14 +1,5 @@ #include #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 "game/data/data_02e820.h" #include "game/cheats.h" #include "game/game_00c490.h" #include "game/title.h" @@ -36,8 +27,13 @@ #include "lib/lib_09660.h" #include "lib/main.h" #include "lib/lib_0e9d0.h" +#include "data.h" #include "types.h" +struct menudialog g_2PMissionControlStyleMenuDialog; +struct menudialog g_CiControlPlayer2MenuDialog; +struct menudialog g_CinemaMenuDialog; + char *menuTextCurrentStageName(struct menuitem *item) { sprintf(g_StringPointer, "%s\n", langGet(g_StageNames[g_MissionConfig.stageindex].name3)); diff --git a/src/game/game_107fb0.c b/src/game/game_107fb0.c index ade1fb2cf..1637c9373 100644 --- a/src/game/game_107fb0.c +++ b/src/game/game_107fb0.c @@ -1,12 +1,5 @@ #include #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_0b3350.h" #include "game/game_0d4690.h" #include "game/game_0f09f0.h" @@ -20,8 +13,29 @@ #include "gvars/gvars.h" #include "lib/lib_09660.h" #include "lib/lib_126b0.h" +#include "data.h" #include "types.h" +// These might be able to be removed by relocating their symbols +struct menudialog g_FilemgrCopyMenuDialog; +struct menudialog g_FilemgrConfirmDeleteMenuDialog; +struct menudialog g_FilemgrDeleteMenuDialog; +struct menudialog g_FilemgrDuplicateNameMenuDialog; +struct menudialog g_FilemgrEnterNameMenuDialog; +struct menudialog g_FilemgrErrorMenuDialog; +struct menudialog g_FilemgrFileInUseMenuDialog; +struct menudialog g_FilemgrFileLostMenuDialog; +struct menudialog g_FilemgrFileSavedMenuDialog; +struct menudialog g_FilemgrFileSelectMenuDialog; +struct menudialog g_FilemgrRenameMenuDialog; +struct menudialog g_FilemgrSaveElsewhereMenuDialog; +struct menudialog g_FilemgrSaveErrorMenuDialog; +struct menudialog g_FilemgrSelectLocationMenuDialog; +struct menudialog g_PakDeleteNoteMenuDialog; +struct menudialog g_PakGameNotesMenuDialog; +struct menudialog g_PakNotOriginalMenuDialog; +struct pakdata *g_EditingPak; + char *filemgrGetDeviceName(s32 index) { u16 names[] = { diff --git a/src/game/game_10c9c0.c b/src/game/game_10c9c0.c index ea592518f..dbdabab36 100644 --- a/src/game/game_10c9c0.c +++ b/src/game/game_10c9c0.c @@ -1,12 +1,5 @@ #include #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_0f09f0.h" #include "game/game_107fb0.h" #include "game/game_10c9c0.h" @@ -16,6 +9,7 @@ #include "game/mplayer/scenarios.h" #include "game/mplayer/setup.h" #include "gvars/gvars.h" +#include "data.h" #include "types.h" s32 menuhandler4MbDropOut(s32 operation, struct menuitem *item, union handlerdata *data) diff --git a/src/game/game_11f000.c b/src/game/game_11f000.c index 07242fd33..dad04d6a9 100644 --- a/src/game/game_11f000.c +++ b/src/game/game_11f000.c @@ -1,12 +1,5 @@ #include #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_096ca0.h" #include "game/game_0b2150.h" #include "game/game_0b3350.h" @@ -18,6 +11,7 @@ #include "lib/lib_09660.h" #include "lib/lib_159b0.h" #include "lib/lib_16110.h" +#include "data.h" #include "types.h" GLOBAL_ASM( diff --git a/src/game/game_127910.c b/src/game/game_127910.c index 414bf94a4..53a4fb75a 100644 --- a/src/game/game_127910.c +++ b/src/game/game_127910.c @@ -1,13 +1,6 @@ #include #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_097ba0.h" #include "game/game_0b69d0.h" #include "game/game_127910.h" @@ -15,6 +8,7 @@ #include "gvars/gvars.h" #include "lib/memory.h" #include "lib/rng.h" +#include "data.h" #include "types.h" void func0f127910(void) diff --git a/src/game/game_128f30.c b/src/game/game_128f30.c index 1e5440d04..83fc8c198 100644 --- a/src/game/game_128f30.c +++ b/src/game/game_128f30.c @@ -1,14 +1,8 @@ #include #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/rng.h" +#include "data.h" #include "types.h" u32 var8007e3c0 = 0xab8d9f77; diff --git a/src/game/game_129210.c b/src/game/game_129210.c index 7fd1fd29f..f3944f185 100644 --- a/src/game/game_129210.c +++ b/src/game/game_129210.c @@ -1,19 +1,13 @@ #include #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/chr/chr.h" #include "game/game_129210.h" #include "game/propobj.h" #include "gvars/gvars.h" #include "lib/lib_126b0.h" #include "lib/rng.h" +#include "data.h" #include "types.h" struct var8007e3d0 var8007e3d0[] = { diff --git a/src/game/game_13b670.c b/src/game/game_13b670.c index d8160fa7b..4690d1f2a 100644 --- a/src/game/game_13b670.c +++ b/src/game/game_13b670.c @@ -1,18 +1,12 @@ #include #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/game_13b670.h" #include "gvars/gvars.h" #include "lib/main.h" #include "lib/memory.h" #include "lib/lib_16110.h" +#include "data.h" #include "types.h" const char var7f1b5960[] = "modula"; diff --git a/src/game/game_13c510.c b/src/game/game_13c510.c index 8e2d85c15..c3c83c033 100644 --- a/src/game/game_13c510.c +++ b/src/game/game_13c510.c @@ -1,13 +1,6 @@ #include #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/dlights.h" #include "game/game_0b2150.h" #include "game/game_0b3350.h" @@ -21,6 +14,7 @@ #include "lib/lib_09660.h" #include "lib/lib_159b0.h" #include "lib/lib_16110.h" +#include "data.h" #include "types.h" const u32 var7f1b5990[] = {0x4effffff}; diff --git a/src/game/game_152fa0.c b/src/game/game_152fa0.c index 22ff55150..5cbd44578 100644 --- a/src/game/game_152fa0.c +++ b/src/game/game_152fa0.c @@ -1,13 +1,7 @@ #include #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" const u32 var7f1b73a0[] = {0x46ffffcd}; diff --git a/src/game/game_1531a0.c b/src/game/game_1531a0.c index 1744eae58..46244f931 100644 --- a/src/game/game_1531a0.c +++ b/src/game/game_1531a0.c @@ -1,13 +1,5 @@ #include #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 "game/game_005fd0.h" #include "game/game_0d4690.h" #include "game/game_1531a0.h" @@ -18,6 +10,7 @@ #include "lib/dma.h" #include "lib/main.h" #include "lib/memory.h" +#include "data.h" #include "types.h" const char var7f1b73b0[] = "burncol"; diff --git a/src/game/game_165360.c b/src/game/game_165360.c index 913bfacd0..442ceb10f 100644 --- a/src/game/game_165360.c +++ b/src/game/game_165360.c @@ -1,13 +1,7 @@ #include #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" const u32 var7f1b76d0[] = {0xbf666666}; diff --git a/src/game/game_1655c0.c b/src/game/game_1655c0.c index 94ad832a9..43cfb9ee7 100644 --- a/src/game/game_1655c0.c +++ b/src/game/game_1655c0.c @@ -1,13 +1,7 @@ #include #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" // When adding or removing items from this table you must also update the diff --git a/src/game/game_165670.c b/src/game/game_165670.c index 7a21e779f..d9bc1c616 100644 --- a/src/game/game_165670.c +++ b/src/game/game_165670.c @@ -1,17 +1,11 @@ #include #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_0b3350.h" #include "game/room.h" #include "game/game_165670.h" #include "gvars/gvars.h" #include "lib/lib_09660.h" +#include "data.h" #include "types.h" const u32 var7f1b76e0[] = {0x3a83126f}; diff --git a/src/game/game_1668e0.c b/src/game/game_1668e0.c index 9b775e5f3..484095fab 100644 --- a/src/game/game_1668e0.c +++ b/src/game/game_1668e0.c @@ -1,15 +1,9 @@ #include #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_1668e0.h" #include "gvars/gvars.h" #include "lib/lib_159b0.h" +#include "data.h" #include "types.h" s32 var80082050 = 0; diff --git a/src/game/game_173a00.c b/src/game/game_173a00.c index 13c5bfa89..087d96387 100644 --- a/src/game/game_173a00.c +++ b/src/game/game_173a00.c @@ -1,16 +1,10 @@ #include #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_13b670.h" #include "game/texture.h" #include "game/game_173a00.h" #include "gvars/gvars.h" +#include "data.h" #include "types.h" u32 var80084330 = 0x80878088; diff --git a/src/game/game_175f90.c b/src/game/game_175f90.c index d1e1db7e0..c268c9b42 100644 --- a/src/game/game_175f90.c +++ b/src/game/game_175f90.c @@ -1,16 +1,10 @@ #include #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/game_175f90.h" #include "gvars/gvars.h" #include "lib/memory.h" +#include "data.h" #include "types.h" void func0f175f90(void) diff --git a/src/game/game_176080.c b/src/game/game_176080.c index 5b428733c..603a90e66 100644 --- a/src/game/game_176080.c +++ b/src/game/game_176080.c @@ -1,14 +1,6 @@ #include #include "constants.h" #include "boot/sched.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/game_0b69d0.h" #include "game/game_176080.h" #include "game/mplayer/mplayer.h" @@ -16,6 +8,7 @@ #include "gvars/gvars.h" #include "lib/lib_09660.h" #include "lib/memory.h" +#include "data.h" #include "types.h" void *var800844f0 = NULL; diff --git a/src/game/game_190260.c b/src/game/game_190260.c index 4ad9bbe1a..26bdf70dc 100644 --- a/src/game/game_190260.c +++ b/src/game/game_190260.c @@ -1,13 +1,6 @@ #include #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/debug.h" #include "game/chr/chr.h" #include "game/prop.h" @@ -36,6 +29,7 @@ #include "lib/rng.h" #include "lib/lib_16110.h" #include "lib/lib_233c0.h" +#include "data.h" #include "types.h" u8 g_NumMpSimulantChrs = 0; diff --git a/src/game/game_197600.c b/src/game/game_197600.c index 636e05237..858ec1993 100644 --- a/src/game/game_197600.c +++ b/src/game/game_197600.c @@ -1,13 +1,6 @@ #include #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/debug.h" #include "game/chr/chr.h" #include "game/ceil.h" @@ -21,6 +14,7 @@ #include "game/propobj.h" #include "gvars/gvars.h" #include "lib/rng.h" +#include "data.h" #include "types.h" const u32 var7f1b8fd0[] = {0x48742400}; diff --git a/src/game/game_1999b0.c b/src/game/game_1999b0.c index 935d05572..145b56f14 100644 --- a/src/game/game_1999b0.c +++ b/src/game/game_1999b0.c @@ -1,13 +1,6 @@ #include #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/debug.h" #include "game/chr/chr.h" #include "game/game_092610.h" @@ -23,6 +16,7 @@ #include "lib/lib_159b0.h" #include "lib/lib_16110.h" #include "lib/lib_233c0.h" +#include "data.h" #include "types.h" s32 weaponGetAmmoTypeByFunction(s32 weaponnum, u32 funcnum) diff --git a/src/game/game_19aa80.c b/src/game/game_19aa80.c index da349c749..6a84c3934 100644 --- a/src/game/game_19aa80.c +++ b/src/game/game_19aa80.c @@ -2,14 +2,6 @@ #include "constants.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/prop.h" #include "game/atan2f.h" #include "game/game_127910.h" @@ -23,6 +15,7 @@ #include "gvars/gvars.h" #include "lib/dma.h" #include "lib/rng.h" +#include "data.h" #include "types.h" u32 g_MpChallengeIndex = 0; diff --git a/src/game/game_1a7560.c b/src/game/game_1a7560.c index ea59b68a8..cf21fd53f 100644 --- a/src/game/game_1a7560.c +++ b/src/game/game_1a7560.c @@ -1,14 +1,6 @@ #include #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/data/data_02e820.h" #include "game/ceil.h" #include "game/game_097ba0.h" #include "game/game_0b0fd0.h" @@ -28,6 +20,7 @@ #include "gvars/gvars.h" #include "lib/lib_09660.h" #include "lib/main.h" +#include "data.h" #include "types.h" u32 var80089990 = (u32) &stagethinglist_22e60; diff --git a/src/game/game_1a78b0.c b/src/game/game_1a78b0.c index bf1d81737..b347ed20a 100644 --- a/src/game/game_1a78b0.c +++ b/src/game/game_1a78b0.c @@ -1,14 +1,8 @@ #include #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_1a78b0.h" #include "gvars/gvars.h" +#include "data.h" #include "types.h" void func0f1a78b0(void) diff --git a/src/game/gamefile.c b/src/game/gamefile.c index 65e127f6d..a77246abf 100644 --- a/src/game/gamefile.c +++ b/src/game/gamefile.c @@ -3,13 +3,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/game_0b69d0.h" #include "game/game_0d4690.h" #include "game/room.h" @@ -25,6 +18,7 @@ #include "lib/lib_0e9d0.h" #include "lib/lib_126b0.h" #include "lib/lib_4b170.h" +#include "data.h" #include "types.h" struct filelist *g_FileLists[] = { NULL, NULL, NULL, NULL }; diff --git a/src/game/gfxmemory.c b/src/game/gfxmemory.c index 0a83176ca..a639df590 100644 --- a/src/game/gfxmemory.c +++ b/src/game/gfxmemory.c @@ -1,12 +1,5 @@ #include #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/gfxmemory.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" /** diff --git a/src/game/healthbar.c b/src/game/healthbar.c index 00e1df4bf..959eea6e9 100644 --- a/src/game/healthbar.c +++ b/src/game/healthbar.c @@ -1,18 +1,12 @@ #include #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_0b69d0.h" #include "game/healthbar.h" #include "game/game_1531a0.h" #include "game/file.h" #include "gvars/gvars.h" #include "lib/main.h" +#include "data.h" #include "types.h" const char var7f1adbf0[] = "radmax"; diff --git a/src/game/hudmsg.c b/src/game/hudmsg.c index 2ffcde3ca..61a04a335 100644 --- a/src/game/hudmsg.c +++ b/src/game/hudmsg.c @@ -1,13 +1,6 @@ #include #include "constants.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_092610.h" #include "game/game_0b0fd0.h" #include "game/game_0b69d0.h" @@ -25,6 +18,7 @@ #include "lib/lib_0e9d0.h" #include "lib/memory.h" #include "lib/lib_16110.h" +#include "data.h" #include "types.h" const char var7f1ade80[] = "%s%s%4.2fX"; diff --git a/src/game/inventory/init.c b/src/game/inventory/init.c index 0616b9471..5cd8aad43 100644 --- a/src/game/inventory/init.c +++ b/src/game/inventory/init.c @@ -2,17 +2,11 @@ #include "constants.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/inventory/init.h" #include "game/inventory/inventory.h" #include "gvars/gvars.h" #include "lib/memory.h" +#include "data.h" #include "types.h" void invInitGunsHeld(void) diff --git a/src/game/inventory/inventory.c b/src/game/inventory/inventory.c index 3ed146d61..c03f807f4 100644 --- a/src/game/inventory/inventory.c +++ b/src/game/inventory/inventory.c @@ -1,13 +1,6 @@ #include #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_097ba0.h" #include "game/game_0b0fd0.h" #include "game/inventory/inventory.h" @@ -15,6 +8,7 @@ #include "game/lang.h" #include "gvars/gvars.h" #include "lib/main.h" +#include "data.h" #include "types.h" void invClear(void) diff --git a/src/game/inventory/items.c b/src/game/inventory/items.c index 9362f041f..2af37cac9 100644 --- a/src/game/inventory/items.c +++ b/src/game/inventory/items.c @@ -4,6 +4,7 @@ #include "game/prop.h" #include "game/inventory/items.h" #include "stagesetup.h" +#include "data.h" #include "types.h" struct inventory_menupos invmenupos_00010fd0 = { diff --git a/src/game/lang.c b/src/game/lang.c index 496b6ff8a..784c54319 100644 --- a/src/game/lang.c +++ b/src/game/lang.c @@ -1,17 +1,10 @@ #include #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 "game/file.h" #include "game/lang.h" #include "gvars/gvars.h" #include "lib/dma.h" +#include "data.h" #include "types.h" u32 g_LanguageId = 0; diff --git a/src/game/menu/items.c b/src/game/menu/items.c index 2eb4e1f41..f02c044e1 100644 --- a/src/game/menu/items.c +++ b/src/game/menu/items.c @@ -1,13 +1,6 @@ #include #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_005fd0.h" #include "game/game_095320.h" #include "game/game_0b3350.h" @@ -25,6 +18,7 @@ #include "gvars/gvars.h" #include "lib/lib_09660.h" #include "lib/main.h" +#include "data.h" #include "types.h" const char var7f1adfa0[] = "brcol"; diff --git a/src/game/mplayer/ingame.c b/src/game/mplayer/ingame.c index f22adc81a..6238b5ba7 100644 --- a/src/game/mplayer/ingame.c +++ b/src/game/mplayer/ingame.c @@ -1,13 +1,5 @@ #include #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 "game/game_005fd0.h" #include "game/title.h" #include "game/game_0b0fd0.h" @@ -25,8 +17,14 @@ #include "game/options.h" #include "gvars/gvars.h" #include "lib/main.h" +#include "data.h" #include "types.h" +struct menudialog g_MpEndscreenChallengeCompletedMenuDialog; +struct menudialog g_MpEndscreenIndGameOverMenuDialog; +struct menudialog g_MpEndscreenSavePlayerMenuDialog; +struct menudialog g_MpEndscreenTeamGameOverMenuDialog; + s32 mpStatsForPlayerDropdownHandler(s32 operation, struct menuitem *item, union handlerdata *data) { char *name; diff --git a/src/game/mplayer/mplayer.c b/src/game/mplayer/mplayer.c index 78590c6e7..111f2ea3b 100644 --- a/src/game/mplayer/mplayer.c +++ b/src/game/mplayer/mplayer.c @@ -1,14 +1,6 @@ #include #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_02a0e0.h" -#include "game/data/data_02da90.h" #include "game/title.h" #include "game/game_01b0a0.h" #include "game/game_097ba0.h" @@ -33,8 +25,12 @@ #include "lib/main.h" #include "lib/rng.h" #include "lib/lib_317f0.h" +#include "data.h" #include "types.h" +struct mpweaponset g_MpWeaponSets[12]; +u32 var800874c8; + const char var7f1b8a00[] = "||||||||||||| Starting game... players %d\n"; s32 var80087260 = 0x00000000; @@ -2322,7 +2318,7 @@ glabel func0f18a030 /* f18a18c: 00000000 */ nop ); -struct mpweaponset g_MpWeaponSets[] = { +struct mpweaponset g_MpWeaponSets[12] = { { /*0x00*/ L_MPWEAPONS(55), { WEAPON_FALCON2, WEAPON_MAGSEC4, WEAPON_PHOENIX, WEAPON_MAULER, WEAPON_MPSHIELD, WEAPON_DISABLED }, { MPFEATURE_WEAPON_PHOENIX, MPFEATURE_WEAPON_MAULER, 0, 0 }, 0x02, 0x05, 0x02, 0x08, 0x5b, 0x5c }, // Pistols { /*0x01*/ L_MPWEAPONS(54), { WEAPON_FALCON2, WEAPON_CMP150, WEAPON_LAPTOPGUN, WEAPON_AR34, WEAPON_MPSHIELD, WEAPON_DISABLED }, { MPFEATURE_WEAPON_LAPTOPGUN, 0, 0, 0 }, 0x02, 0x0a, 0x0f, 0x11, 0x5b, 0x5c }, // Automatics { /*0x02*/ L_MPWEAPONS(53), { WEAPON_MAGSEC4, WEAPON_DY357MAGNUM, WEAPON_SHOTGUN, WEAPON_RCP120, WEAPON_MPSHIELD, WEAPON_DISABLED }, { MPFEATURE_WEAPON_SHOTGUN, MPFEATURE_WEAPON_RCP120, 0, 0 }, 0x05, 0x08, 0x0f, 0x11, 0x5b, 0x5c }, // Power diff --git a/src/game/mplayer/scenarios.c b/src/game/mplayer/scenarios.c index 863cba7d0..078bd0e9f 100644 --- a/src/game/mplayer/scenarios.c +++ b/src/game/mplayer/scenarios.c @@ -1,14 +1,6 @@ #include #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/dlights.h" #include "game/game_005fd0.h" #include "game/game_00c490.h" @@ -40,8 +32,11 @@ #include "lib/lib_159b0.h" #include "lib/lib_16110.h" #include "lib/lib_233c0.h" +#include "data.h" #include "types.h" +struct mpscenario g_MpScenarios[6]; + const char var7f1b8440[] = "CaptureTheBriefcaseAddBankPad -> Adding New Pad %d - Pad Id = %d-> Saving Pad\n"; const char var7f1b8490[] = "%d:%02d"; const char var7f1b8498[] = "%d:%02d"; @@ -5074,7 +5069,7 @@ struct menudialog g_MpPopacapOptionsMenuDialog = { NULL, }; -struct mpscenario g_MpScenarios[] = { +struct mpscenario g_MpScenarios[6] = { { &g_MpCombatOptionsMenuDialog, }, { diff --git a/src/game/mplayer/setup.c b/src/game/mplayer/setup.c index 5c5b93964..f5ec6a054 100644 --- a/src/game/mplayer/setup.c +++ b/src/game/mplayer/setup.c @@ -1,14 +1,6 @@ #include #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_02a0e0.h" -#include "game/data/data_02da90.h" #include "game/game_0b3350.h" #include "game/game_0d4690.h" #include "game/game_0f09f0.h" @@ -26,8 +18,16 @@ #include "gvars/gvars.h" #include "lib/lib_09660.h" #include "lib/rng.h" +#include "data.h" #include "types.h" +struct menuitem g_MpCharacterMenuItems[]; +struct menudialog g_MpAddSimulantMenuDialog; +struct menudialog g_MpChangeSimulantMenuDialog; +struct menudialog g_MpChangeTeamNameMenuDialog; +struct menudialog g_MpEditSimulantMenuDialog; +struct menudialog g_MpSaveSetupNameMenuDialog; + s32 menuhandlerMpDropOut(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { diff --git a/src/game/mpstats.c b/src/game/mpstats.c index 651dc3194..4ffe2267d 100644 --- a/src/game/mpstats.c +++ b/src/game/mpstats.c @@ -1,13 +1,6 @@ #include #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/inventory/items.h" #include "game/game_097ba0.h" #include "game/game_0b0fd0.h" @@ -20,6 +13,7 @@ #include "game/mplayer/mplayer.h" #include "game/options.h" #include "gvars/gvars.h" +#include "data.h" #include "types.h" u32 var80070590 = 0x00000000; diff --git a/src/game/music.c b/src/game/music.c index 0dc914cb1..07995eba2 100644 --- a/src/game/music.c +++ b/src/game/music.c @@ -1,13 +1,5 @@ #include #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 "game/game_0f09f0.h" #include "game/core.h" #include "game/music.h" @@ -15,6 +7,7 @@ #include "gvars/gvars.h" #include "lib/lib_0e9d0.h" #include "lib/lib_11420.h" +#include "data.h" #include "types.h" s32 g_MenuTrack = -1; diff --git a/src/game/nbomb.c b/src/game/nbomb.c index b5598e12c..b29a9f48b 100644 --- a/src/game/nbomb.c +++ b/src/game/nbomb.c @@ -1,13 +1,6 @@ #include #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" bool g_NbombsActive = false; diff --git a/src/game/objectives/autocomplete.c b/src/game/objectives/autocomplete.c index 99a9b9197..e1b3d2ba0 100644 --- a/src/game/objectives/autocomplete.c +++ b/src/game/objectives/autocomplete.c @@ -1,13 +1,7 @@ #include #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" void objectivesAutocomplete(void) diff --git a/src/game/objectives/objectives.c b/src/game/objectives/objectives.c index 09a3017b9..c624215be 100644 --- a/src/game/objectives/objectives.c +++ b/src/game/objectives/objectives.c @@ -1,13 +1,6 @@ #include #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/debug.h" #include "game/prop.h" #include "game/game_091e10.h" @@ -25,6 +18,7 @@ #include "lib/memory.h" #include "lib/rng.h" #include "lib/lib_159b0.h" +#include "data.h" #include "types.h" s32 g_ObjectiveLastIndex = -1; diff --git a/src/game/objectives/setup.c b/src/game/objectives/setup.c index 9a35c869b..4cf898f9d 100644 --- a/src/game/objectives/setup.c +++ b/src/game/objectives/setup.c @@ -1,15 +1,9 @@ #include #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 "gvars/gvars.h" #include "lib/main.h" +#include "data.h" #include "types.h" void objectivesReset(void) diff --git a/src/game/options.c b/src/game/options.c index b283ac69f..c67165fe2 100644 --- a/src/game/options.c +++ b/src/game/options.c @@ -1,15 +1,9 @@ #include #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/music.h" #include "game/options.h" #include "gvars/gvars.h" +#include "data.h" #include "types.h" u8 g_InGameSubtitles = 1; diff --git a/src/game/pad.c b/src/game/pad.c index 98676a190..541294b08 100644 --- a/src/game/pad.c +++ b/src/game/pad.c @@ -1,14 +1,8 @@ #include #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/pad.h" #include "gvars/gvars.h" +#include "data.h" #include "types.h" GLOBAL_ASM( diff --git a/src/game/padhalllv.c b/src/game/padhalllv.c index 766ef6045..27012d384 100644 --- a/src/game/padhalllv.c +++ b/src/game/padhalllv.c @@ -1,12 +1,5 @@ #include #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 "game/room.h" #include "game/pad.h" @@ -15,6 +8,7 @@ #include "lib/rng.h" #include "lib/lib_233c0.h" #include "lib/libc/ll.h" +#include "data.h" #include "types.h" const char var7f1b3a80[] = "padhalllv.c"; diff --git a/src/game/pak/pak.c b/src/game/pak/pak.c index ea72bcc8a..8d2cee0e6 100644 --- a/src/game/pak/pak.c +++ b/src/game/pak/pak.c @@ -1,13 +1,6 @@ #include #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_0f09f0.h" #include "game/game_128f30.h" #include "game/gamefile.h" @@ -31,6 +24,7 @@ #include "lib/lib_50480.h" #include "lib/lib_50a00.h" #include "lib/lib_513b0.h" +#include "data.h" #include "types.h" const char var7f1b3a90[] = "\0************** 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ!\"#'*+,-./:=?@"; diff --git a/src/game/prop.c b/src/game/prop.c index 043151ff8..33c03144b 100644 --- a/src/game/prop.c +++ b/src/game/prop.c @@ -3,13 +3,6 @@ #include "game/bondmove.h" #include "game/bondwalk.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" @@ -40,6 +33,7 @@ #include "lib/lib_16110.h" #include "lib/lib_233c0.h" #include "lib/lib_317f0.h" +#include "data.h" #include "types.h" f32 var80069880 = 1; diff --git a/src/game/propobj.c b/src/game/propobj.c index d06d9657c..8def44536 100644 --- a/src/game/propobj.c +++ b/src/game/propobj.c @@ -5,15 +5,6 @@ #include "game/cheats.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_02a0e0.h" -#include "game/data/data_02da90.h" -#include "game/data/data_02e820.h" #include "game/debug.h" #include "game/dlights.h" #include "game/nbomb.h" @@ -75,6 +66,7 @@ #include "lib/lib_16110.h" #include "lib/lib_233c0.h" #include "lib/lib_317f0.h" +#include "data.h" #include "types.h" const char var7f1a9f60[] = "debugdoors"; @@ -36878,10 +36870,56 @@ glabel func0f085eac /* f086914: 00000000 */ nop ); +u32 var8006abb0 = 0x00000000; +u32 var8006abb4 = 0x00000000; +u32 var8006abb8 = 0x00000000; +u32 var8006abbc = 0x00000000; +u32 var8006abc0 = 0x00000000; +u32 var8006abc4 = 0x00000000; +u32 var8006abc8 = 0x00000000; +u32 var8006abcc = 0x00000000; +u32 var8006abd0 = 0x00000000; +u32 var8006abd4 = 0x00000000; +u32 var8006abd8 = 0x00000000; +u32 var8006abdc = 0x00000000; +u32 var8006abe0 = 0x00000000; +u32 var8006abe4 = 0x00000000; +u32 var8006abe8 = 0x00000000; +u32 var8006abec = 0x00000000; +u32 var8006abf0 = 0x00000000; +u32 var8006abf4 = 0x00000000; +u32 var8006abf8 = 0x00000000; +u32 var8006abfc = 0x00000000; +u32 var8006ac00 = 0x00000000; +u32 var8006ac04 = 0x00000000; +u32 var8006ac08 = 0x01000007; +u32 var8006ac0c = 0x0000ffff; +u32 var8006ac10 = 0x00000001; +u32 var8006ac14 = 0x00000000; +u32 var8006ac18 = 0x00000000; +u32 var8006ac1c = 0x00000000; +u32 var8006ac20 = 0x00000000; +u32 var8006ac24 = 0x3f800000; +u32 var8006ac28 = 0x00000000; +u32 var8006ac2c = 0x00000000; +u32 var8006ac30 = 0x00000000; +u32 var8006ac34 = 0x3f800000; +u32 var8006ac38 = 0x00000000; +u32 var8006ac3c = 0x00000000; +u32 var8006ac40 = 0x00000000; +u32 var8006ac44 = 0x3f800000; +u32 var8006ac48 = 0x00000000; +u32 var8006ac4c = 0x00000000; +u32 var8006ac50 = 0x00000000; +u32 var8006ac54 = 0x000003e8; +u32 var8006ac58 = 0xffffff00; +u32 var8006ac5c = 0xffffff00; +u32 var8006ac60 = 0x0fff0000; + u32 propobjGetCiTagId(struct prop *prop) { if (prop && g_Vars.stagenum == STAGE_CITRAINING) { - u8 tags[8] = g_CiTaggedTerminals; + u8 tags[8] = { 0x0e, 0x0f, 0x10, 0x47, 0x46, 0x45, 0x1b, 0x7f }; struct defaultobj *obj = prop->obj; u32 i; @@ -48405,52 +48443,6 @@ u32 func0f091e04(u32 arg0, u32 arg1) return arg0; } -u32 var8006abb0 = 0x00000000; -u32 var8006abb4 = 0x00000000; -u32 var8006abb8 = 0x00000000; -u32 var8006abbc = 0x00000000; -u32 var8006abc0 = 0x00000000; -u32 var8006abc4 = 0x00000000; -u32 var8006abc8 = 0x00000000; -u32 var8006abcc = 0x00000000; -u32 var8006abd0 = 0x00000000; -u32 var8006abd4 = 0x00000000; -u32 var8006abd8 = 0x00000000; -u32 var8006abdc = 0x00000000; -u32 var8006abe0 = 0x00000000; -u32 var8006abe4 = 0x00000000; -u32 var8006abe8 = 0x00000000; -u32 var8006abec = 0x00000000; -u32 var8006abf0 = 0x00000000; -u32 var8006abf4 = 0x00000000; -u32 var8006abf8 = 0x00000000; -u32 var8006abfc = 0x00000000; -u32 var8006ac00 = 0x00000000; -u32 var8006ac04 = 0x00000000; -u32 var8006ac08 = 0x01000007; -u32 var8006ac0c = 0x0000ffff; -u32 var8006ac10 = 0x00000001; -u32 var8006ac14 = 0x00000000; -u32 var8006ac18 = 0x00000000; -u32 var8006ac1c = 0x00000000; -u32 var8006ac20 = 0x00000000; -u32 var8006ac24 = 0x3f800000; -u32 var8006ac28 = 0x00000000; -u32 var8006ac2c = 0x00000000; -u32 var8006ac30 = 0x00000000; -u32 var8006ac34 = 0x3f800000; -u32 var8006ac38 = 0x00000000; -u32 var8006ac3c = 0x00000000; -u32 var8006ac40 = 0x00000000; -u32 var8006ac44 = 0x3f800000; -u32 var8006ac48 = 0x00000000; -u32 var8006ac4c = 0x00000000; -u32 var8006ac50 = 0x00000000; -u32 var8006ac54 = 0x000003e8; -u32 var8006ac58 = 0xffffff00; -u32 var8006ac5c = 0xffffff00; -u32 var8006ac60 = 0x0fff0000; -u8 g_CiTaggedTerminals[] = { 0x0e, 0x0f, 0x10, 0x47, 0x46, 0x45, 0x1b, 0x7f }; u32 var8006ac6c = 0x01000011; u32 var8006ac70 = 0x00000000; u32 var8006ac74 = 0x00004000; diff --git a/src/game/radar.c b/src/game/radar.c index d55e10866..800df2e79 100644 --- a/src/game/radar.c +++ b/src/game/radar.c @@ -2,13 +2,6 @@ #include "constants.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/atan2f.h" #include "game/game_0b2150.h" #include "game/game_0b3350.h" @@ -20,6 +13,7 @@ #include "gvars/gvars.h" #include "lib/lib_09660.h" #include "lib/lib_16110.h" +#include "data.h" #include "types.h" bool g_RadarYIndicatorsEnabled = true; diff --git a/src/game/room.c b/src/game/room.c index 9370634fc..25aaa2f94 100644 --- a/src/game/room.c +++ b/src/game/room.c @@ -1,12 +1,5 @@ #include #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/dlights.h" #include "game/game_013550.h" @@ -44,6 +37,7 @@ #include "lib/lib_16110.h" #include "lib/lib_2f490.h" #include "lib/lib_4b170.h" +#include "data.h" #include "types.h" const char var7f1b7420[] = "Checking Convex Room %d"; diff --git a/src/game/shards/create.c b/src/game/shards/create.c index 0d26a032f..b8ecee3de 100644 --- a/src/game/shards/create.c +++ b/src/game/shards/create.c @@ -1,12 +1,5 @@ #include #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_092610.h" #include "game/atan2f.h" @@ -16,6 +9,7 @@ #include "lib/rng.h" #include "lib/lib_159b0.h" #include "lib/lib_16110.h" +#include "data.h" #include "types.h" u32 var8007fa80 = 0x00000000; diff --git a/src/game/shards/init.c b/src/game/shards/init.c index e469e8206..d642e0c8c 100644 --- a/src/game/shards/init.c +++ b/src/game/shards/init.c @@ -1,14 +1,8 @@ #include #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 shardsInit(void) diff --git a/src/game/shards/render.c b/src/game/shards/render.c index bcb12556a..440afe353 100644 --- a/src/game/shards/render.c +++ b/src/game/shards/render.c @@ -1,12 +1,5 @@ #include #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_092610.h" #include "game/atan2f.h" @@ -16,6 +9,7 @@ #include "lib/rng.h" #include "lib/lib_159b0.h" #include "lib/lib_16110.h" +#include "data.h" #include "types.h" const u32 var7f1b7390[] = {0xc61c4000}; diff --git a/src/game/shards/reset.c b/src/game/shards/reset.c index 8fd759975..949e6ef33 100644 --- a/src/game/shards/reset.c +++ b/src/game/shards/reset.c @@ -1,13 +1,7 @@ #include #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" void shardsReset(void) diff --git a/src/game/shards/tick.c b/src/game/shards/tick.c index c81b260cd..bbf1658c3 100644 --- a/src/game/shards/tick.c +++ b/src/game/shards/tick.c @@ -1,13 +1,7 @@ #include #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" void shardsTick(void) diff --git a/src/game/sight.c b/src/game/sight.c index 9e39d564e..bd4ddebe1 100644 --- a/src/game/sight.c +++ b/src/game/sight.c @@ -1,13 +1,6 @@ #include #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/game_097ba0.h" #include "game/game_0b0fd0.h" #include "game/game_0b2150.h" @@ -24,6 +17,7 @@ #include "lib/lib_09660.h" #include "lib/main.h" #include "lib/lib_0e9d0.h" +#include "data.h" #include "types.h" const char var7f1adda0[] = "sight"; diff --git a/src/game/sky.c b/src/game/sky.c index c2c6c68f7..cade70ca3 100644 --- a/src/game/sky.c +++ b/src/game/sky.c @@ -1,12 +1,5 @@ #include #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/game_0b3350.h" #include "game/sky.h" @@ -17,6 +10,7 @@ #include "lib/rng.h" #include "lib/lib_159b0.h" #include "lib/lib_16110.h" +#include "data.h" #include "types.h" u32 var8007f120 = 0x00000000; diff --git a/src/game/smoke/init.c b/src/game/smoke/init.c index 535035806..8fa2d412c 100644 --- a/src/game/smoke/init.c +++ b/src/game/smoke/init.c @@ -1,14 +1,8 @@ #include #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 smokeInit(void) diff --git a/src/game/smoke/reset.c b/src/game/smoke/reset.c index 32904bdee..abfefab0a 100644 --- a/src/game/smoke/reset.c +++ b/src/game/smoke/reset.c @@ -1,14 +1,8 @@ #include #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 "data.h" #include "types.h" void smokeReset(void) diff --git a/src/game/smoke/smoke.c b/src/game/smoke/smoke.c index 4cf45e912..2223d123a 100644 --- a/src/game/smoke/smoke.c +++ b/src/game/smoke/smoke.c @@ -1,12 +1,5 @@ #include #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/prop.h" #include "game/game_0b3350.h" @@ -18,6 +11,7 @@ #include "gvars/gvars.h" #include "lib/rng.h" #include "lib/lib_16110.h" +#include "data.h" #include "types.h" const u32 var7f1b55d0[] = {0x46ea6000}; diff --git a/src/game/sparks/init.c b/src/game/sparks/init.c index 1c510e978..d06146de4 100644 --- a/src/game/sparks/init.c +++ b/src/game/sparks/init.c @@ -1,13 +1,7 @@ #include #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" void sparksInit(void) diff --git a/src/game/sparks/sparks.c b/src/game/sparks/sparks.c index 89309d1c6..5b521d023 100644 --- a/src/game/sparks/sparks.c +++ b/src/game/sparks/sparks.c @@ -1,12 +1,5 @@ #include #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/chr/chr.h" #include "game/game_0b3350.h" @@ -16,6 +9,7 @@ #include "lib/lib_09660.h" #include "lib/rng.h" #include "lib/lib_159b0.h" +#include "data.h" #include "types.h" const u32 var7f1b5600[] = {0xb8d1b717}; diff --git a/src/game/sparks/tick.c b/src/game/sparks/tick.c index 892f4ef77..8deeb0019 100644 --- a/src/game/sparks/tick.c +++ b/src/game/sparks/tick.c @@ -1,13 +1,7 @@ #include #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" const u32 var7f1a8680[] = {0xb8d1b717}; diff --git a/src/game/splat.c b/src/game/splat.c index bff6487a0..5d41cf70c 100644 --- a/src/game/splat.c +++ b/src/game/splat.c @@ -1,12 +1,5 @@ #include #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/smoke/smoke.h" #include "game/room.h" #include "game/propobj.h" @@ -18,6 +11,7 @@ #include "lib/rng.h" #include "lib/lib_159b0.h" #include "lib/lib_16110.h" +#include "data.h" #include "types.h" u32 var8007f8a0 = 0x3e19999a; diff --git a/src/game/stubs/game_000840.c b/src/game/stubs/game_000840.c index efb20a934..23a1d7022 100644 --- a/src/game/stubs/game_000840.c +++ b/src/game/stubs/game_000840.c @@ -1,13 +1,7 @@ #include #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" void stub0f000840(void) diff --git a/src/game/stubs/game_000850.c b/src/game/stubs/game_000850.c index 67f6a60aa..a068ab8b8 100644 --- a/src/game/stubs/game_000850.c +++ b/src/game/stubs/game_000850.c @@ -1,14 +1,8 @@ #include #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/stubs/game_000850.h" #include "gvars/gvars.h" +#include "data.h" #include "types.h" void stub0f000850(void) diff --git a/src/game/stubs/game_000860.c b/src/game/stubs/game_000860.c index 9607bfbe8..e7019f739 100644 --- a/src/game/stubs/game_000860.c +++ b/src/game/stubs/game_000860.c @@ -1,14 +1,8 @@ #include #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/stubs/game_000860.h" #include "gvars/gvars.h" +#include "data.h" #include "types.h" void stub0f000860(void) diff --git a/src/game/stubs/game_000870.c b/src/game/stubs/game_000870.c index b07293eff..5f2b4e46c 100644 --- a/src/game/stubs/game_000870.c +++ b/src/game/stubs/game_000870.c @@ -1,14 +1,8 @@ #include #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/stubs/game_000870.h" #include "gvars/gvars.h" +#include "data.h" #include "types.h" void stub0f000870(void) diff --git a/src/game/stubs/game_0008e0.c b/src/game/stubs/game_0008e0.c index 3f9cdf1ee..c67c98650 100644 --- a/src/game/stubs/game_0008e0.c +++ b/src/game/stubs/game_0008e0.c @@ -1,14 +1,8 @@ #include #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/stubs/game_0008e0.h" #include "gvars/gvars.h" +#include "data.h" #include "types.h" void stub0f0008e0(void) diff --git a/src/game/stubs/game_0008f0.c b/src/game/stubs/game_0008f0.c index 66b6b299a..24f758e7d 100644 --- a/src/game/stubs/game_0008f0.c +++ b/src/game/stubs/game_0008f0.c @@ -1,14 +1,8 @@ #include #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/stubs/game_0008f0.h" #include "gvars/gvars.h" +#include "data.h" #include "types.h" void stub0f0008f0(void) diff --git a/src/game/stubs/game_000900.c b/src/game/stubs/game_000900.c index 772e105a4..033ea8b42 100644 --- a/src/game/stubs/game_000900.c +++ b/src/game/stubs/game_000900.c @@ -1,14 +1,8 @@ #include #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/stubs/game_000900.h" #include "gvars/gvars.h" +#include "data.h" #include "types.h" void stub0f000900(void) diff --git a/src/game/stubs/game_000910.c b/src/game/stubs/game_000910.c index 06e69b007..076ed39f0 100644 --- a/src/game/stubs/game_000910.c +++ b/src/game/stubs/game_000910.c @@ -1,14 +1,8 @@ #include #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/stubs/game_000910.h" #include "gvars/gvars.h" +#include "data.h" #include "types.h" void stub0f000910(void) diff --git a/src/game/stubs/game_00b200.c b/src/game/stubs/game_00b200.c index 0712af7d6..42b40460f 100644 --- a/src/game/stubs/game_00b200.c +++ b/src/game/stubs/game_00b200.c @@ -1,13 +1,7 @@ #include #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" void stub0f00b200(void) diff --git a/src/game/stubs/game_013540.c b/src/game/stubs/game_013540.c index 7ebe4981e..0373578a4 100644 --- a/src/game/stubs/game_013540.c +++ b/src/game/stubs/game_013540.c @@ -1,13 +1,7 @@ #include #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" void stub0f013540(void) diff --git a/src/game/stubs/game_015260.c b/src/game/stubs/game_015260.c index 981958f22..3485270e7 100644 --- a/src/game/stubs/game_015260.c +++ b/src/game/stubs/game_015260.c @@ -1,14 +1,8 @@ #include #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/stubs/game_015260.h" #include "gvars/gvars.h" +#include "data.h" #include "types.h" void stub0f015260(void) diff --git a/src/game/stubs/game_015270.c b/src/game/stubs/game_015270.c index 308e973ea..9c8ff1955 100644 --- a/src/game/stubs/game_015270.c +++ b/src/game/stubs/game_015270.c @@ -1,14 +1,8 @@ #include #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/stubs/game_015270.h" #include "gvars/gvars.h" +#include "data.h" #include "types.h" void stub0f015270(void) diff --git a/src/game/stubs/game_0153f0.c b/src/game/stubs/game_0153f0.c index e97744eb8..4e1e872f8 100644 --- a/src/game/stubs/game_0153f0.c +++ b/src/game/stubs/game_0153f0.c @@ -1,13 +1,7 @@ #include #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" void stub0f0153f0(void) diff --git a/src/game/stubs/game_015400.c b/src/game/stubs/game_015400.c index cef89139c..e128d7b0d 100644 --- a/src/game/stubs/game_015400.c +++ b/src/game/stubs/game_015400.c @@ -1,14 +1,8 @@ #include #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/stubs/game_015400.h" #include "gvars/gvars.h" +#include "data.h" #include "types.h" void stub0f015400(void) diff --git a/src/game/stubs/game_015410.c b/src/game/stubs/game_015410.c index a0af1ffb1..19168b14c 100644 --- a/src/game/stubs/game_015410.c +++ b/src/game/stubs/game_015410.c @@ -1,14 +1,8 @@ #include #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/stubs/game_015410.h" #include "gvars/gvars.h" +#include "data.h" #include "types.h" void stub0f015410(void) diff --git a/src/game/stubs/game_102230.c b/src/game/stubs/game_102230.c index ef2343adf..2eb407e1c 100644 --- a/src/game/stubs/game_102230.c +++ b/src/game/stubs/game_102230.c @@ -1,13 +1,7 @@ #include #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" void stub0f102230(void) diff --git a/src/game/stubs/game_11eff0.c b/src/game/stubs/game_11eff0.c index 9ffe90e8f..4c1321b83 100644 --- a/src/game/stubs/game_11eff0.c +++ b/src/game/stubs/game_11eff0.c @@ -1,13 +1,7 @@ #include #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" bool stub0f11eff0(s32 arg0) diff --git a/src/game/stubs/game_175f50.c b/src/game/stubs/game_175f50.c index 30b775ead..76df9600a 100644 --- a/src/game/stubs/game_175f50.c +++ b/src/game/stubs/game_175f50.c @@ -1,14 +1,8 @@ #include #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/stubs/game_175f50.h" #include "gvars/gvars.h" +#include "data.h" #include "types.h" void stub0f175f50(void) diff --git a/src/game/stubs/game_176000.c b/src/game/stubs/game_176000.c index c8e8c1255..acf54467c 100644 --- a/src/game/stubs/game_176000.c +++ b/src/game/stubs/game_176000.c @@ -1,13 +1,7 @@ #include #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" s32 stub0f176000(s32 arg0) diff --git a/src/game/texture.c b/src/game/texture.c index 8f457b6fa..81481ffdf 100644 --- a/src/game/texture.c +++ b/src/game/texture.c @@ -1,12 +1,5 @@ #include #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_0b3350.h" #include "game/texture.h" #include "gvars/gvars.h" @@ -15,6 +8,7 @@ #include "lib/main.h" #include "lib/memory.h" #include "lib/lib_4b170.h" +#include "data.h" #include "types.h" u32 var800841b0 = 0x0006ddd0; diff --git a/src/game/timing.c b/src/game/timing.c index 254d07130..9b456ea9d 100644 --- a/src/game/timing.c +++ b/src/game/timing.c @@ -1,14 +1,8 @@ #include #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/timing.h" #include "gvars/gvars.h" +#include "data.h" #include "types.h" void frametimeInit(void) diff --git a/src/game/title.c b/src/game/title.c index bac8b4347..60f7f02e5 100644 --- a/src/game/title.c +++ b/src/game/title.c @@ -1,12 +1,5 @@ #include #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/title.h" #include "game/game_01afc0.h" #include "game/game_097ba0.h" @@ -33,6 +26,7 @@ #include "lib/lib_159b0.h" #include "lib/lib_16110.h" #include "lib/lib_317f0.h" +#include "data.h" #include "types.h" s16 var800624a0 = 480; diff --git a/src/game/training/menus.c b/src/game/training/menus.c index 54c7248ff..0a5c76ebd 100644 --- a/src/game/training/menus.c +++ b/src/game/training/menus.c @@ -1,14 +1,6 @@ #include #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/data/data_02e820.h" #include "game/ceil.h" #include "game/game_097ba0.h" #include "game/game_0b0fd0.h" @@ -29,8 +21,14 @@ #include "gvars/gvars.h" #include "lib/lib_09660.h" #include "lib/main.h" +#include "data.h" #include "types.h" +struct menudialog g_BioProfileMenuDialog; +struct menudialog g_BioTextMenuDialog; +struct menudialog g_HangarLocationDetailsMenuDialog; +struct menudialog g_HangarVehicleDetailsMenuDialog; + s32 frDetailsOkMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { s32 i; diff --git a/src/game/training/training.c b/src/game/training/training.c index afded37f3..bd9c33b23 100644 --- a/src/game/training/training.c +++ b/src/game/training/training.c @@ -1,14 +1,6 @@ #include #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/data/data_02e820.h" #include "game/dlights.h" #include "game/prop.h" #include "game/game_092610.h" @@ -41,6 +33,7 @@ #include "lib/rng.h" #include "lib/lib_159b0.h" #include "lib/lib_16110.h" +#include "data.h" #include "types.h" #define FRSCRIPTINDEX_WEAPONS 0x00 diff --git a/src/game/utils.c b/src/game/utils.c index e0e2bb362..44bb21201 100644 --- a/src/game/utils.c +++ b/src/game/utils.c @@ -1,16 +1,9 @@ #include #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 "game/utils.h" #include "gvars/gvars.h" #include "lib/memory.h" +#include "data.h" #include "types.h" const char var7f1b7cb0[] = "UM_Make : In\n"; diff --git a/src/game/wallhit.c b/src/game/wallhit.c index e9f28a0f8..2de0bc9e8 100644 --- a/src/game/wallhit.c +++ b/src/game/wallhit.c @@ -1,12 +1,5 @@ #include #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/chr/chr.h" #include "game/game_0b0fd0.h" @@ -22,6 +15,7 @@ #include "lib/rng.h" #include "lib/lib_159b0.h" #include "lib/lib_16110.h" +#include "data.h" #include "types.h" const char var7f1b5a10[] = "WallHit_MakeSpaceRoom : ERROR - Couldn't find any space in room %d\n"; diff --git a/src/game/weather/init.c b/src/game/weather/init.c index b2b855cf5..0b4886dc2 100644 --- a/src/game/weather/init.c +++ b/src/game/weather/init.c @@ -1,15 +1,9 @@ #include #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/weather/weather.h" #include "gvars/gvars.h" #include "lib/memory.h" +#include "data.h" #include "types.h" s32 g_WeatherActive = false; diff --git a/src/game/weather/tick.c b/src/game/weather/tick.c index 172f06474..fd75e30a7 100644 --- a/src/game/weather/tick.c +++ b/src/game/weather/tick.c @@ -1,15 +1,9 @@ #include #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/weather/weather.h" #include "gvars/gvars.h" #include "lib/main.h" +#include "data.h" #include "types.h" void weatherTick(void) diff --git a/src/game/weather/weather.c b/src/game/weather/weather.c index b5dcd1cbd..54ec03a26 100644 --- a/src/game/weather/weather.c +++ b/src/game/weather/weather.c @@ -1,12 +1,5 @@ #include #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_0b3350.h" #include "game/sparks/sparks.h" @@ -22,6 +15,7 @@ #include "lib/lib_159b0.h" #include "lib/lib_16110.h" #include "lib/lib_317f0.h" +#include "data.h" #include "types.h" struct weatherdata *g_WeatherData = NULL; diff --git a/src/gvars/gvars.c b/src/gvars/gvars.c index e333bf50d..d612653fd 100644 --- a/src/gvars/gvars.c +++ b/src/gvars/gvars.c @@ -1,5 +1,6 @@ #include #include "gvars/gvars.h" +#include "data.h" #include "types.h" u32 var8008ae20 = 0; diff --git a/src/include/data.h b/src/include/data.h new file mode 100644 index 000000000..1a5533f29 --- /dev/null +++ b/src/include/data.h @@ -0,0 +1,556 @@ +#ifndef _IN_DATA_H +#define _IN_DATA_H +#include +#include "data.h" +#include "types.h" + +extern u8 *g_StackStartAddrs[7]; +extern u8 *g_StackEndAddrs[7]; +extern u8 *g_StackAllocatedPos; +extern u32 var8005ce60; +extern u32 var8005ce64; +extern u32 var8005ce68; +extern u32 var8005ce6c; +extern u32 var8005ce70; +extern s32 var8005ce74; +extern f32 var8005ce78[2]; +extern f32 var8005ce80[2]; +extern u32 var8005ce88[2]; +extern s32 var8005ce90; +extern u32 var8005ce94; +extern u32 var8005ce98; +extern u32 var8005ce9c; +extern OSMesg var8005cea8; +extern u32 var8005cec8; +extern s8 var8005ced0; +extern u32 __osViDevMgr; +extern u32 var8005cefc; +extern OSDevMgr __osPiDevMgr; +extern u32 __osCurrentHandle; +extern u32 var8005cf30; +extern OSTime osClockRate; +extern s32 osViClock; +extern u32 var8005cf6c; +extern u32 __osGlobalIntMask; +extern u32 var8005cf84; +extern u8 g_LoadState; +extern s32 var8005d9d0; +extern s32 var8005dd18; +extern u32 var8005dd58; +extern bool g_Silent; +extern u16 g_SfxVolume; +extern u32 g_SoundMode; +extern s32 var8005ddd4; +extern struct audiorussmapping g_AudioRussMappings[]; +extern struct audioconfig g_AudioConfigs[]; +extern u32 var8005eedc; +extern u32 var8005ef10; +extern u32 var8005ef20; +extern s32 g_NumGlobalAilists; +extern s32 g_NumLvAilists; +extern u32 var8005ef40; +extern u32 var8005ef5c; +extern u32 var8005ef7c; +extern u32 var8005ef90; +extern u32 var8005efb4; +extern u32 var8005efb8; +extern bool var8005efbc; +extern u32 var8005efc0; +extern void *var8005efc4; +extern void *var8005efc8; +extern u32 var8005efcc; +extern u32 var8005efd0; +extern u32 var8005efdc; +extern u32 var8005efe0; +extern u32 var8005efec; +extern u32 var8005eff8; +extern u32 var8005f000; +extern u32 var8005f004; +extern s16 g_NumAnimations; +extern struct animheader *g_Anims; +extern u32 var8005f010; +extern u32 var8005f014; +extern u32 var8005f018; +extern u32 var8005f01c; +extern u32 var8005f020; +extern u32 var8005f024; +extern u32 var8005f030; +extern u32 var8005f034; +extern u32 var8005f038; +extern u16 *var8005f040; +extern u16 *var8005f044; +extern u32 var8005f048; +extern u32 var8005f0a8; +extern u32 var8005f108; +extern u32 var8005f110; +extern u32 var8005f114; +extern u32 var8005f120; +extern u32 var8005f124; +extern u32 var8005f128; +extern u32 var8005f12c; +extern u32 var8005f130; +extern u32 var8005f134; +extern u32 var8005f138; +extern u32 var8005f13c; +extern u32 var8005f140; +extern u32 var8005f150; +extern u32 var8005f34c; +extern u32 var8005f4dc; +extern u32 var8005f548; +extern u32 var8005f570; +extern u32 var8005f66c; +extern u32 var8005f670; +extern u32 var8005f6f8; +extern u32 var8005f6fc; +extern u32 var8005f704; +extern OSViMode osViModeTable[42]; +extern u32 var80060890; +extern OSTimer *__osTimerList; +extern __OSViContext var800608b0[2]; +extern __OSViContext *__osViCurr; +extern __OSViContext *__osViNext; +extern u32 __osPiAccessQueueEnabled; +extern u32 __osThreadTail; +extern OSThread *__osRunQueue; +extern OSThread *__osActiveQueue; +extern OSThread *__osRunningThread; +extern OSThread *__osFaultedThread; +extern u32 __osSiAccessQueueEnabled; +extern u32 __osContInitialized; +extern u32 var80060970; +extern u32 var80060980; +extern u8 var80060984; +extern u32 var80060990; +extern u32 var800609a0; +extern u32 var800609c4; +extern u32 var800609f0; +extern u32 var800611ec; +extern u32 var800611f0; +extern u32 var80061220; +extern OSViMode osViModePalLan1; +extern OSViMode osViModeMpalLan1; +extern OSViMode osViModeNtscLan1; +extern char ldigs[]; +extern char udigs[]; +extern u32 var80061360; +extern u32 var80061380; +extern u32 var800613a0; +extern f32 var80061630; +extern u32 var80061634; +extern bool g_NbombsActive; +extern s32 g_WeatherActive; +extern u32 var80062410; +extern s32 var800624a4; +extern u32 var800624b0; +extern s32 g_TitleMode; +extern s32 g_TitleNextMode; +extern u32 g_TitleDelayedTimer; +extern s32 g_TitleDelayedMode; +extern s32 g_TitleTimer; +extern u32 var800624d4; +extern u32 var800624d8; +extern u32 var800624dc; +extern u32 var800624e0; +extern s32 g_TitleNextStage; +extern u32 var800624e8; +extern u32 var800624ec; +extern u32 var800624f0; +extern u32 var800624f4; +extern u8 g_FileState; +extern u8 var80062944; +extern u8 var80062948; +extern u8 var8006294c; +extern u32 var80062950; +extern bool g_WeatherTickEnabled; +extern void *var80062960; +extern f32 var80062968; +extern bool var8006296c; +extern s32 g_SelectedAnimNum; +extern u32 var80062974; +extern u32 var80062978; +extern u32 var8006297c; +extern s32 g_NextChrnum; +extern struct chrdata *g_ChrSlots; +extern s32 g_NumChrSlots; +extern struct var80062a8c *var80062a8c; +extern s32 var80062a90; +extern s32 g_NumBondBodies; +extern s32 g_NumMaleGuardHeads; +extern s32 g_NumFemaleGuardHeads; +extern s32 g_NumMaleGuardTeamHeads; +extern s32 g_NumFemaleGuardTeamHeads; +extern s32 var80062b14; +extern s32 var80062b18; +extern s32 g_BondBodies[]; +extern s32 g_MaleGuardHeads[]; +extern s32 g_MaleGuardTeamHeads[]; +extern s32 g_FemaleGuardHeads[]; +extern s32 g_FemaleGuardTeamHeads[]; +extern s32 var80062c80; +extern s32 g_ActiveMaleHeadsIndex; +extern s32 g_ActiveFemaleHeadsIndex; +extern f32 var80062ca0; +extern f32 var80062ca4; +extern f32 var80062ca8; +extern f32 var80062cac; +extern s32 var80062cbc; +extern struct somedruggedracethingdeep var800637cc[]; +extern struct somedruggedracething *var800652b8[NUM_RACES]; +extern struct animfloats var800656c0[]; +extern struct var80065750 *var80065ae0[][32]; +extern struct animfloats var80065be0[]; +extern struct var80065750 *var800662d8[][32]; +extern struct animfloats var800663d8[]; +extern u32 var800666c8; +extern struct var80065750 *var80066a70[][32]; +extern struct var80065750 *var80066ef0[][32]; +extern struct var80065750 *var80067328[][32]; +extern struct animfloats var80067428; +extern struct animfloats var80067a10; +extern struct animfloats var80067a58; +extern struct animfloats var80067aa0; +extern struct animfloats var80067ae8; +extern struct animfloats var80067b30; +extern struct animfloats var80067b78; +extern u32 g_StageFlags; +extern struct chrdata *g_BgChrs; +extern s16 *g_BgChrnums; +extern s32 g_NumBgChrs; +extern s16 *g_TeamList; +extern s16 *g_SquadronList; +extern struct var80067e6c *var80067fdc[]; +extern s16 var80067ff0[]; +extern f32 var80069880; +extern u32 g_TintedGlassEnabled; +extern s32 g_AlarmTimer; +extern struct audiohandle *g_AlarmAudioHandle; +extern f32 g_AlarmSpeakerWeight; +extern f32 var800698e4; +extern s32 var800698e8; +extern f32 var800698ec[3]; +extern u32 var800698f8; +extern f32 var800698fc; +extern struct audiohandle *var80069900; +extern u32 g_CountdownTimerVisible; +extern bool g_CountdownTimerRunning; +extern f32 g_CountdownTimerValue; +extern u32 var80069910; +extern u32 var80069914; +extern u32 var80069918; +extern struct linkliftdoorobj *g_LiftDoors; +extern struct padlockeddoorobj *g_PadlockedDoors; +extern struct safeitemobj *g_SafeItems; +extern struct linksceneryobj *g_LinkedScenery; +extern struct blockedpathobj *g_BlockedPaths; +extern u32 var80069930; +extern s32 var80069934; +extern f32 g_CameraWaitMultiplier; +extern f32 var8006994c; +extern f32 var80069950; +extern f32 var80069954; +extern f32 var80069958; +extern f32 g_AmmoMultiplier; +extern struct padeffectobj *var80069960; +extern s32 var80069964; +extern struct autogunobj *g_ThrownLaptops; +extern struct var8006996c *var8006996c; +extern s32 g_MaxThrownLaptops; +extern struct prop *g_Lifts[MAX_LIFTS]; +extern u32 var80069d90; +extern u32 var8006aaa0; +extern u32 var8006aae4; +extern struct audiochannel *g_AudioChannels; +extern s8 var8006ae18; +extern s8 var8006ae1c; +extern s8 var8006ae20; +extern s8 var8006ae24; +extern s8 var8006ae28; +extern s32 g_ObjectiveLastIndex; +extern bool g_ObjectiveChecksDisabled; +extern u16 var8006ae90[]; +extern u16 var8006af0c[]; +extern u16 var8006af8c[]; +extern struct inventory_menupos invmenupos_00010fd0; +extern struct inventory_typee inve_000110c0; +extern struct weapon *g_Weapons[]; +extern u32 var800700ac; +extern s32 g_CasingsActive; +extern u32 var800705a0; +extern u32 var800705a4; +extern bool var800705a8; +extern u32 var800705ac; +extern u32 var800705b0; +extern u32 var800705b4; +extern u32 var800705b8; +extern u32 var800705bc; +extern s32 g_ViMode; +extern bool g_HiResEnabled; +extern s32 var8007072c; +extern u32 var80070738; +extern u32 var8007073c; +extern struct gecreditsdata *g_CurrentGeCreditsData; +extern u32 var80070744; +extern u32 var80070748; +extern u32 var8007074c; +extern bool g_PlayersWithControl[]; +extern bool g_PlayerInvincible; +extern s32 g_InCutscene; +extern s16 g_DeathAnimations[]; +extern u32 g_NumDeathAnimations; +extern u32 var80071180; +extern u32 var80071184; +extern s32 g_ScissorX1; +extern s32 g_ScissorX2; +extern s32 g_ScissorY1; +extern s32 g_ScissorY2; +extern u32 var800711f0; +extern char *g_StringPointer; +extern char *g_StringPointer2; +extern s32 g_MpPlayerNum; +extern u32 var800714d8; +extern u16 g_ControlStyleOptions[]; +extern struct menudialog g_PreAndPostMissionBriefingMenuDialog; +extern struct stageoverviewentry g_StageNames[NUM_SOLOSTAGES]; +extern struct mission missions[]; +extern struct menudialog g_SoloMissionControlStyleMenuDialog; +extern struct menudialog g_CiControlStyleMenuDialog; +extern struct menudialog g_CiControlStylePlayer2MenuDialog; +extern struct menudialog g_ChangeAgentMenuDialog; +extern struct menudialog g_2PMissionOptionsHMenuDialog; +extern struct menudialog g_2PMissionOptionsVMenuDialog; +extern struct menudialog g_FrWeaponsAvailableMenuDialog; +extern struct menudialog g_SoloMissionPauseMenuDialog; +extern struct menudialog g_2PMissionPauseHMenuDialog; +extern struct menudialog g_2PMissionPauseVMenuDialog; +extern struct cutscene g_Cutscenes[]; +extern struct menudialog g_CiMenuViaPcMenuDialog; +extern struct menudialog g_CiMenuViaPauseMenuDialog; +extern struct menudialog g_CheatsMenuDialog; +extern struct menudialog g_PakChoosePakMenuDialog; +extern struct menudialog g_FilemgrFileSelect4MbMenuDialog; +extern struct menudialog g_MpQuickGo4MbMenuDialog; +extern struct menudialog g_MpConfirmChallenge4MbMenuDialog; +extern struct menudialog g_MainMenu4MbMenuDialog; +extern struct menudialog g_MpEditSimulant4MbMenuDialog; +extern struct menudialog g_AdvancedSetup4MbMenuDialog; +extern struct filelist *g_FileLists[]; +extern bool var80075bd0[]; +extern struct var80075c00 var80075c00[]; +extern s32 var80075d60; +extern u32 var80075d64; +extern u32 var80075d68; +extern s32 var80075d78; +extern u8 unregistered_function1[]; +extern u8 unregistered_function2[]; +extern u8 unregistered_function3[]; +extern struct ailist g_GlobalAilists[]; +extern struct stagethinglist stagethinglist_20e10; +extern struct stagethinglist stagethinglist_20e3c; +extern struct stagethinglist stagethinglist_20e48; +extern struct stagethinglist stagethinglist_20e54; +extern struct stagethinglist stagethinglist_20e60; +extern struct stagethinglist stagethinglist_20e6c; +extern struct stagethinglist stagethinglist_20e80; +extern struct stagethinglist stagethinglist_20e94; +extern struct stagethinglist stagethinglist_20ea4; +extern struct stagethinglist stagethinglist_20ec8; +extern struct stagethinglist stagethinglist_20edc; +extern struct stagethinglist stagethinglist_20eec; +extern struct stagethinglist stagethinglist_20ef8; +extern struct stagethinglist stagethinglist_20f0c; +extern struct stagethinglist stagethinglist_20f18; +extern struct stagethinglist stagethinglist_20f24; +extern struct stagethinglist stagethinglist_20f50; +extern struct stagethinglist stagethinglist_20f5c; +extern struct stagethinglist stagethinglist_20f74; +extern struct stagethinglist stagethinglist_20f84; +extern struct stagethinglist stagethinglist_20fb8; +extern struct stagethinglist stagethinglist_20fd8; +extern struct stagethinglist stagethinglist_20fe8; +extern struct stagethinglist stagethinglist_20ff8; +extern struct stagethinglist stagethinglist_2100c; +extern struct stagethinglist stagethinglist_21018; +extern struct stagethinglist stagethinglist_21024; +extern struct stagethinglist stagethinglist_21034; +extern struct stagethinglist stagethinglist_21084; +extern struct modelstate g_ModelStates[441]; +extern u8 propexplosiontypes[]; +extern struct stagethinglist stagethinglist_2208c; +extern struct stagethinglist stagethinglist_220a4; +extern struct stagethinglist stagethinglist_220d0; +extern u32 var8007c0c0; +extern struct stagethinglist stagethinglist_221a4; +extern struct stagethinglist stagethinglist_221b4; +extern struct stagethinglist stagethinglist_221cc; +extern struct stagethinglist stagethinglist_221e4; +extern struct stagethinglist stagethinglist_22200; +extern struct stagethinglist stagethinglist_22220; +extern struct stagethinglist stagethinglist_2224c; +extern struct stagethinglist stagethinglist_222b4; +extern struct stagethinglist stagethinglist_22318; +extern struct stagethinglist stagethinglist_22374; +extern struct stagethinglist stagethinglist_223d4; +extern struct stagethinglist stagethinglist_22424; +extern struct stagethinglist stagethinglist_2247c; +extern struct stagethinglist stagethinglist_224d8; +extern struct stagethinglist stagethinglist_22538; +extern struct stagethinglist stagethinglist_2258c; +extern struct stagethinglist stagethinglist_225d8; +extern struct stagethinglist stagethinglist_22630; +extern struct stagethinglist stagethinglist_22698; +extern struct stagethinglist stagethinglist_226e8; +extern struct stagethinglist stagethinglist_22754; +extern struct stagethinglist stagethinglist_227ac; +extern struct stagethinglist stagethinglist_22804; +extern struct stagethinglist stagethinglist_2285c; +extern struct stagethinglist stagethinglist_228b4; +extern struct stagethinglist stagethinglist_2291c; +extern struct stagethinglist stagethinglist_22970; +extern struct stagethinglist stagethinglist_229c4; +extern struct stagethinglist stagethinglist_22a20; +extern struct stagethinglist stagethinglist_22a78; +extern struct stagethinglist stagethinglist_22adc; +extern struct stagethinglist stagethinglist_22b28; +extern struct stagethinglist stagethinglist_22b80; +extern struct stagethinglist stagethinglist_22be0; +extern struct stagethinglist stagethinglist_22c3c; +extern struct stagethinglist stagethinglist_22c54; +extern struct stagethinglist stagethinglist_22ca0; +extern struct stagethinglist stagethinglist_22cf0; +extern struct stagethinglist stagethinglist_22d40; +extern struct stagethinglist stagethinglist_22d90; +extern struct stagethinglist stagethinglist_22de0; +extern struct stagethinglist stagethinglist_22e34; +extern struct stagethinglist stagethinglist_22e60; +extern struct stagethinglist stagethinglist_22eb8; +extern struct stagethinglist stagethinglist_22ec8; +extern struct stagethinglist stagethinglist_22f0c; +extern struct stagethinglist stagethinglist_22f1c; +extern struct body g_Bodies[]; +extern u32 var8007dae4; +extern f32 var8007db80; +extern f32 var8007db84; +extern u32 var8007db88; +extern u32 var8007db94; +extern u32 var8007dba0; +extern u32 var8007dbb8; +extern u32 var8007dbd0; +extern u32 var8007dbe8; +extern u32 var8007dbf4; +extern u32 var8007dc00; +extern struct var8007e3d0 var8007e3d0[]; +extern u32 var8007e4a0; +extern u32 var8007e4a4; +extern f32 var8007e4a8; +extern struct sparktype g_SparkTypes[]; +extern s32 g_SparksAreActive; +extern struct weatherdata *g_WeatherData; +extern u32 var8007fa80; +extern bool g_ShardsActive; +extern s32 g_ScaleX; +extern struct font *g_FontNumeric2; +extern struct font2a4 *g_FontNumeric1; +extern struct font *g_FontHandelGothicXs2; +extern struct font2a4 *g_FontHandelGothicXs1; +extern struct font *g_FontHandelGothicSm2; +extern struct font2a4 *g_FontHandelGothicSm1; +extern struct font *g_FontHandelGothicMd2; +extern struct font2a4 *g_FontHandelGothicMd1; +extern struct font *g_FontHandelGothicLg2; +extern struct font2a4 *g_FontHandelGothicLg1; +extern u32 var8007fb9c; +extern u32 g_StageIndex; +extern s16 var8007fc0c; +extern u32 var8007fc24; +extern u16 var8007fc3c; +extern s32 g_NumPortalThings; +extern f32 var8007fcb4; +extern struct stagetableentry g_Stages[61]; +extern s32 var80082050; +extern u32 g_GfxNumSwaps; +extern s32 g_NumReasonsToEndMpMatch; +extern u32 var800840c4; +extern u32 var800840d8; +extern u32 var800840e0; +extern u32 var800840e4; +extern u32 var800840f0; +extern u32 var800840f4; +extern u32 var800840f8; +extern u32 var800840fc; +extern u32 g_LanguageId; +extern struct something *somethings[]; +extern void *var800844f0; +extern f32 var800845d4; +extern u32 var800845dc; +extern struct menudialog g_2PMissionInventoryHMenuDialog; +extern struct menudialog g_2PMissionInventoryVMenuDialog; +extern struct menudialog g_MpEndscreenChallengeCheatedMenuDialog; +extern struct menudialog g_MpEndscreenChallengeFailedMenuDialog; +extern struct menudialog g_MpDropOutMenuDialog; +extern struct mparena g_MpArenas[]; +extern struct menudialog g_MpWeaponsMenuDialog; +extern struct menudialog g_MpPlayerOptionsMenuDialog; +extern struct menudialog g_MpControlMenuDialog; +extern struct menudialog g_MpPlayerStatsMenuDialog; +extern struct menudialog g_MpPlayerNameMenuDialog; +extern struct menudialog g_MpLoadSettingsMenuDialog; +extern struct menudialog g_MpLoadPresetMenuDialog; +extern struct menudialog g_MpLoadPlayerMenuDialog; +extern struct menudialog g_MpArenaMenuDialog; +extern struct menudialog g_MpLimitsMenuDialog; +extern struct menudialog g_MpHandicapsMenuDialog; +extern struct menudialog g_MpReadyMenuDialog; +extern struct menudialog g_MpSimulantsMenuDialog; +extern struct menudialog g_MpTeamsMenuDialog; +extern struct menudialog g_MpChallengeListOrDetailsMenuDialog; +extern struct menudialog g_MpChallengeListOrDetailsViaAdvChallengeMenuDialog; +extern struct menudialog g_MpAdvancedSetupMenuDialog; +extern struct menudialog g_MpQuickGoMenuDialog; +extern struct menudialog g_MpQuickTeamGameSetupMenuDialog; +extern struct menudialog g_MpQuickTeamMenuDialog; +extern struct menudialog g_CombatSimulatorMenuDialog; +extern struct menudialog g_MpCombatOptionsMenuDialog; +extern struct menudialog g_MpBriefcaseOptionsMenuDialog; +extern struct menudialog g_MpCaptureOptionsMenuDialog; +extern struct menudialog g_MpHillOptionsMenuDialog; +extern struct menudialog g_MpHackerOptionsMenuDialog; +extern struct menudialog g_MpPopacapOptionsMenuDialog; +extern struct mpscenariooverview g_MpScenarioOverviews[]; +extern struct menudialog g_MpScenarioMenuDialog; +extern struct menudialog g_MpQuickTeamScenarioMenuDialog; +extern s32 var80087260; +extern u32 var80087264; +extern struct mpweapon g_MpWeapons[0x27]; +extern struct mphead g_MpHeads[75]; +extern struct mpsimulanttype g_MpSimulantTypes[]; +extern struct mpbody g_MpBodies[NUM_MPBODIES]; +extern struct mppreset g_MpPresets[NUM_MPPRESETS]; +extern u32 g_TeamColours[]; +extern u16 var80087ce4[]; +extern u8 g_NumMpSimulantChrs; +extern u32 var80087eb0; +extern u32 var80087eb4; +extern struct challenge g_MpChallenges[NUM_CHALLENGES]; +extern u8 g_FrIsValidWeapon; +extern s32 g_FrWeaponNum; +extern u8 g_ChrBioSlot; +extern u8 g_HangarBioSlot; +extern u8 g_DtSlot; +extern u8 var80088bb4; +extern struct menudialog g_FrWeaponListMenuDialog; +extern struct menudialog g_FrTrainingInfoInGameMenuDialog; +extern struct menudialog g_FrTrainingInfoPreGameMenuDialog; +extern struct menudialog g_FrCompletedMenuDialog; +extern struct menudialog g_FrFailedMenuDialog; +extern struct menudialog g_BioListMenuDialog; +extern struct menudialog g_DtListMenuDialog; +extern struct menudialog g_DtDetailsMenuDialog; +extern struct menudialog g_DtFailedMenuDialog; +extern struct menudialog g_DtCompletedMenuDialog; +extern struct menudialog g_HtListMenuDialog; +extern struct menudialog g_HtDetailsMenuDialog; +extern struct menudialog g_HtFailedMenuDialog; +extern struct menudialog g_HtCompletedMenuDialog; +extern struct menudialog g_HangarListMenuDialog; + +#endif diff --git a/src/include/game/activemenu/activemenu.h b/src/include/game/activemenu/activemenu.h index 96a01b647..51f58686a 100644 --- a/src/include/game/activemenu/activemenu.h +++ b/src/include/game/activemenu/activemenu.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_ACTIVEMENU_ACTIVEMENU_H #define IN_GAME_ACTIVEMENU_ACTIVEMENU_H #include +#include "data.h" #include "types.h" void amOpenPickTarget(void); diff --git a/src/include/game/activemenu/tick.h b/src/include/game/activemenu/tick.h index a55a5acd1..a670584a6 100644 --- a/src/include/game/activemenu/tick.h +++ b/src/include/game/activemenu/tick.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_ACTIVEMENU_TICK_H #define _IN_GAME_ACTIVEMENU_TICK_H #include +#include "data.h" #include "types.h" void amTick(void); diff --git a/src/include/game/atan2f.h b/src/include/game/atan2f.h index 5ce7bb879..47baff38b 100644 --- a/src/include/game/atan2f.h +++ b/src/include/game/atan2f.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_ATAN2F_H #define IN_GAME_ATAN2F_H #include +#include "data.h" #include "types.h" f32 atan2f(f32 x, f32 z); diff --git a/src/include/game/bondbike.h b/src/include/game/bondbike.h index 971ad4f1b..75991943b 100644 --- a/src/include/game/bondbike.h +++ b/src/include/game/bondbike.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_BONDBIKE_H #define IN_GAME_BONDBIKE_H #include +#include "data.h" #include "types.h" void bbikeInit(void); diff --git a/src/include/game/bondcutscene.h b/src/include/game/bondcutscene.h index 92859c19f..02269d5be 100644 --- a/src/include/game/bondcutscene.h +++ b/src/include/game/bondcutscene.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_BONDCUTSCENE_H #define IN_GAME_BONDCUTSCENE_H #include +#include "data.h" #include "types.h" void bcutsceneInit(void); diff --git a/src/include/game/bondeyespy.h b/src/include/game/bondeyespy.h index 5debb2206..645a6ce44 100644 --- a/src/include/game/bondeyespy.h +++ b/src/include/game/bondeyespy.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_BONDEYESPY_H #define IN_GAME_BONDEYESPY_H #include +#include "data.h" #include "types.h" f32 eyespyFindGround(s16 *floorroom); diff --git a/src/include/game/bondgrab.h b/src/include/game/bondgrab.h index af6465851..5349132c8 100644 --- a/src/include/game/bondgrab.h +++ b/src/include/game/bondgrab.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_BONDGRAB_H #define IN_GAME_BONDGRAB_H #include +#include "data.h" #include "types.h" void bgrabInit(void); diff --git a/src/include/game/bondhead.h b/src/include/game/bondhead.h index f1253ed1e..630709acc 100644 --- a/src/include/game/bondhead.h +++ b/src/include/game/bondhead.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_BONDHEAD_H #define IN_GAME_BONDHEAD_H #include +#include "data.h" #include "types.h" void bheadFlipAnimation(void); diff --git a/src/include/game/bondmove.h b/src/include/game/bondmove.h index fc5f211eb..8c13fdbbd 100644 --- a/src/include/game/bondmove.h +++ b/src/include/game/bondmove.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_BONDMOVE_H #define IN_GAME_BONDMOVE_H #include +#include "data.h" #include "types.h" void bmoveSetControlDef(u32 controldef); diff --git a/src/include/game/bondview.h b/src/include/game/bondview.h index 079f4733e..1806678ab 100644 --- a/src/include/game/bondview.h +++ b/src/include/game/bondview.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_BONDVIEW_H #define _IN_GAME_BONDVIEW_H #include +#include "data.h" #include "types.h" Gfx *bviewRenderIrRect(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2); diff --git a/src/include/game/bondwalk.h b/src/include/game/bondwalk.h index b8bf2fb78..f06014111 100644 --- a/src/include/game/bondwalk.h +++ b/src/include/game/bondwalk.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_BONDWALK_H #define IN_GAME_BONDWALK_H #include +#include "data.h" #include "types.h" void bwalkInit(void); diff --git a/src/include/game/camdraw.h b/src/include/game/camdraw.h index b457a1c35..ee2293c57 100644 --- a/src/include/game/camdraw.h +++ b/src/include/game/camdraw.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_CAMDRAW_H #define _IN_GAME_CAMDRAW_H #include +#include "data.h" #include "types.h" u32 func0f149c90(void); diff --git a/src/include/game/casing.h b/src/include/game/casing.h index 99edc3302..f9211fc15 100644 --- a/src/include/game/casing.h +++ b/src/include/game/casing.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_CASING_H #define IN_GAME_CASING_H #include +#include "data.h" #include "types.h" void casingsReset(void); diff --git a/src/include/game/ceil.h b/src/include/game/ceil.h index c16a99fcc..c59c0937c 100644 --- a/src/include/game/ceil.h +++ b/src/include/game/ceil.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_CEIL_H #define IN_GAME_CEIL_H #include +#include "data.h" #include "types.h" f32 ceilf(f32 value); diff --git a/src/include/game/cheats.h b/src/include/game/cheats.h index 0d067f09f..6fc9a0075 100644 --- a/src/include/game/cheats.h +++ b/src/include/game/cheats.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_CHEATS_H #define IN_GAME_CHEATS_H #include +#include "data.h" #include "types.h" extern struct menudialog g_CheatsMenuDialog; diff --git a/src/include/game/chr/chr.h b/src/include/game/chr/chr.h index f2967eec0..1760a1d67 100644 --- a/src/include/game/chr/chr.h +++ b/src/include/game/chr/chr.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_CHR_CHR_H #define _IN_GAME_CHR_CHR_H #include +#include "data.h" #include "types.h" void func0f01e250(void); diff --git a/src/include/game/chr/chraction.h b/src/include/game/chr/chraction.h index 6c62d01d5..f821ec36b 100644 --- a/src/include/game/chr/chraction.h +++ b/src/include/game/chr/chraction.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_CHR_CHRACTION_H #define _IN_GAME_CHR_CHRACTION_H #include +#include "data.h" #include "types.h" extern struct animfloats var800656c0[]; diff --git a/src/include/game/chr/chrai.h b/src/include/game/chr/chrai.h index 50810fd1f..da9af8788 100644 --- a/src/include/game/chr/chrai.h +++ b/src/include/game/chr/chrai.h @@ -1,6 +1,7 @@ #ifndef _IN_CHR_CHRAI_H #define _IN_CHR_CHRAI_H #include +#include "data.h" #include "types.h" s32 chraiGetListIdByList(u8 *ailist, bool *is_global); diff --git a/src/include/game/chr/chraicommands.h b/src/include/game/chr/chraicommands.h index 94a134cd2..218aaaaac 100644 --- a/src/include/game/chr/chraicommands.h +++ b/src/include/game/chr/chraicommands.h @@ -1,6 +1,7 @@ #ifndef _IN_CHR_CHRAICOMMANDS_H #define _IN_CHR_CHRAICOMMANDS_H #include +#include "data.h" #include "types.h" /*0x0000*/ bool aiGoToNext(void); diff --git a/src/include/game/core.h b/src/include/game/core.h index ba7e05515..57983e13f 100644 --- a/src/include/game/core.h +++ b/src/include/game/core.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_CORE_H #define _IN_GAME_CORE_H #include +#include "data.h" #include "types.h" u32 getVar80084040(void); diff --git a/src/include/game/credits.h b/src/include/game/credits.h index 01b2737a1..37885a7cc 100644 --- a/src/include/game/credits.h +++ b/src/include/game/credits.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_CREDITS_H #define _IN_GAME_CREDITS_H #include +#include "data.h" #include "types.h" void func0f137430(struct gfxvtx *vertices, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6); diff --git a/src/include/game/data/ailists.h b/src/include/game/data/ailists.h deleted file mode 100644 index 816b95d4b..000000000 --- a/src/include/game/data/ailists.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef IN_GAME_DATA_AILISTS_H -#define IN_GAME_DATA_AILISTS_H -#include - -extern struct ailist g_GlobalAilists[]; - -#endif diff --git a/src/include/game/data/data_000000.h b/src/include/game/data/data_000000.h deleted file mode 100644 index e7a2afacb..000000000 --- a/src/include/game/data/data_000000.h +++ /dev/null @@ -1,233 +0,0 @@ -#ifndef IN_GAME_DATA_000000_H -#define IN_GAME_DATA_000000_H -#include -#include "types.h" - -extern s32 g_StageNum; -extern u64 g_RngSeed; - -extern struct chrdata *g_ChrSlots; // pointer to first element of chrs array -extern s32 g_NumChrSlots; -extern u32 var8005ce60; -extern u32 var8005ce64; -extern u32 var8005ce68; -extern u32 var8005ce6c; -extern u32 var8005ce70; -extern u32 g_CountdownTimerVisible; -extern bool g_CountdownTimerRunning; -extern f32 g_CountdownTimerValue; -extern u32 g_StageFlags; - -extern struct audiorussmapping g_AudioRussMappings[]; -extern struct audioconfig g_AudioConfigs[]; - -extern bool (*g_CommandPointers[NUM_AICOMMANDS])(void); -extern u16 g_CommandLengths[NUM_AICOMMANDS]; - -extern struct coord var80068fec; - -extern u32 g_TintedGlassEnabled; -extern s32 g_AlarmTimer; // counts upwards -extern u32 var80059fe0; -extern u32 var8005a0b0; -extern u32 var8005b4d0; -extern u8 *g_StackStartAddrs[7]; -extern u8 *g_StackEndAddrs[7]; -extern u8 *g_StackAllocatedPos; -extern s32 var8005ce74; -extern f32 var8005ce78[2]; -extern f32 var8005ce80[2]; -extern u32 var8005ce88[2]; -extern s32 var8005ce90; -extern u32 var8005ce94; -extern u32 var8005ce9c; -extern OSMesg var8005cea8; -extern u32 var8005cec8; -extern s8 var8005ced0; -extern u32 __osViDevMgr; -extern u32 var8005cefc; -extern OSDevMgr __osPiDevMgr; -extern u32 var8005cf30; -extern OSTime osClockRate; -extern s32 osViClock; -extern u32 var8005cf6c; -extern u32 __osGlobalIntMask; -extern u32 var8005cf84; -extern u32 var8005cf90; -extern u8 var8005cf94; -extern u32 var8005cf98; -extern u32 var8005cfc0; -extern u32 var8005cfe8; -extern u32 var8005d010; -extern u32 var8005d0d8; -extern u32 var8005d120; -extern u32 var8005d188; -extern u32 var8005d1f0; -extern u32 var8005d258; -extern u32 var8005d2e0; -extern u32 var8005d308; -extern u32 var8005d390; -extern u32 var8005d3b8; -extern u32 var8005d4c0; -extern u32 var8005d4e8; -extern s8 g_AudioIsThreadRunning; -extern u32 var8005d518; -extern u32 var8005d520; -extern struct rend_vidat var8005d530; -extern u32 var8005d588; -extern struct rend_vidat *var8005d590; -extern struct rend_vidat *g_ViData; -extern u32 var8005d59c; -extern u32 var8005d5b4; -extern u32 var8005d5b8; -extern u32 var8005d5bc; -extern u32 var8005d880; -extern u32 var8005d994; -extern u8 g_LoadState; -extern s32 var8005d9c8; -extern u32 var8005d9cc; -extern s32 var8005d9d0; -extern s32 g_DoBootPakMenu; -extern Gfx var8005dcc8[]; -extern Gfx var8005dcf0[]; -extern u32 var8005dd1c; -extern s32 g_MainStageNum; -extern u32 var8005dd5c; -extern u32 var8005dd7c; -extern bool g_Silent; -extern u32 var8005dda8; -extern u32 var8005ddac; -extern u32 var8005ddb4; -extern u32 var8005ddb8; -extern u32 var8005ddc0; -extern u32 var8005ddc4; -extern u16 g_SfxVolume; -extern u32 g_SoundMode; -extern s32 var8005ddd4; -extern u32 var8005ddd8; -extern u32 var8005dde0; -extern u32 var8005edf0; -extern s32 argc; -extern char *argv[]; -extern struct contdata *g_ContDataPtr; -extern bool g_ContBusy; -extern u32 var8005ee68; -extern u32 g_ContBadReadsStickX[4]; -extern u32 g_ContBadReadsStickY[4]; -extern u32 g_ContBadReadsButtons[4]; -extern u32 g_ContBadReadsButtonsPressed[4]; -extern u8 g_ConnectedControllers; -extern bool g_ContInitDone; -extern bool g_ContNeedsInit; -extern u32 var8005eebc; -extern s32 g_ContNextPfsStateIndex; -extern u32 var8005eedc; -extern s32 var8005eee0; -extern s32 var8005eee4; -extern u32 var8005eee8; -extern u32 var8005ef08; -extern s32 var8005ef0c; -extern u32 var8005ef10; -extern s32 g_NumGlobalAilists; -extern s32 g_NumLvAilists; -extern u32 var8005ef40; -extern u32 var8005ef5c; -extern u32 var8005ef7c; -extern u32 var8005ef90; -extern u32 var8005efb4; -extern u32 var8005efb8; -extern bool var8005efbc; -extern void *var8005efc8; -extern u32 var8005efcc; -extern u32 var8005efd0; -extern u32 var8005efe0; -extern u32 var8005efec; -extern s16 g_NumAnimations; -extern struct animheader *g_Anims; -extern u32 var8005f010; -extern u32 var8005f014; -extern u32 var8005f018; -extern u32 var8005f01c; -extern u32 var8005f020; -extern u32 var8005f034; -extern u32 var8005f038; -extern u16 *var8005f040; -extern u16 *var8005f044; -extern u32 var8005f048; -extern u32 var8005f0a8; -extern u32 var8005f108; -extern u32 var8005f548; -extern u32 var8005f6f8; -extern u32 var8005f6fc; -extern OSViMode osViModeTable[42]; -extern u32 var8005f7b0; -extern u32 var8005f8f0; -extern u32 var8005fa80; -extern u32 var80060004; -extern u32 var80060008; -extern u32 var8006000c; -extern u32 var80060014; -extern u32 var80060028; -extern u32 var8006005c; -extern u32 var80060070; -extern u32 var80060190; -extern u32 var800601b0; -extern u32 var80060340; -extern u32 var80060368; -extern OSTimer *__osTimerList; -extern u32 var80060890; -extern __OSViContext var800608b0[2]; -extern __OSViContext *__osViCurr; -extern __OSViContext *__osViNext; -extern u32 __osPiAccessQueueEnabled; -extern u32 __osThreadTail; -extern OSThread *__osRunQueue; -extern OSThread *__osActiveQueue; -extern OSThread *__osRunningThread; -extern OSThread *__osFaultedThread; -extern u32 __osSiAccessQueueEnabled; -extern u32 var80060970; -extern u8 var80060984; -extern u32 var800609a0; -extern u32 var800609c4; -extern u32 var800611f0; -extern OSViMode osViModePalLan1; -extern OSViMode osViModeMpalLan1; -extern OSViMode osViModeNtscLan1; -extern char ldigs[]; -extern char udigs[]; -extern u32 var80061360; -extern u32 var80061380; -extern u32 var800613a0; -extern struct var80061420 *var80061420; -extern u32 var80061424; -extern u32 var8006142c; -extern u16 **var80061430; -extern u32 var80061434; -extern u32 var80061438; -extern u32 var80061440; -extern u32 var80061444; -extern s32 var80061458; -extern u32 var80061460; -extern u32 var80061468; -extern s32 g_FootstepSounds[]; -extern u16 var800615a0[][2]; -extern f32 var80061630; -extern u32 var80061634; -extern bool g_NbombsActive; -extern f32 var80061644; -extern u32 var80061648; -extern u32 var8006164c; -extern u32 var80061694; -extern u32 var800616dc; -extern struct audiohandle *g_NbombAudioHandle; -extern u32 var800616e8; -extern struct stageheadlimit g_StageHeadLimits[3]; -extern u32 var80061710; -extern struct monitorscreen var80061a80; -extern struct monitorscreen var80061af4; -extern struct monitorscreen var80061b68; -extern f32 g_DoorScale; -extern u32 var80061bf0; - -#endif diff --git a/src/include/game/data/data_0083d0.h b/src/include/game/data/data_0083d0.h deleted file mode 100644 index 8e2553ab9..000000000 --- a/src/include/game/data/data_0083d0.h +++ /dev/null @@ -1,207 +0,0 @@ -#ifndef IN_GAME_DATA_0083D0_H -#define IN_GAME_DATA_0083D0_H -#include -#include "types.h" - -extern u32 var800623b0; -extern s32 g_WeatherActive; -extern u32 var80062400; -extern u32 var80062410; -extern s16 var800624a0; -extern s32 var800624a4; -extern u32 var800624a8; -extern u32 var800624ac; -extern u32 var800624b0; -extern s32 g_TitleMode; -extern s32 g_TitleNextMode; -extern u32 g_TitleDelayedTimer; -extern s32 g_TitleDelayedMode; -extern s32 g_TitleTimer; -extern u32 var800624e0; -extern s32 g_TitleNextStage; -extern u32 var800624e8; -extern u32 var800624ec; -extern u32 var800624f0; -extern u32 var800624f4; -extern struct model *g_TitleModel; -extern struct model *g_TitleModel2; -extern struct model *var80062508; -extern struct model *var8006250c; -extern u32 var80062530; -extern u32 var80062538; -extern u32 var80062560; -extern u32 var80062568; -extern u32 var80062578; -extern u32 var80062580; -extern u32 var80062590; -extern u32 var80062598; -extern u32 var800625a8; -extern u32 var800625f0; -extern u32 var800626ec; -extern s32 var80062730; -extern u32 var80062738; -extern u32 var80062744; -extern u32 var80062750; -extern u32 var8006275c; -extern u32 var80062768; -extern f32 var800627a8; -extern f32 var800627ac; -extern f32 var800627b0; -extern f32 var800627b4; -extern f32 var800627c4; -extern f32 var800627c8; -extern u32 var800627cc; -extern u32 var800627d4; -extern u32 var800627dc; -extern u32 var800627e0; -extern u32 var800627e8; -extern u32 var800627f0; -extern s32 var800627f8; -extern s32 var800627fc; -extern u32 var80062800; -extern f32 var80062808; -extern s32 var80062810; -extern f32 var80062814; -extern u32 var80062818; -extern u32 var80062858; -extern struct audiohandle *g_TitleAudioHandle; -extern u32 var80062868; -extern u32 var80062870; -extern u32 var8006287c; -extern u32 var800628bc; -extern u32 var800628c8; -extern u32 var800628d4; -extern u32 var80062914; -extern s32 g_NumPlayers; -extern u8 g_FileState; -extern u8 var80062944; -extern u8 var80062948; -extern u8 var8006294c; -extern u32 var80062950; -extern bool g_WeatherTickEnabled; -extern void *var80062960; -extern u32 var80062964; -extern f32 var80062968; -extern bool var8006296c; -extern s32 g_SelectedAnimNum; -extern u32 var80062974; -extern u32 var80062978; -extern u32 var8006297c; -extern u32 var80062980; -extern s32 g_NextChrnum; -extern u32 var80062990; -extern u32 var80062998; -extern u32 var800629d8; -extern u32 var800629fc; -extern u32 var80062a3c; -extern u8 var80062a48[]; -extern u32 var80062a4c; -extern struct var80062a8c *var80062a8c; // pointer to array -extern s32 var80062a90; // true if var80062a8c has anything in its array -extern u32 var80062a94; -extern u32 var80062aa0; -extern s32 g_NumBondBodies; -extern s32 g_NumMaleGuardHeads; -extern s32 g_NumFemaleGuardHeads; -extern s32 g_NumMaleGuardTeamHeads; -extern s32 g_NumFemaleGuardTeamHeads; -extern s32 var80062b14; -extern s32 var80062b18; -extern s32 g_BondBodies[]; -extern s32 g_MaleGuardHeads[]; -extern s32 g_MaleGuardTeamHeads[]; -extern s32 g_FemaleGuardHeads[]; -extern s32 g_FemaleGuardTeamHeads[]; -extern s32 var80062c80; -extern s32 g_ActiveMaleHeadsIndex; -extern s32 g_ActiveFemaleHeadsIndex; -extern s32 g_FemGuardHeads[3]; -extern f32 var80062ca0; -extern f32 var80062ca4; -extern f32 var80062ca8; -extern f32 var80062cac; -extern u32 var80062cb0; -extern u32 var80062cb4; -extern u32 var80062cb8; -extern s32 var80062cbc; -extern struct somedruggedracething *var800652b8[NUM_RACES]; -extern u32 var800652bc; -extern u32 var800652c0; -extern u32 var800652c8; -extern u32 var800652cc; -extern u32 var80065548; -extern u32 var80065640; -extern u32 var80065680; -extern struct var80065750 *var80065ae0[2][32]; -extern struct var80065750 *var800662d8[2][32]; -extern u32 var800666c8; -extern struct var80065750 *var80066a70[2][32]; -extern struct var80065750 *var80066ef0[2][32]; -extern struct var80065750 *var80067328[2][32]; -extern struct animfloats var80067428; -extern struct animfloats var80067470; -extern struct animfloats var800674b8; -extern struct animfloats var80067500; -extern struct animfloats var80067548; -extern struct animfloats var80067590; -extern struct animfloats var800675d8; -extern struct animfloats var80067620; -extern struct animfloats var80067668; -extern struct animfloats var800676b0; -extern struct animfloats var800676f8; -extern struct animfloats var80067740; -extern struct animfloats var80067788; -extern struct animfloats var800677d0; -extern struct animfloats var80067818; -extern struct animfloats var80067860; -extern struct animfloats var800678a8; -extern struct animfloats var800678f0; -extern struct animfloats var80067938; -extern struct animfloats var80067980[]; -extern struct animfloats var80067bc0; -extern struct animfloats var80067c08[]; -extern struct animfloats var80067d28[]; -extern struct animfloats var80067d70[]; -extern u32 var80067e50; -extern struct chrdata *g_BgChrs; -extern s16 *g_BgChrnums; -extern s32 g_NumBgChrs; -extern s16 *g_TeamList; -extern s16 *g_SquadronList; -extern struct var80067e6c *var80067fdc[5]; -extern s16 var80067ff0[]; -extern s16 *var80068008[5]; -extern u32 var8006801c; -extern u32 var80068024; -extern u32 var8006802c; -extern u32 var80068034; -extern u32 var8006803c; -extern u32 var80068044; -extern u32 var8006804c; -extern u32 var80068054; -extern u32 var8006805c; -extern u32 var80068064; -extern u32 var8006806c; -extern u32 var80068074; -extern s32 g_DrCarollDyingTimer; -extern u8 var80068080; -extern u32 var80068084; -extern u32 var800680bc; -extern u32 var8006819c; -extern u32 var800681a8; -extern u32 var800681b0; -extern u32 var800681bc; -extern u32 var800681c4; -extern u32 var800681e0; -extern u32 var80068214; -extern u32 var80068228; -extern u32 var80068230; -extern u32 var8006823c; -extern u32 var80068268; -extern u32 var80068270; -extern u32 var8006827c; -extern u32 var80068288; -extern u32 var8006829c; -extern u32 var8006835c; - -#endif diff --git a/src/include/game/data/data_00e460.h b/src/include/game/data/data_00e460.h deleted file mode 100644 index 79c6ec2f7..000000000 --- a/src/include/game/data/data_00e460.h +++ /dev/null @@ -1,157 +0,0 @@ -#ifndef IN_GAME_DATA_00E460_H -#define IN_GAME_DATA_00E460_H -#include -#include "types.h" - -extern u32 var80068440; -extern u32 var8006844c; -extern u32 var8006845c; -extern u8 g_ChrTeamIds[MAX_TEAMS]; -extern u32 var8006846c; -extern struct coord var80068fe0; -extern s16 g_GuardQuipBank[][4]; -extern s16 g_SpecialQuipBank[][4]; -extern s16 g_QuipTexts[][4]; -extern s16 g_SkedarQuipBank[][4]; -extern s16 g_MaianQuipBank[][4]; -extern s16 g_CiGreetingQuips[][3]; -extern s16 g_CiMainQuips[][3]; -extern s16 g_CiAnnoyedQuips[][3]; -extern s16 g_CiThanksQuips[]; -extern u16 g_InvestigationPadMap[40]; -extern u32 var80069780; -extern u32 var8006978c; -extern u16 g_PresetAnimations[15]; -extern u8 var80069860[8]; -extern struct coord var80069868; -extern struct coord var80069874; -extern u32 var800698c0; -extern struct audiohandle *g_AlarmAudioHandle; -extern f32 g_AlarmSpeakerWeight; -extern f32 g_AlarmSpeakerDirection; -extern f32 var800698e4; -extern s32 var800698e8; -extern f32 var800698ec[3]; -extern u32 var800698f8; -extern f32 var800698fc; -extern struct audiohandle *var80069900; -extern u32 var80069910; -extern u32 var80069918; -extern struct linkliftdoorobj *g_LiftDoors; -extern struct padlockeddoorobj *g_PadlockedDoors; -extern struct safeitemobj *g_SafeItems; -extern struct linksceneryobj *g_LinkedScenery; -extern struct blockedpathobj *g_BlockedPaths; -extern u32 var8006993c; -extern f32 g_AmmoMultiplier; -extern struct padeffectobj *var80069960; -extern s32 var80069964; -extern struct autogunobj *g_ThrownLaptops; -extern s32 g_MaxThrownLaptops; -extern u32 var80069974; -extern u32 var80069978; -extern u32 var8006997c; -extern u32 var80069980; -extern u32 var800699dc; -extern u32 var800699e8; -extern u32 var800699f4; -extern u32 var800699fc; -extern u32 var80069a08; -extern struct prop *g_Lifts[MAX_LIFTS]; -extern u32 var80069a70; -extern u32 var80069b74; -extern u32 var80069b80; -extern u32 var80069b8c; -extern u32 var80069b98; -extern u32 var80069ba4; -extern u32 var80069bb0; -extern u32 var80069bbc; -extern u32 var80069bc8; -extern u32 var80069bcc; -extern u32 var80069bd0; -extern u32 g_DebugDoor; -extern struct escastepkeyframe g_EscaStepKeyframesX[]; -extern struct escastepkeyframe g_EscaStepKeyframesZ[]; -extern u32 var80069cc4; -extern u32 var80069d04; -extern u32 var80069d44; -extern u32 var80069d84; -extern u32 var80069d90; -extern u32 var80069e0c; -extern u32 var80069ee0; -extern u32 var80069f3c; -extern u32 var80069fb8; -extern u32 var8006a034; -extern u32 var8006a0d0; -extern u32 var8006a160; -extern u32 var8006a18c; -extern u32 var8006a1b8; -extern u32 var8006a1e4; -extern u32 var8006a230; -extern u32 var8006a27c; -extern u32 var8006a2b4; -extern u32 var8006a2ec; -extern u32 var8006a324; -extern u32 var8006a344; -extern u32 var8006a364; -extern u32 var8006a384; -extern u32 var8006a3a4; -extern u32 var8006a3c4; -extern u32 var8006a3e4; -extern u32 var8006a404; -extern u32 var8006a4bc; -extern u32 var8006a6bc; -extern u32 var8006a6dc; -extern u32 var8006a6fc; -extern u32 var8006a728; -extern u32 var8006a754; -extern u32 var8006a774; -extern u32 var8006a7a0; -extern u32 var8006a7cc; -extern u32 var8006a7f8; -extern u32 var8006a818; -extern u32 var8006a894; -extern u32 var8006a910; -extern u32 var8006a930; -extern u32 var8006a950; -extern u32 var8006a970; -extern u32 var8006aa28; -extern u32 var8006aa48; -extern u32 var8006aa68; -extern u32 var8006aa88; -extern u32 var8006aaa0; -extern u32 var8006aae4; -extern u32 var8006ab70; -extern u32 var8006abb0; -extern u32 var8006abc0; -extern u32 var8006abcc; -extern u32 var8006abd8; -extern u32 var8006abe4; -extern u32 var8006abf0; -extern u32 var8006abfc; -extern u32 var8006ac08; -extern u8 g_CiTaggedTerminals[8]; -extern u32 var8006ac6c; -extern u32 var8006acc8; -extern u32 var8006ad24; -extern u32 var8006ad8c; -extern u32 var8006ad90; -extern u32 var8006adf8; -extern struct audiochannel *g_AudioChannels; -extern u32 g_AudioPrevUuid; -extern s8 var8006ae18; -extern s8 var8006ae1c; -extern s8 var8006ae20; -extern s8 var8006ae24; -extern s8 var8006ae28; -extern u32 var8006ae3c; -extern u32 var8006ae5c; -extern s32 g_ObjectiveLastIndex; -extern bool g_ObjectiveChecksDisabled; -extern u32 var8006ae80; -extern u16 var8006ae90[]; -extern u16 var8006af0c[]; -extern u16 var8006af8c[]; -extern u32 var8006afa0; - -#endif diff --git a/src/include/game/data/data_0160b0.h b/src/include/game/data/data_0160b0.h deleted file mode 100644 index 5726987c4..000000000 --- a/src/include/game/data/data_0160b0.h +++ /dev/null @@ -1,235 +0,0 @@ -#ifndef IN_GAME_DATA_0160B0_H -#define IN_GAME_DATA_0160B0_H -#include - -extern struct menudialog g_2PMissionOptionsHMenuDialog; -extern struct menudialog g_2PMissionOptionsVMenuDialog; - -extern u32 var80070090; -extern u32 var80070098; -extern u32 var800700a0; -extern u32 var80070120; -extern u32 var80070124; -extern u32 var80070128; -extern u32 var80070134; -extern u32 var80070140; -extern u32 var8007014c; -extern u32 var800701ac; -extern u32 var800701b8; -extern u32 var800701c0; -extern u32 var800701dc; -extern u32 var800701e4; -extern struct remoteminething var80070200[2]; -extern u32 var80070210; -extern u32 var8007021c; -extern u32 var8007022c; -extern u32 var80070238; -extern u32 var80070244; -extern u32 var80070250; -extern u32 var8007025c; -extern u32 var8007029c; -extern u32 var800702e0; -extern u32 var800702e8; -extern u32 var800702ec; -extern u32 var80070314; -extern u32 var80070318; -extern u32 var80070360; -extern struct ammotype g_AmmoTypes[33]; -extern u32 var80070500; -extern u32 var8007050c; -extern u32 var80070518; -extern s32 g_CasingsActive; -extern u32 var80070528; -extern u32 var80070534; -extern u32 var80070574; -extern u32 var80070578; -extern u32 var8007057c; -extern u32 var80070580; -extern u32 var80070584; -extern u32 var80070590; -extern u32 var800705a0; -extern u32 var800705a4; -extern bool var800705a8; -extern u32 var800705ac; -extern u32 var800705b0; -extern u32 var800705b4; -extern u32 var800705b8; -extern u32 var800705bc; -extern struct vimode g_ViModes[]; -extern s32 g_ViMode; -extern bool g_HiResEnabled; -extern s32 var8007072c; -extern u32 var80070738; -extern u32 var8007073c; -extern struct gecreditsdata *g_CurrentGeCreditsData; -extern u32 var80070744; -extern u32 var80070748; -extern u32 var8007074c; -extern bool g_PlayersWithControl[]; -extern bool g_PlayerInvincible; -extern s32 g_InCutscene; -extern s16 g_DeathAnimations[]; -extern u32 g_NumDeathAnimations; -extern u32 var80070780; -extern u32 var8007078c; -extern u32 var800707a4; -extern u32 var800707f4; -extern u32 var80070800; -extern u32 var8007080c; -extern u32 var80070818; -extern u32 var80070824; -extern u32 var80070830; -extern u32 var8007083c; -extern u32 g_GlobalMenuRoot; -extern struct healthdamagetype g_HealthDamageTypes[]; -extern u32 var800709c4; -extern u32 var800709d0; -extern u32 var800709dc; -extern u32 var800709e8; -extern u32 var80070ba4; -extern u32 var80070e50; -extern u32 var80070e5c; -extern u32 var80070e68; -extern u32 var80070e84; -extern u32 var80070e90; -extern u32 var80070e9c; -extern u32 var80070ea8; -extern u8 var80070ec0; -extern u8 var80070ec4; -extern f32 g_EyespyMaxHeight; -extern f32 g_EyespyMinHeight; -extern u32 g_EyespyFallAccel; -extern u32 g_EyespyMaxFallSpeed; -extern u32 var80070ee0; -extern u32 var80070eec; -extern u32 var80070ef8; -extern u32 var80070f10; -extern u32 var80070f14; -extern u32 var80070f18; -extern u32 var80070f1c; -extern u32 var80070f20; -extern u32 var80070f24; -extern u32 var80070f28; -extern u32 var80070f2c; -extern u32 var80070f30; -extern u32 var80070f34; -extern u32 var80070f38; -extern u32 var80070f3c; -extern u32 var80070f40; -extern u32 var80070f44; -extern u32 var80070f48; -extern u32 var80070f4c; -extern u32 var80070f50; -extern u32 var80070f54; -extern u32 var80070f58; -extern u32 var80070f5c; -extern u32 var80070f60; -extern u32 var80070f64; -extern u32 var80070f68; -extern u32 var80070f6c; -extern u32 var80070f70; -extern u32 var80070f80; -extern u32 var80070f9c; -extern u32 var80070fa0; -extern u32 g_Colours[]; -extern s32 g_NumHudMessages; -extern struct hudmessage *g_HudMessages; -extern struct hudmessageconfig g_HudMessageConfigs[]; -extern u32 var80071170; -extern u32 var80071180; -extern u32 var80071184; -extern s32 g_ScissorX1; -extern s32 g_ScissorX2; -extern s32 g_ScissorY1; -extern s32 g_ScissorY2; -extern s32 var800711a0; -extern s32 var800711a4; -extern u8 g_KeyboardKeys[5][10]; -extern u32 var800711e0; -extern u32 var800711e8; -extern u32 var800711f4; -extern char *g_StringPointer; -extern char *g_StringPointer2; -extern s32 g_MpPlayerNum; -extern u32 var8007144c; -extern u32 var80071468; -extern u32 var80071470; -extern u32 var80071480; -extern u32 var800714c0; -extern u32 var800714c4; -extern u32 var800714c8; -extern u32 var800714d8; -extern u32 var800714dc; -extern u32 var800714e0; -extern u32 var800714ec; -extern u32 var800714f0; -extern u32 var800714f4; -extern struct menudialog g_PakRemovedMenuDialog; -extern struct menudialog g_PakRepairSuccessMenuDialog; -extern struct menudialog g_PakRepairFailedMenuDialog; -extern struct menudialog g_PakAttemptRepairMenuDialog; -extern u16 savelocations[]; -extern struct menudialog g_PakDamagedMenuDialog; -extern struct menudialog g_PakFullMenuDialog; -extern struct menudialog g_PakCannotReadGameBoyMenuDialog; -extern struct menudialog g_PakDataLostMenuDialog; -extern struct menudialog g_AmPickTargetMenuDialog; -extern u8 var800719a0[3][3]; -extern u16 options_controlmode[]; -extern u16 g_AimControlOptions[]; -extern u16 g_SoundModeOptions[]; -extern u16 g_ScreenSizeOptions[]; -extern u16 g_ScreenRatioOptions[]; -extern u16 g_ScreenSplitOptions[]; -extern struct menudialog g_PreAndPostMissionBriefingMenuDialog; -extern struct menudialog g_ChangeAgentMenuDialog; -extern struct menudialog g_AcceptMissionMenuDialog; -extern struct menudialog g_PdModeSettingsMenuDialog; -extern struct menudialog g_SoloMissionDifficultyMenuDialog; -extern struct menudialog g_CoopOptionsMenuDialog; -extern struct menudialog g_AntiOptionsMenuDialog; -extern struct menudialog g_CoopMissionDifficultyMenuDialog; -extern struct menudialog g_AntiMissionDifficultyMenuDialog; -extern struct stageoverviewentry g_StageNames[NUM_SOLOSTAGES]; -extern struct mission missions[]; -extern struct menudialog g_2PMissionControlStyleMenuDialog; -extern struct menudialog g_SoloMissionControlStyleMenuDialog; -extern struct menudialog g_CiControlStyleMenuDialog; -extern struct menudialog g_CiControlStylePlayer2MenuDialog; -extern u32 var80072d8c; -extern u8 g_CassNecklaceUsername[10]; -extern u8 g_CassNecklacePassword[14]; -extern struct menudialog g_FrWeaponsAvailableMenuDialog; -extern struct menudialog g_MissionAbortMenuDialog; -extern struct menudialog g_SoloMissionPauseMenuDialog; -extern struct menudialog g_AudioOptionsMenuDialog; -extern struct menudialog g_2PMissionAudioOptionsVMenuDialog; -extern struct menudialog g_VideoOptionsMenuDialog; -extern struct menudialog g_2PMissionVideoOptionsMenuDialog; -extern struct menudialog g_MissionControlOptionsMenuDialog; -extern struct menudialog g_MissionDisplayOptionsMenuDialog; -extern struct menudialog g_2PMissionDisplayOptionsVMenuDialog; -extern struct menudialog g_CiDisplayMenuDialog; -extern struct menudialog g_SoloMissionBriefingMenuDialog; -extern struct menudialog g_2PMissionBriefingHMenuDialog; -extern struct menudialog g_2PMissionBriefingVMenuDialog; -extern struct menudialog g_CiControlPlayer2MenuDialog; -extern struct menudialog g_CiControlOptionsMenuDialog; -extern struct menuitem g_2PMissionOptionsVMenuItems[]; -extern struct menudialog g_SoloMissionOptionsMenuDialog; -extern struct menudialog g_SoloMissionInventoryMenuDialog; -extern struct menudialog g_2PMissionPauseHMenuDialog; -extern struct menudialog g_2PMissionPauseVMenuDialog; -extern struct cutscene g_Cutscenes[]; -extern struct cutscenegroup cutscenegrouptable[]; -extern struct menudialog g_CinemaMenuDialog; -extern struct menudialog g_SelectMissionMenuDialog; -extern struct menudialog g_CiOptionsViaPcMenuDialog; -extern struct menudialog g_CiOptionsViaPauseMenuDialog; -extern struct menudialog g_CiMenuViaPauseMenuDialog; -extern struct menudialog g_CiMenuViaPcMenuDialog; -extern struct cheat g_Cheats[NUM_CHEATS]; -extern struct menuitem g_CheatsBuddiesMenuItems[]; -extern struct menudialog g_CheatsBuddiesMenuDialog; - -#endif diff --git a/src/include/game/data/data_01a3a0.h b/src/include/game/data/data_01a3a0.h deleted file mode 100644 index a96d26bca..000000000 --- a/src/include/game/data/data_01a3a0.h +++ /dev/null @@ -1,66 +0,0 @@ -#ifndef IN_GAME_DATA_01A3A0_H -#define IN_GAME_DATA_01A3A0_H -#include - -extern struct menudialog g_FilemgrErrorMenuDialog; -extern u16 savelocations2[]; -extern u16 iomessages2[]; -extern u16 filetypenames[]; -extern struct menudialog g_FilemgrFileSavedMenuDialog; -extern struct menudialog g_FilemgrSaveErrorMenuDialog; -extern struct menudialog g_FilemgrFileLostMenuDialog; -extern struct menudialog g_FilemgrSaveElsewhereMenuDialog; -extern struct menudialog g_PakNotOriginalMenuDialog; -extern u32 var8007464c; -extern struct menudialog g_FilemgrRenameMenuDialog; -extern struct menudialog g_FilemgrDuplicateNameMenuDialog; -extern u16 savelocations3[]; -extern struct menudialog g_FilemgrSelectLocationMenuDialog; -extern struct menudialog g_FilemgrConfirmDeleteMenuDialog; -extern struct menudialog g_FilemgrFileInUseMenuDialog; -extern struct menudialog g_FilemgrDeleteMenuDialog; -extern struct menudialog g_FilemgrCopyMenuDialog; -extern struct pakdata *g_EditingPak; -extern struct menudialog g_PakDeleteNoteMenuDialog; -extern struct menudialog g_PakGameNotesMenuDialog; -extern struct menudialog g_PakChoosePakMenuDialog; -extern struct menudialog g_FilemgrEnterNameMenuDialog; -extern struct menudialog g_FilemgrFileSelectMenuDialog; -extern struct menudialog g_FilemgrFileSelect4MbMenuDialog; -extern struct menudialog g_MpQuickGo4MbMenuDialog; -extern struct menudialog g_MpConfirmChallenge4MbMenuDialog; -extern struct menudialog g_MainMenu4MbMenuDialog; -extern struct menudialog g_MpDropOut4MbMenuDialog; -extern struct menudialog g_MpEditSimulant4MbMenuDialog; -extern struct menudialog g_AdvancedSetup4MbMenuDialog; -extern struct filelist *g_FileLists[4]; -extern bool var80075bd0[4]; -extern u32 var80075be0; -extern struct var80075c00 var80075c00[]; -extern struct coord var80075c30; -extern u32 var80075c3c; -extern u32 var80075c48; -extern u32 var80075c54; -extern u32 var80075c94; -extern u32 g_WaypointHashes[2]; -extern char var80075cb4[]; -extern char var80075cc0[]; -extern u32 g_PakDebugForceScrub; -extern u32 g_PakDebugPakDump; -extern u32 g_PakDebugPakCache; -extern u32 g_PakDebugPakInit; -extern u32 g_PakDebugWipeEeprom; -extern u32 g_PakDebugCorruptMe; -extern char g_PakNoteGameName[16]; -extern char g_PakNoteExtName[4]; -extern u8 var80075d10; -extern u32 var80075d18; -extern u32 var80075d2c; -extern u32 var80075d40; -extern u32 g_PakDebugDumpEeprom; -extern s32 var80075d60; -extern u32 var80075d64; -extern u32 var80075d68; -extern s32 var80075d78; - -#endif diff --git a/src/include/game/data/data_020df0.h b/src/include/game/data/data_020df0.h deleted file mode 100644 index 3b13d860f..000000000 --- a/src/include/game/data/data_020df0.h +++ /dev/null @@ -1,309 +0,0 @@ -#ifndef IN_GAME_DATA_020DF0_H -#define IN_GAME_DATA_020DF0_H -#include - -extern struct menudialog g_2PMissionInventoryHMenuDialog; -extern struct menudialog g_2PMissionInventoryVMenuDialog; -extern struct menudialog g_MpWeaponsMenuDialog; -extern struct menudialog g_MpPlayerOptionsMenuDialog; -extern struct menudialog g_MpControlMenuDialog; -extern struct menudialog g_MpPlayerStatsMenuDialog; -extern struct menudialog g_MpPlayerNameMenuDialog; -extern struct menudialog g_MpLoadSettingsMenuDialog; -extern struct menudialog g_MpLoadPresetMenuDialog; -extern struct menudialog g_MpLoadPlayerMenuDialog; -extern struct menudialog g_MpArenaMenuDialog; -extern struct menudialog g_MpLimitsMenuDialog; -extern struct menudialog g_MpHandicapsMenuDialog; -extern struct menudialog g_MpReadyMenuDialog; -extern struct menudialog g_MpSimulantsMenuDialog; -extern struct menudialog g_MpTeamsMenuDialog; -extern struct menudialog g_MpChallengeListOrDetailsMenuDialog; -extern struct menudialog g_MpScenarioMenuDialog; -extern struct menudialog g_MpQuickTeamMenuDialog; - -extern s32 g_Difficulty; - -extern s16 g_FadeNumFrames; -extern f32 g_FadeFrac; -extern u32 g_FadePrevColour; -extern u32 g_FadeColour; -extern s16 g_FadeDelay; - -extern s32 var80087260; -extern struct stagethinglist stagethinglist_20e10; -extern struct stagethinglist stagethinglist_20e3c; -extern struct stagethinglist stagethinglist_20e48; -extern struct stagethinglist stagethinglist_20e54; -extern struct stagethinglist stagethinglist_20e60; -extern struct stagethinglist stagethinglist_20e6c; -extern struct stagethinglist stagethinglist_20e80; -extern struct stagethinglist stagethinglist_20e94; -extern struct stagethinglist stagethinglist_20ea4; -extern struct stagethinglist stagethinglist_20ec8; -extern struct stagethinglist stagethinglist_20edc; -extern struct stagethinglist stagethinglist_20eec; -extern struct stagethinglist stagethinglist_20ef8; -extern struct stagethinglist stagethinglist_20f0c; -extern struct stagethinglist stagethinglist_20f18; -extern struct stagethinglist stagethinglist_20f24; -extern struct stagethinglist stagethinglist_20f50; -extern struct stagethinglist stagethinglist_20f5c; -extern struct stagethinglist stagethinglist_20f74; -extern struct stagethinglist stagethinglist_20f84; -extern struct stagethinglist stagethinglist_20fb8; -extern struct stagethinglist stagethinglist_20fd8; -extern struct stagethinglist stagethinglist_20fe8; -extern struct stagethinglist stagethinglist_20ff8; -extern struct modelstate g_ModelStates[441]; -extern u8 propexplosiontypes[]; -extern struct stagethinglist stagethinglist_2208c; -extern struct stagethinglist stagethinglist_220d0; -extern struct stagethinglist stagethinglist_220a4; -extern struct stagethinglist stagethinglist_2100c; -extern struct stagethinglist stagethinglist_21018; -extern struct stagethinglist stagethinglist_21024; -extern struct stagethinglist stagethinglist_21034; -extern struct stagethinglist stagethinglist_21084; -extern u32 var8007c0c0; -extern struct stagethinglist stagethinglist_221a4; -extern struct stagethinglist stagethinglist_221b4; -extern struct stagethinglist stagethinglist_221cc; -extern struct stagethinglist stagethinglist_221e4; -extern struct stagethinglist stagethinglist_22200; -extern struct stagethinglist stagethinglist_22220; -extern struct stagethinglist stagethinglist_2224c; -extern struct stagethinglist stagethinglist_222b4; -extern struct stagethinglist stagethinglist_22318; -extern struct stagethinglist stagethinglist_22374; -extern struct stagethinglist stagethinglist_223d4; -extern struct stagethinglist stagethinglist_22424; -extern struct stagethinglist stagethinglist_2247c; -extern struct stagethinglist stagethinglist_224d8; -extern struct stagethinglist stagethinglist_22538; -extern struct stagethinglist stagethinglist_2258c; -extern struct stagethinglist stagethinglist_225d8; -extern struct stagethinglist stagethinglist_22630; -extern struct stagethinglist stagethinglist_22698; -extern struct stagethinglist stagethinglist_226e8; -extern struct stagethinglist stagethinglist_22754; -extern struct stagethinglist stagethinglist_227ac; -extern struct stagethinglist stagethinglist_22804; -extern struct stagethinglist stagethinglist_2285c; -extern struct stagethinglist stagethinglist_228b4; -extern struct stagethinglist stagethinglist_2291c; -extern struct stagethinglist stagethinglist_22970; -extern struct stagethinglist stagethinglist_229c4; -extern struct stagethinglist stagethinglist_22a20; -extern struct stagethinglist stagethinglist_22a78; -extern struct stagethinglist stagethinglist_22adc; -extern struct stagethinglist stagethinglist_22b28; -extern struct stagethinglist stagethinglist_22b80; -extern struct stagethinglist stagethinglist_22be0; -extern struct stagethinglist stagethinglist_22c3c; -extern struct stagethinglist stagethinglist_22c54; -extern struct stagethinglist stagethinglist_22ca0; -extern struct stagethinglist stagethinglist_22cf0; -extern struct stagethinglist stagethinglist_22d40; -extern struct stagethinglist stagethinglist_22d90; -extern struct stagethinglist stagethinglist_22de0; -extern struct stagethinglist stagethinglist_22e34; -extern struct stagethinglist stagethinglist_22e60; -extern struct stagethinglist stagethinglist_22eb8; -extern struct stagethinglist stagethinglist_22ec8; -extern struct stagethinglist stagethinglist_22f0c; -extern struct stagethinglist stagethinglist_22f1c; -extern struct body g_Bodies[]; -extern u32 var8007dae4; -extern f32 var8007db80; -extern f32 var8007db84; -extern u32 var8007db88; -extern u32 var8007db94; -extern u32 var8007dba0; -extern u32 var8007dbb8; -extern u32 var8007dbd0; -extern u32 var8007dbe8; -extern u32 var8007dbf4; -extern u32 var8007dc00; -extern u32 var8007dc10; -extern struct var8007e3d0 var8007e3d0[4]; -extern u32 var8007e4a0; -extern u32 var8007e4a4; -extern f32 var8007e4a8; -extern struct explosiontype g_ExplosionTypes[NUM_EXPLOSIONTYPES]; -extern struct smoketype g_SmokeTypes[NUM_SMOKETYPES]; -extern struct sparktype g_SparkTypes[]; -extern s32 g_SparksAreActive; -extern struct weatherdata *g_WeatherData; -extern s32 var8007f0c4[4]; -extern u32 g_RainSpeedExtra; -extern u32 g_SnowSpeed; -extern u32 g_SnowSpeedExtra; -extern u32 var8007f0e0; -extern u32 var8007f0e4; -extern u32 var8007f0e8; -extern u32 var8007f0ec; -extern u32 var8007f0f0; -extern u32 var8007f0f4; -extern u32 var8007f0f8; -extern u32 var8007f0fc; -extern u32 var8007f104; -extern u32 var8007f108; -extern u32 var8007f10c; -extern u32 var8007f110; -extern u32 var8007f120; -extern u32 var8007f124; -extern u32 var8007f130; -extern bool g_CreditsAltTitleRequested; -extern struct creditthing var8007f13c[]; -extern u32 var8007f3cc; -extern u32 var8007f410; -extern u32 var8007f450; -extern u32 var8007f468; -extern u32 var8007f46c; -extern struct credit g_Credits[]; -extern u32 var8007f6c4; -extern u32 var8007f6d4; -extern u32 var8007f6e0; -extern u32 var8007f6e4; -extern u32 var8007f6e8; -extern u32 var8007f6ec; -extern u32 var8007f6f0; -extern u32 var8007f6f4; -extern u32 var8007f6f8; -extern u32 var8007f6fc; -extern u32 var8007f700; -extern u32 var8007f740; -extern u32 var8007f748; -extern u32 var8007f750; -extern u32 var8007f7b0; -extern s32 var8007f840; -extern u8 var8007f844; -extern u8 var8007f848; -extern u32 var8007f860; -extern u32 var8007f864; -extern u32 var8007f868; -extern u32 var8007f86c; -extern u32 var8007f870; -extern u32 var8007f874; -extern u8 var8007f878; -extern u32 var8007f87c; -extern f32 var8007f8a8; -extern u32 var8007f8dc; -extern u32 var8007f8e8; -extern u32 var8007f8ec; -extern u32 var8007f8f0; -extern u32 var8007f8f4; -extern u32 var8007f8f8; -extern u32 var8007f8fc; -extern u32 var8007f900; -extern u32 var8007f904; -extern u32 var8007f9d0; -extern u32 var8007f9d8; -extern u32 var8007f9fc; -extern u32 var8007fa60; -extern u32 var8007fa80; -extern bool g_ShardsActive; -extern u8 g_InGameSubtitles; -extern u8 g_CutsceneSubtitles; -extern s32 g_ScreenSize; -extern s32 g_ScreenRatio; -extern u8 g_ScreenSplit; -extern s32 g_ScaleX; -extern u32 var8007fac4; -extern u32 var8007fac8; -extern u32 var8007facc; -extern u32 var8007fad0; -extern u32 var8007fad4; -extern u32 var8007fad8; -extern u32 var8007fadc; -extern u32 var8007fae0; -extern u32 var8007fae4; -extern u32 var8007fae8; -extern u32 var8007faec; -extern u32 var8007faf0; -extern struct font *g_FontTahoma2; -extern struct font2a4 *g_FontTahoma1; -extern struct font *g_FontNumeric2; -extern struct font2a4 *g_FontNumeric1; -extern struct font *g_FontHandelGothicXs2; -extern struct font2a4 *g_FontHandelGothicXs1; -extern struct font *g_FontHandelGothicSm2; -extern struct font2a4 *g_FontHandelGothicSm1; -extern struct font *g_FontHandelGothicMd2; -extern struct font2a4 *g_FontHandelGothicMd1; -extern struct font *g_FontHandelGothicLg2; -extern struct font2a4 *g_FontHandelGothicLg1; -extern u32 var8007fb24; -extern u32 var8007fb28; -extern u32 var8007fb2c; -extern u32 var8007fb30; -extern u32 var8007fb34; -extern u32 var8007fb38; -extern u32 var8007fb3c; -extern u32 var8007fb5c; -extern u32 var8007fb9c; -extern u32 var8007fbac; -extern u32 var8007fbb0; -extern u32 var8007fbb4; -extern u32 var8007fbb8; -extern u32 var8007fbbc; -extern u32 var8007fbc0; -extern u32 var8007fbc4; -extern u32 var8007fbc8; -extern u32 var8007fbcc; -extern u32 var8007fbdc; -extern u32 var8007fbe8; -extern u32 var8007fbec; -extern u32 g_StageIndex; -extern s16 var8007fc0c; -extern u16 var8007fc10; -extern s32 var8007fc14; -extern s32 g_CamRoom; -extern u32 var8007fc24; -extern u32 var8007fc28; -extern u32 var8007fc2c; -extern s32 var8007fc30; -extern s32 var8007fc34; -extern u32 var8007fc38; -extern u16 var8007fc3c; -extern s32 g_NumPortalThings; -extern u32 var8007fc44; -extern u32 var8007fc4c; -extern u32 var8007fc54; -extern bool g_PortalStack[20]; -extern s32 g_PortalStackIndex; -extern u32 g_PortalMode; -extern u32 var8007fcb0; -extern f32 var8007fcb4; -extern struct stagetableentry g_Stages[61]; -extern u32 var80081018; -extern u32 var80081058; -extern struct smallsky smallskies[]; -extern s32 var80082050; -extern void *filetable[]; -extern u32 g_GfxSizesByPlayerCount[]; -extern u32 g_VtxSizesByPlayerCount[]; -extern u32 g_GfxNumSwaps; -extern u32 var80084010; -extern bool var80084014; -extern f32 var80084018; -extern s32 g_StageTimeElapsed60; -extern s32 g_MpTimeLimit60; -extern s32 g_MpScoreLimit; -extern s32 g_MpTeamScoreLimit; -extern struct audiohandle *g_MiscAudioHandle; -extern s32 g_NumReasonsToEndMpMatch; -extern f32 g_StageTimeElapsed1f; -extern bool var80084040; -extern u32 g_MiscSfxSounds[3]; -extern s32 var80084050; -extern u32 var80084068; -extern u32 var80084078; -extern u32 var80084088; -extern struct audiohandle *g_CutsceneStaticAudioHandle; -extern s32 g_CutsceneStaticTimer; -extern u8 g_CutsceneStaticActive; -extern u32 g_CutsceneTime240_60; - -#endif diff --git a/src/include/game/data/data_02a0e0.h b/src/include/game/data/data_02a0e0.h deleted file mode 100644 index 79a142c4d..000000000 --- a/src/include/game/data/data_02a0e0.h +++ /dev/null @@ -1,100 +0,0 @@ -#ifndef IN_GAME_DATA_02A0E0_H -#define IN_GAME_DATA_02A0E0_H -#include - -extern s32 g_MenuTrack; -extern u32 var800840c4; -extern s32 g_TemporaryPrimaryTrack; -extern s32 g_TemporaryAmbientTrack; -extern s32 var800840d0; -extern u32 var800840d4; -extern u32 var800840d8; -extern s32 var800840dc; -extern u32 var800840e0; -extern s32 var800840e8; -extern u16 var800840ec; -extern u32 var800840f0; -extern u32 var800840f4; -extern u32 var800840fc; -extern u32 g_LanguageId; -extern u16 g_LangFiles[]; -extern u32 var800841b8; -extern u32 var80084220; -extern struct something *somethings[]; -extern u32 var800844d0; -extern void *var800844f0; -extern void *var800844f4; -extern struct stagemusic g_StageTracks[]; -extern f32 var800845d0; -extern f32 var800845d4; -extern s32 var800845d8; -extern u32 var800845dc; -extern struct coord var800845f4; -extern struct menudialog g_MpPausePlayerRankingMenuDialog; -extern struct menudialog g_MpPauseTeamRankingsMenuDialog; -extern u16 g_OrdinalSuffixes[12]; -extern struct menudialog g_MpEndscreenIndGameOverMenuDialog; -extern struct menudialog g_MpEndscreenTeamGameOverMenuDialog; -extern struct menudialog g_MpEndscreenChallengeCompletedMenuDialog; -extern struct menudialog g_MpEndscreenChallengeCheatedMenuDialog; -extern struct menudialog g_MpEndscreenChallengeFailedMenuDialog; -extern struct menudialog g_MpEndscreenSavePlayerMenuDialog; -extern struct menudialog g_MpDropOutMenuDialog; -extern struct mparena g_MpArenas[17]; -extern u32 var80084bf8; -extern u32 var80084c00[]; -extern u16 g_MpControlStyleLabels[4]; -extern u16 g_MpAimModeLabels[2]; -extern struct menudialog g_MpSavePlayerMenuDialog; -extern struct menudialog g_MpSaveSetupNameMenuDialog; -extern struct menudialog g_MpSaveSetupExistsMenuDialog; -extern u8 var800851bc[15]; -extern u8 var800851cc[10]; -extern u32 var80085448; -extern struct menuitem g_MpCharacterMenuItems[]; -extern u32 var800857d0; -extern struct menudialog g_MpAddSimulantMenuDialog; -extern struct menudialog g_MpChangeSimulantMenuDialog; -extern struct menudialog g_MpEditSimulantMenuDialog; -extern s32 var80085a74[4]; -extern u32 var80085ce8[]; -extern u8 g_TeamIdsForPairing[4]; -extern struct menudialog g_MpChangeTeamNameMenuDialog; -extern struct menudialog g_MpConfirmChallengeViaListOrDetailsMenuDialog; -extern struct menudialog g_MpChallengeListOrDetailsViaAdvChallengeMenuDialog; -extern struct menudialog g_MpConfirmChallengeMenuDialog; -extern u16 mplockoptions[4]; -extern struct menudialog g_MpAdvancedSetupMenuDialog; -extern struct menudialog g_MpQuickGoMenuDialog; -extern struct menudialog g_MpQuickTeamGameSetupMenuDialog; -extern struct menudialog g_CombatSimulatorMenuDialog; -extern u16 mpslowmotionoptions[]; -extern struct menudialog g_MpCombatOptionsMenuDialog; -extern struct menudialog g_MpBriefcaseOptionsMenuDialog; -extern struct defaultobj *var800869ec; -extern u32 var800869f0; -extern struct menudialog g_MpCaptureOptionsMenuDialog; -extern u32 var80086b60; -extern struct menudialog g_MpHillOptionsMenuDialog; -extern struct menudialog g_MpHackerOptionsMenuDialog; -extern u32 var80086e14; -extern struct menudialog g_MpPopacapOptionsMenuDialog; -extern struct mpscenario g_MpScenarios[6]; -extern struct mpscenariooverview g_MpScenarioOverviews[]; -extern u32 var8008716c; -extern u32 var800871fc; -extern u32 var80087264; -extern struct mpweapon g_MpWeapons[0x27]; -extern struct mpweaponset g_MpWeaponSets[12]; -extern u32 var800874c8; -extern u32 var800874cc; -extern u32 var800874f0; -extern struct mphead g_MpBeauHeads[NUM_MPBEAUHEADS]; -extern struct mphead g_MpHeads[75]; -extern u32 table_0x2d678[]; -extern struct mpsimulanttype g_MpSimulantTypes[]; -extern struct mpbody g_MpBodies[NUM_MPBODIES]; -extern u32 g_MpMaleHeads[44]; -extern u32 g_MpFemaleHeads[7]; - -#endif diff --git a/src/include/game/data/data_02da90.h b/src/include/game/data/data_02da90.h deleted file mode 100644 index 8ce089859..000000000 --- a/src/include/game/data/data_02da90.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef IN_GAME_DATA_02DA90_H -#define IN_GAME_DATA_02DA90_H -#include -#include "game/data/data_020df0.h" - -extern struct mptrack g_MpTracks[NUM_MPTRACKS]; -extern struct mppreset g_MpPresets[NUM_MPPRESETS]; -extern u32 g_TeamColours[MAX_TEAMS]; -extern u8 g_NumMpSimulantChrs; -extern struct simdifficulty g_SimDifficulties[]; -extern u32 g_MpBotCommands[NUM_MPBOTCOMMANDS]; -extern u32 var80087e2c; -extern u32 var80087e50; -extern u32 var80087e98; -extern u32 var80087eb0; - -#endif diff --git a/src/include/game/data/data_02e820.h b/src/include/game/data/data_02e820.h deleted file mode 100644 index 1bfaf220b..000000000 --- a/src/include/game/data/data_02e820.h +++ /dev/null @@ -1,49 +0,0 @@ -#ifndef IN_GAME_DATA_02e820_H -#define IN_GAME_DATA_02e820_H -#include -#include "game/data/data_020df0.h" - -extern u32 var80088c20; -extern u32 var80088c3c; -extern u32 var80088c58; -extern u16 g_FiringRangeFailReasons[5]; -extern u16 g_FiringRangeDifficultyNames[3]; -extern u32 var80088c8c; -extern u32 var80088c90; -extern u32 var80088c94; -extern u32 var80088c98; -extern u32 var80088c9c; -extern u32 var80088ca0; -extern u32 var80088ca4; -extern u32 var80088ca8; -extern struct menudialog g_FrDifficultyMenuDialog; -extern struct menudialog g_FrWeaponListMenuDialog; -extern struct menudialog g_FrTrainingInfoInGameMenuDialog; -extern struct menudialog g_FrTrainingInfoPreGameMenuDialog; -extern struct menudialog g_FrCompletedMenuDialog; -extern struct menudialog g_FrFailedMenuDialog; -extern u32 var800891b0; -extern struct menudialog g_BioListMenuDialog; -extern u32 var80089268; -extern u32 var80089280; -extern struct menudialog g_BioProfileMenuDialog; -extern struct menudialog g_BioTextMenuDialog; -extern struct menudialog g_DtListMenuDialog; -extern struct menudialog g_DtDetailsMenuDialog; -extern struct menudialog g_DtFailedMenuDialog; -extern struct menudialog g_DtCompletedMenuDialog; -extern struct menudialog g_HtListMenuDialog; -extern struct menudialog g_HtDetailsMenuDialog; -extern struct menudialog g_HtFailedMenuDialog; -extern struct menudialog g_HtCompletedMenuDialog; -extern u32 var800897a4; -extern u32 var800897b4; -extern s8 var800897c4[]; -extern struct hoverprop hoverprops[]; -extern struct menudialog g_HangarVehicleDetailsMenuDialog; -extern struct menudialog g_HangarLocationDetailsMenuDialog; -extern struct menudialog g_HangarListMenuDialog; -extern u32 var80089ad0; -extern u32 var8008a2d0; - -#endif diff --git a/src/include/game/debug.h b/src/include/game/debug.h index 5304e78aa..89e66eb2a 100644 --- a/src/include/game/debug.h +++ b/src/include/game/debug.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_DEBUG_H #define IN_GAME_DEBUG_H #include +#include "data.h" #include "types.h" u32 dprint(); diff --git a/src/include/game/dlights.h b/src/include/game/dlights.h index cb683202a..5267b9b7a 100644 --- a/src/include/game/dlights.h +++ b/src/include/game/dlights.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_DLIGHTS_H #define IN_GAME_DLIGHTS_H #include +#include "data.h" #include "types.h" s32 func0f000920(s32 num1, s32 num2); diff --git a/src/include/game/endscreen.h b/src/include/game/endscreen.h index af0eac434..64ec4ef88 100644 --- a/src/include/game/endscreen.h +++ b/src/include/game/endscreen.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_ENDSCREEN_H #define IN_GAME_ENDSCREEN_H #include +#include "data.h" #include "types.h" s32 menudialogRetryMission(s32 operation, struct menudialog *dialog, union handlerdata *data); diff --git a/src/include/game/explosions/explosions.h b/src/include/game/explosions/explosions.h index cfbb78ff6..d92a80716 100644 --- a/src/include/game/explosions/explosions.h +++ b/src/include/game/explosions/explosions.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_EXPLOSIONS_EXPLOSIONS_H #define IN_GAME_EXPLOSIONS_EXPLOSIONS_H #include +#include "data.h" #include "types.h" bool explosionCreateSimple(struct prop *prop, struct coord *pos, s16 *rooms, s16 type, s32 playernum); diff --git a/src/include/game/explosions/init.h b/src/include/game/explosions/init.h index 77d1698b7..472a971be 100644 --- a/src/include/game/explosions/init.h +++ b/src/include/game/explosions/init.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_EXPLOSIONS_INIT_H #define _IN_GAME_EXPLOSIONS_INIT_H #include +#include "data.h" #include "types.h" void explosionsInit(void); diff --git a/src/include/game/explosions/reset.h b/src/include/game/explosions/reset.h index 8b6023d71..7cc3ef7bf 100644 --- a/src/include/game/explosions/reset.h +++ b/src/include/game/explosions/reset.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_EXPLOSIONS_RESET_H #define IN_GAME_EXPLOSIONS_RESET_H #include +#include "data.h" #include "types.h" void explosionsReset(void); diff --git a/src/include/game/file.h b/src/include/game/file.h index 19b72fe2b..7d09f6861 100644 --- a/src/include/game/file.h +++ b/src/include/game/file.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_GAME_166E40_H #define _IN_GAME_GAME_166E40_H #include +#include "data.h" #include "types.h" void *fileGetRomAddress(s32 filenum); diff --git a/src/include/game/floor.h b/src/include/game/floor.h index 88dadbe6f..cc28babdf 100644 --- a/src/include/game/floor.h +++ b/src/include/game/floor.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_FLOOR_H #define IN_GAME_FLOOR_H #include +#include "data.h" #include "types.h" f32 floorf(f32 value); diff --git a/src/include/game/game_000000.h b/src/include/game/game_000000.h index fae25dac6..bda71fb82 100644 --- a/src/include/game/game_000000.h +++ b/src/include/game/game_000000.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_GAME_000000_H #define IN_GAME_GAME_000000_H #include +#include "data.h" #include "types.h" void func0f000000(void); diff --git a/src/include/game/game_000090.h b/src/include/game/game_000090.h index 0746b6cd7..0ad06a9df 100644 --- a/src/include/game/game_000090.h +++ b/src/include/game/game_000090.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_GAME_000090_H #define IN_GAME_GAME_000090_H #include +#include "data.h" #include "types.h" void func0f000090(void); diff --git a/src/include/game/game_000130.h b/src/include/game/game_000130.h index a877ef0fc..b841b5ddd 100644 --- a/src/include/game/game_000130.h +++ b/src/include/game/game_000130.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_GAME_000130_H #define IN_GAME_GAME_000130_H #include +#include "data.h" #include "types.h" void func0f000130(void); diff --git a/src/include/game/game_000880.h b/src/include/game/game_000880.h index 3d87b0b29..c068c1a56 100644 --- a/src/include/game/game_000880.h +++ b/src/include/game/game_000880.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_GAME_000880_H #define IN_GAME_GAME_000880_H #include +#include "data.h" #include "types.h" void func0f000880(void); diff --git a/src/include/game/game_005fd0.h b/src/include/game/game_005fd0.h index 4aea37593..6b9f20b45 100644 --- a/src/include/game/game_005fd0.h +++ b/src/include/game/game_005fd0.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_GAME_005FD0_H #define IN_GAME_GAME_005FD0_H #include +#include "data.h" #include "types.h" bool func0f005fd0(s32 arg0); diff --git a/src/include/game/game_006bd0.h b/src/include/game/game_006bd0.h index ff6d9dfce..413822cac 100644 --- a/src/include/game/game_006bd0.h +++ b/src/include/game/game_006bd0.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_GAME_006BD0_H #define IN_GAME_GAME_006BD0_H #include +#include "data.h" #include "types.h" f32 func0f006bd0(f32 arg0); diff --git a/src/include/game/game_00b190.h b/src/include/game/game_00b190.h index f06510f5e..fd42c8cac 100644 --- a/src/include/game/game_00b190.h +++ b/src/include/game/game_00b190.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_GAME_00B190_H #define IN_GAME_GAME_00B190_H #include +#include "data.h" #include "types.h" void loadTextureList(void); diff --git a/src/include/game/game_00b210.h b/src/include/game/game_00b210.h index 9d3c31bb0..cf0b35ab7 100644 --- a/src/include/game/game_00b210.h +++ b/src/include/game/game_00b210.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_GAME_00B210_H #define _IN_GAME_GAME_00B210_H #include +#include "data.h" #include "types.h" void mpInitPresetFeatures(void); diff --git a/src/include/game/game_00b320.h b/src/include/game/game_00b320.h index 05945eced..04cfacde0 100644 --- a/src/include/game/game_00b320.h +++ b/src/include/game/game_00b320.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_GAME_00B320_H #define _IN_GAME_GAME_00B320_H #include +#include "data.h" #include "types.h" void stageLoadCommonLang(s32 stagenum); diff --git a/src/include/game/game_00b480.h b/src/include/game/game_00b480.h index 8738ccbde..933226065 100644 --- a/src/include/game/game_00b480.h +++ b/src/include/game/game_00b480.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_GAME_00B480_H #define _IN_GAME_GAME_00B480_H #include +#include "data.h" #include "types.h" void func0f00b480(void); diff --git a/src/include/game/game_00b820.h b/src/include/game/game_00b820.h index 863497521..f64dbf921 100644 --- a/src/include/game/game_00b820.h +++ b/src/include/game/game_00b820.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_GAME_00B820_H #define IN_GAME_GAME_00B820_H #include +#include "data.h" #include "types.h" void stageChooseActiveHeads(s32 stagenum); diff --git a/src/include/game/game_00c240.h b/src/include/game/game_00c240.h index ce67376bd..89044fbea 100644 --- a/src/include/game/game_00c240.h +++ b/src/include/game/game_00c240.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_GAME_00C240_H #define IN_GAME_GAME_00C240_H #include +#include "data.h" #include "types.h" void gvarsInitProps(void); diff --git a/src/include/game/game_00c490.h b/src/include/game/game_00c490.h index f2b26acfa..683c70f68 100644 --- a/src/include/game/game_00c490.h +++ b/src/include/game/game_00c490.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_GAME_00C490_H #define IN_GAME_GAME_00C490_H #include +#include "data.h" #include "types.h" void setupInit(void); diff --git a/src/include/game/game_0108d0.h b/src/include/game/game_0108d0.h index 59d115504..ddbfde89d 100644 --- a/src/include/game/game_0108d0.h +++ b/src/include/game/game_0108d0.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_GAME_0108D0_H #define _IN_GAME_GAME_0108D0_H #include +#include "data.h" #include "types.h" void func0f0108d0(void); diff --git a/src/include/game/game_010b20.h b/src/include/game/game_010b20.h index bd66d82db..cd2ef7a76 100644 --- a/src/include/game/game_010b20.h +++ b/src/include/game/game_010b20.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_GAME_010B20_H #define _IN_GAME_GAME_010B20_H #include +#include "data.h" #include "types.h" void func0f010bb0(void); diff --git a/src/include/game/game_011110.h b/src/include/game/game_011110.h index 617ab0b68..5fa71878f 100644 --- a/src/include/game/game_011110.h +++ b/src/include/game/game_011110.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_GAME_011110_H #define IN_GAME_GAME_011110_H #include +#include "data.h" #include "types.h" void func0f011110(void); diff --git a/src/include/game/game_0125a0.h b/src/include/game/game_0125a0.h index 98ce72230..8ef44a17b 100644 --- a/src/include/game/game_0125a0.h +++ b/src/include/game/game_0125a0.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_GAME_0125A0_H #define IN_GAME_GAME_0125A0_H #include +#include "data.h" #include "types.h" void func0f0125a0(s32 animnum, s32 loopframe, s32 endframe, s32 *arg3); diff --git a/src/include/game/game_012d50.h b/src/include/game/game_012d50.h index 5570610bd..58933b00d 100644 --- a/src/include/game/game_012d50.h +++ b/src/include/game/game_012d50.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_GAME_012D50_H #define _IN_GAME_GAME_012D50_H #include +#include "data.h" #include "types.h" void waypointsLoad(void); diff --git a/src/include/game/game_013550.h b/src/include/game/game_013550.h index 944d78cf9..c6f3639f3 100644 --- a/src/include/game/game_013550.h +++ b/src/include/game/game_013550.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_GAME_013550_H #define _IN_GAME_GAME_013550_H #include +#include "data.h" #include "types.h" void func0f013550(void); diff --git a/src/include/game/game_013b80.h b/src/include/game/game_013b80.h index e469985cd..78b5b99fc 100644 --- a/src/include/game/game_013b80.h +++ b/src/include/game/game_013b80.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_GAME_013B80_H #define _IN_GAME_GAME_013B80_H #include +#include "data.h" #include "types.h" void func0f013b80(void); diff --git a/src/include/game/game_013cf0.h b/src/include/game/game_013cf0.h index 5440272ec..89ef15c7f 100644 --- a/src/include/game/game_013cf0.h +++ b/src/include/game/game_013cf0.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_GAME_013CF0_H #define _IN_GAME_GAME_013CF0_H #include +#include "data.h" #include "types.h" void stageLoadTiles(void); diff --git a/src/include/game/game_013ee0.h b/src/include/game/game_013ee0.h index 28cfc9b88..3f332fdde 100644 --- a/src/include/game/game_013ee0.h +++ b/src/include/game/game_013ee0.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_GAME_013EE0_H #define _IN_GAME_GAME_013EE0_H #include +#include "data.h" #include "types.h" void func0f013ee0(void); diff --git a/src/include/game/game_0147a0.h b/src/include/game/game_0147a0.h index bf5a48a31..a873fd9b1 100644 --- a/src/include/game/game_0147a0.h +++ b/src/include/game/game_0147a0.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_GAME_0147A0_H #define _IN_GAME_GAME_0147A0_H #include +#include "data.h" #include "types.h" void func0f0147a0(u32 stagenum); diff --git a/src/include/game/game_0147d0.h b/src/include/game/game_0147d0.h index 32a589734..a2de73332 100644 --- a/src/include/game/game_0147d0.h +++ b/src/include/game/game_0147d0.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_GAME_0147D0_H #define _IN_GAME_GAME_0147D0_H #include +#include "data.h" #include "types.h" void func0f0147d0(void); diff --git a/src/include/game/game_014f10.h b/src/include/game/game_014f10.h index b48d71d7c..2ee635fac 100644 --- a/src/include/game/game_014f10.h +++ b/src/include/game/game_014f10.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_GAME_014F10_H #define IN_GAME_GAME_014F10_H #include +#include "data.h" #include "types.h" void chrsReset(void); diff --git a/src/include/game/game_015010.h b/src/include/game/game_015010.h index 4138ff9cf..4cba1f3c3 100644 --- a/src/include/game/game_015010.h +++ b/src/include/game/game_015010.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_GAME_015010_H #define IN_GAME_GAME_015010_H #include +#include "data.h" #include "types.h" void func0f015010(void); diff --git a/src/include/game/game_0150a0.h b/src/include/game/game_0150a0.h index 47bcdbec5..784f85b0c 100644 --- a/src/include/game/game_0150a0.h +++ b/src/include/game/game_0150a0.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_GAME_0150A0_H #define IN_GAME_GAME_0150A0_H #include +#include "data.h" #include "types.h" u32 func0f0150a0(void); diff --git a/src/include/game/game_015470.h b/src/include/game/game_015470.h index 31bb75119..708728f5c 100644 --- a/src/include/game/game_015470.h +++ b/src/include/game/game_015470.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_GAME_015470_H #define IN_GAME_GAME_015470_H #include +#include "data.h" #include "types.h" void func0f015470(void); diff --git a/src/include/game/game_01afc0.h b/src/include/game/game_01afc0.h index db4068d39..69c4adb6c 100644 --- a/src/include/game/game_01afc0.h +++ b/src/include/game/game_01afc0.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_GAME_01AFC0_H #define _IN_GAME_GAME_01AFC0_H #include +#include "data.h" #include "types.h" Gfx *func0f01afc0(Gfx *gdl); diff --git a/src/include/game/game_01b0a0.h b/src/include/game/game_01b0a0.h index fd6dc749a..66d6a98eb 100644 --- a/src/include/game/game_01b0a0.h +++ b/src/include/game/game_01b0a0.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_GAME_01B0A0_H #define _IN_GAME_GAME_01B0A0_H #include +#include "data.h" #include "types.h" f32 pdmodeGetReaction(void); diff --git a/src/include/game/game_01bea0.h b/src/include/game/game_01bea0.h index ea7af71f5..2158d9d6a 100644 --- a/src/include/game/game_01bea0.h +++ b/src/include/game/game_01bea0.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_GAME_01BEA0_H #define _IN_GAME_GAME_01BEA0_H #include +#include "data.h" #include "types.h" void func0f01bea0(void); diff --git a/src/include/game/game_01d860.h b/src/include/game/game_01d860.h index 8ea8ba001..f2b3abf30 100644 --- a/src/include/game/game_01d860.h +++ b/src/include/game/game_01d860.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_GAME_01D860_H #define IN_GAME_GAME_01D860_H #include +#include "data.h" #include "types.h" void func0f01d860(void); diff --git a/src/include/game/game_01d990.h b/src/include/game/game_01d990.h index c641820b7..2fd833e87 100644 --- a/src/include/game/game_01d990.h +++ b/src/include/game/game_01d990.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_GAME_01D990_H #define _IN_GAME_GAME_01D990_H #include +#include "data.h" #include "types.h" void func0f01d990(void); diff --git a/src/include/game/game_02cde0.h b/src/include/game/game_02cde0.h index a39e77c67..881ed9e38 100644 --- a/src/include/game/game_02cde0.h +++ b/src/include/game/game_02cde0.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_GAME_02CDE0_H #define _IN_GAME_GAME_02CDE0_H #include +#include "data.h" #include "types.h" u32 bodyGetRace(s32 bodynum); diff --git a/src/include/game/game_091e10.h b/src/include/game/game_091e10.h index 6533036b1..8502a2c34 100644 --- a/src/include/game/game_091e10.h +++ b/src/include/game/game_091e10.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_GAME_091e10_H #define IN_GAME_GAME_091e10_H #include +#include "data.h" #include "types.h" u32 setupGetCommandLength(u32 *cmd); diff --git a/src/include/game/game_092610.h b/src/include/game/game_092610.h index 632fe2ba7..30dca2e82 100644 --- a/src/include/game/game_092610.h +++ b/src/include/game/game_092610.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_GAME_092610_H #define IN_GAME_GAME_092610_H #include +#include "data.h" #include "types.h" bool func0f092610(struct prop *prop, s32 arg1); diff --git a/src/include/game/game_095320.h b/src/include/game/game_095320.h index 903ffa48a..797fe6c61 100644 --- a/src/include/game/game_095320.h +++ b/src/include/game/game_095320.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_GAME_095320_H #define IN_GAME_GAME_095320_H #include +#include "data.h" #include "types.h" u32 xorBaffbeff(u32 value); diff --git a/src/include/game/game_096360.h b/src/include/game/game_096360.h index 26986207b..795c6cbcb 100644 --- a/src/include/game/game_096360.h +++ b/src/include/game/game_096360.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_GAME_096360_H #define _IN_GAME_GAME_096360_H #include +#include "data.h" #include "types.h" u32 func0f096360(void); diff --git a/src/include/game/game_096700.h b/src/include/game/game_096700.h index 2add89193..ed474d309 100644 --- a/src/include/game/game_096700.h +++ b/src/include/game/game_096700.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_GAME_096700_H #define _IN_GAME_GAME_096700_H #include +#include "data.h" #include "types.h" f32 func0f096700(f32 value); diff --git a/src/include/game/game_096890.h b/src/include/game/game_096890.h index db64c1bb3..870ac71d4 100644 --- a/src/include/game/game_096890.h +++ b/src/include/game/game_096890.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_GAME_096890_H #define _IN_GAME_GAME_096890_H #include +#include "data.h" #include "types.h" s32 func0f096890(s32 arg0); diff --git a/src/include/game/game_0969d0.h b/src/include/game/game_0969d0.h index 78e0eed03..28defad03 100644 --- a/src/include/game/game_0969d0.h +++ b/src/include/game/game_0969d0.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_GAME_0969D0_H #define _IN_GAME_GAME_0969D0_H #include +#include "data.h" #include "types.h" f32 func0f0969d0(f32 value); diff --git a/src/include/game/game_096b20.h b/src/include/game/game_096b20.h index 47c6d860e..539db67fa 100644 --- a/src/include/game/game_096b20.h +++ b/src/include/game/game_096b20.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_GAME_096B20_H #define _IN_GAME_GAME_096B20_H #include +#include "data.h" #include "types.h" void func0f096b20(struct coord *arg0, struct coord *arg1, f32 standfrac, struct coord *vel); diff --git a/src/include/game/game_096ca0.h b/src/include/game/game_096ca0.h index 61ce8c79e..7a115ee8e 100644 --- a/src/include/game/game_096ca0.h +++ b/src/include/game/game_096ca0.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_GAME_096CA0_H #define _IN_GAME_GAME_096CA0_H #include +#include "data.h" #include "types.h" u32 func0f096ca0(void); diff --git a/src/include/game/game_097a50.h b/src/include/game/game_097a50.h index 2020a16c7..629f715e2 100644 --- a/src/include/game/game_097a50.h +++ b/src/include/game/game_097a50.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_GAME_097A50_H #define IN_GAME_GAME_097A50_H #include +#include "data.h" #include "types.h" f32 func0f097a50(f32 value); diff --git a/src/include/game/game_097aa0.h b/src/include/game/game_097aa0.h index 37e203bcb..875220ad5 100644 --- a/src/include/game/game_097aa0.h +++ b/src/include/game/game_097aa0.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_GAME_097AA0_H #define _IN_GAME_GAME_097AA0_H #include +#include "data.h" #include "types.h" f32 func0f097aa0(f32 arg0); diff --git a/src/include/game/game_097ba0.h b/src/include/game/game_097ba0.h index 3502118f1..4bf4f1b52 100644 --- a/src/include/game/game_097ba0.h +++ b/src/include/game/game_097ba0.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_GAME_097BA0_H #define _IN_GAME_GAME_097BA0_H #include +#include "data.h" #include "types.h" u32 func0f097ba0(void); diff --git a/src/include/game/game_0abe70.h b/src/include/game/game_0abe70.h index 814e092cd..f04b5e954 100644 --- a/src/include/game/game_0abe70.h +++ b/src/include/game/game_0abe70.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_GAME_0ABE70_H #define IN_GAME_GAME_0ABE70_H #include +#include "data.h" #include "types.h" u32 func0f0abe70(void); diff --git a/src/include/game/game_0b0fd0.h b/src/include/game/game_0b0fd0.h index 5d456b163..4d4631dff 100644 --- a/src/include/game/game_0b0fd0.h +++ b/src/include/game/game_0b0fd0.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_GAME_0B0FD0_H #define IN_GAME_GAME_0B0FD0_H #include +#include "data.h" #include "types.h" struct weapon *weaponFindById(s32 itemid); diff --git a/src/include/game/game_0b2150.h b/src/include/game/game_0b2150.h index deae383c8..3e20f5401 100644 --- a/src/include/game/game_0b2150.h +++ b/src/include/game/game_0b2150.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_GAME_0B2150_H #define IN_GAME_GAME_0B2150_H #include +#include "data.h" #include "types.h" u32 func0f0b2150(void); diff --git a/src/include/game/game_0b28d0.h b/src/include/game/game_0b28d0.h index c58b40a47..f4a6249c1 100644 --- a/src/include/game/game_0b28d0.h +++ b/src/include/game/game_0b28d0.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_GAME_0B28D0_H #define IN_GAME_GAME_0B28D0_H #include +#include "data.h" #include "types.h" u32 func0f0b28d0(void); diff --git a/src/include/game/game_0b3350.h b/src/include/game/game_0b3350.h index 9beac94c7..40e36eca7 100644 --- a/src/include/game/game_0b3350.h +++ b/src/include/game/game_0b3350.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_GAME_0B3350_H #define _IN_GAME_GAME_0B3350_H #include +#include "data.h" #include "types.h" s32 func0f0b3350(s32 value); diff --git a/src/include/game/game_0b63b0.h b/src/include/game/game_0b63b0.h index 120d0d384..6d5428382 100644 --- a/src/include/game/game_0b63b0.h +++ b/src/include/game/game_0b63b0.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_GAME_0B63B0_H #define _IN_GAME_GAME_0B63B0_H #include +#include "data.h" #include "types.h" void func0f0b63b0(s32 portalnum, f32 frac); diff --git a/src/include/game/game_0b69d0.h b/src/include/game/game_0b69d0.h index 28f943ab2..536363ed0 100644 --- a/src/include/game/game_0b69d0.h +++ b/src/include/game/game_0b69d0.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_GAME_0B69D0_H #define _IN_GAME_GAME_0B69D0_H #include +#include "data.h" #include "types.h" f32 playerChooseSpawnLocation(f32 chrwidth, struct coord *dstpos, s16 *dstrooms, struct prop *prop, s16 *spawnpads, s32 numspawnpads); diff --git a/src/include/game/game_0c33f0.h b/src/include/game/game_0c33f0.h index 2935d4934..5e229819b 100644 --- a/src/include/game/game_0c33f0.h +++ b/src/include/game/game_0c33f0.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_GAME_0C33F0_H #define _IN_GAME_GAME_0C33F0_H #include +#include "data.h" #include "types.h" void func0f0c33f0(Mtxf *matrix, s32 arg1); diff --git a/src/include/game/game_0d4690.h b/src/include/game/game_0d4690.h index 9cb557159..7bce61b85 100644 --- a/src/include/game/game_0d4690.h +++ b/src/include/game/game_0d4690.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_GAME_0D4690_H #define IN_GAME_GAME_0D4690_H #include +#include "data.h" #include "types.h" u32 func0f0d4690(void); diff --git a/src/include/game/game_0e0770.h b/src/include/game/game_0e0770.h index 7d151c18b..deb6a9ed4 100644 --- a/src/include/game/game_0e0770.h +++ b/src/include/game/game_0e0770.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_GAME_0E0770_H #define IN_GAME_GAME_0E0770_H #include +#include "data.h" #include "types.h" u32 func0f0e0770(void); diff --git a/src/include/game/game_0f09f0.h b/src/include/game/game_0f09f0.h index 0c0855265..f569722ce 100644 --- a/src/include/game/game_0f09f0.h +++ b/src/include/game/game_0f09f0.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_GAME_0F09F0_H #define IN_GAME_GAME_0F09F0_H #include +#include "data.h" #include "types.h" extern const struct menucolourpalette g_MenuColourPalettes[]; diff --git a/src/include/game/game_102240.h b/src/include/game/game_102240.h index c65983c1c..6fbbc09f4 100644 --- a/src/include/game/game_102240.h +++ b/src/include/game/game_102240.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_GAME_102240_H #define IN_GAME_GAME_102240_H #include +#include "data.h" #include "types.h" extern u16 g_ControlStyleOptions[]; diff --git a/src/include/game/game_107fb0.h b/src/include/game/game_107fb0.h index 65c836549..0a687fbe3 100644 --- a/src/include/game/game_107fb0.h +++ b/src/include/game/game_107fb0.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_GAME_107FB0_H #define IN_GAME_GAME_107FB0_H #include +#include "data.h" #include "types.h" char *filemgrGetDeviceName(s32 index); diff --git a/src/include/game/game_10c9c0.h b/src/include/game/game_10c9c0.h index adaf8f0d0..5750b0a19 100644 --- a/src/include/game/game_10c9c0.h +++ b/src/include/game/game_10c9c0.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_GAME_10C9C0_H #define _IN_GAME_GAME_10C9C0_H #include +#include "data.h" #include "types.h" void func0f10cb2c(void); diff --git a/src/include/game/game_11f000.h b/src/include/game/game_11f000.h index 0f8755805..f136ee033 100644 --- a/src/include/game/game_11f000.h +++ b/src/include/game/game_11f000.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_GAME_11F000_H #define _IN_GAME_GAME_11F000_H #include +#include "data.h" #include "types.h" u32 func0f11f000(void); diff --git a/src/include/game/game_127910.h b/src/include/game/game_127910.h index 1583b849e..258c82b30 100644 --- a/src/include/game/game_127910.h +++ b/src/include/game/game_127910.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_GAME_127910_H #define _IN_GAME_GAME_127910_H #include +#include "data.h" #include "types.h" void func0f127910(void); diff --git a/src/include/game/game_128f30.h b/src/include/game/game_128f30.h index 79968cc66..2ddd09a92 100644 --- a/src/include/game/game_128f30.h +++ b/src/include/game/game_128f30.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_GAME_128F30_H #define IN_GAME_GAME_128F30_H #include +#include "data.h" #include "types.h" u32 func0f128f30(void); diff --git a/src/include/game/game_129210.h b/src/include/game/game_129210.h index 85dd7ab07..d8349ff5a 100644 --- a/src/include/game/game_129210.h +++ b/src/include/game/game_129210.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_GAME_129210_H #define _IN_GAME_GAME_129210_H #include +#include "data.h" #include "types.h" void func0f129210(void *find, void *replacement); diff --git a/src/include/game/game_13b670.h b/src/include/game/game_13b670.h index d4179f190..68aa3fead 100644 --- a/src/include/game/game_13b670.h +++ b/src/include/game/game_13b670.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_GAME_13B670_H #define _IN_GAME_GAME_13B670_H #include +#include "data.h" #include "types.h" u32 func0f13b670(void); diff --git a/src/include/game/game_13c510.h b/src/include/game/game_13c510.h index 127a3e54f..f6fbee8c7 100644 --- a/src/include/game/game_13c510.h +++ b/src/include/game/game_13c510.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_GAME_13C510_H #define _IN_GAME_GAME_13C510_H #include +#include "data.h" #include "types.h" void func0f13c510(void); diff --git a/src/include/game/game_152fa0.h b/src/include/game/game_152fa0.h index 560e1a986..574a2e671 100644 --- a/src/include/game/game_152fa0.h +++ b/src/include/game/game_152fa0.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_GAME_152FA0_H #define IN_GAME_GAME_152FA0_H #include +#include "data.h" #include "types.h" u32 func0f152fa0(void); diff --git a/src/include/game/game_1531a0.h b/src/include/game/game_1531a0.h index abfdf086c..ef5bb2c4f 100644 --- a/src/include/game/game_1531a0.h +++ b/src/include/game/game_1531a0.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_GAME_1531A0_H #define _IN_GAME_GAME_1531A0_H #include +#include "data.h" #include "types.h" void func0f1531a0(void); diff --git a/src/include/game/game_165360.h b/src/include/game/game_165360.h index 6ba42169c..2c588e6a2 100644 --- a/src/include/game/game_165360.h +++ b/src/include/game/game_165360.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_GAME_165360_H #define _IN_GAME_GAME_165360_H #include +#include "data.h" #include "types.h" u32 func0f165360(void); diff --git a/src/include/game/game_1655c0.h b/src/include/game/game_1655c0.h index d090cddf0..45c0d7924 100644 --- a/src/include/game/game_1655c0.h +++ b/src/include/game/game_1655c0.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_GAME_1655C0_H #define _IN_GAME_GAME_1655C0_H #include +#include "data.h" #include "types.h" struct stagetableentry *stageGetCurrent(void); diff --git a/src/include/game/game_165670.h b/src/include/game/game_165670.h index dc08a1289..ded5710a1 100644 --- a/src/include/game/game_165670.h +++ b/src/include/game/game_165670.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_GAME_165670_H #define IN_GAME_GAME_165670_H #include +#include "data.h" #include "types.h" u32 func0f165670(void); diff --git a/src/include/game/game_1668e0.h b/src/include/game/game_1668e0.h index d9a1a8287..613d3eacd 100644 --- a/src/include/game/game_1668e0.h +++ b/src/include/game/game_1668e0.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_GAME_1668E0_H #define IN_GAME_GAME_1668E0_H #include +#include "data.h" #include "types.h" void currentPlayerSetLastRoomForOffset(s32 room); diff --git a/src/include/game/game_173a00.h b/src/include/game/game_173a00.h index eb9dba36f..85755301c 100644 --- a/src/include/game/game_173a00.h +++ b/src/include/game/game_173a00.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_GAME_173A00_H #define IN_GAME_GAME_173A00_H #include +#include "data.h" #include "types.h" void func0f173a08(void); diff --git a/src/include/game/game_175f90.h b/src/include/game/game_175f90.h index 5c7f6eb71..93b7a6e83 100644 --- a/src/include/game/game_175f90.h +++ b/src/include/game/game_175f90.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_GAME_175F90_H #define IN_GAME_GAME_175F90_H #include +#include "data.h" #include "types.h" void func0f175f90(void); diff --git a/src/include/game/game_176080.h b/src/include/game/game_176080.h index cb7eefac3..fd19c642a 100644 --- a/src/include/game/game_176080.h +++ b/src/include/game/game_176080.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_GAME_176080_H #define IN_GAME_GAME_176080_H #include +#include "data.h" #include "types.h" void *func0f176080(void); diff --git a/src/include/game/game_190260.h b/src/include/game/game_190260.h index d9e2079a5..e0457f2b4 100644 --- a/src/include/game/game_190260.h +++ b/src/include/game/game_190260.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_GAME_190260_H #define _IN_GAME_GAME_190260_H #include +#include "data.h" #include "types.h" bool func0f190260(struct chrdata *chr); diff --git a/src/include/game/game_197600.h b/src/include/game/game_197600.h index 03a38c37c..e0f89963f 100644 --- a/src/include/game/game_197600.h +++ b/src/include/game/game_197600.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_GAME_197600_H #define IN_GAME_GAME_197600_H #include +#include "data.h" #include "types.h" u32 func0f197600(void); diff --git a/src/include/game/game_1999b0.h b/src/include/game/game_1999b0.h index f07f2e7e9..5e1ff64d7 100644 --- a/src/include/game/game_1999b0.h +++ b/src/include/game/game_1999b0.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_GAME_1999B0_H #define IN_GAME_GAME_1999B0_H #include +#include "data.h" #include "types.h" s32 weaponGetAmmoTypeByFunction(s32 weaponnum, u32 funcnum); diff --git a/src/include/game/game_19aa80.h b/src/include/game/game_19aa80.h index 2c67a5ccc..1a3735dc1 100644 --- a/src/include/game/game_19aa80.h +++ b/src/include/game/game_19aa80.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_GAME_19AA80_H #define _IN_GAME_GAME_19AA80_H #include +#include "data.h" #include "types.h" extern u32 g_MpChallengeIndex; diff --git a/src/include/game/game_1a7560.h b/src/include/game/game_1a7560.h index 823e7f629..4e6078359 100644 --- a/src/include/game/game_1a7560.h +++ b/src/include/game/game_1a7560.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_GAME_1A7560_H #define IN_GAME_GAME_1A7560_H #include +#include "data.h" #include "types.h" void func0f1a7560(void *ptr, u16 fileid, u32 arg2, void *arg3, s32 arg4, bool arg5); diff --git a/src/include/game/game_1a78b0.h b/src/include/game/game_1a78b0.h index 14218d509..99934949d 100644 --- a/src/include/game/game_1a78b0.h +++ b/src/include/game/game_1a78b0.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_GAME_1A78B0_H #define IN_GAME_GAME_1A78B0_H #include +#include "data.h" #include "types.h" void func0f1a78b0(void); diff --git a/src/include/game/gamefile.h b/src/include/game/gamefile.h index 69e9b673b..b9b4c777f 100644 --- a/src/include/game/gamefile.h +++ b/src/include/game/gamefile.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_GAMEFILE_H #define IN_GAME_GAMEFILE_H #include +#include "data.h" #include "types.h" u32 savefileHasFlag(u32 value); diff --git a/src/include/game/gfxmemory.h b/src/include/game/gfxmemory.h index c11b973d4..f9948dd40 100644 --- a/src/include/game/gfxmemory.h +++ b/src/include/game/gfxmemory.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_GFXMEMORY_H #define _IN_GAME_GFXMEMORY_H #include +#include "data.h" #include "types.h" void gfxInitMemory(void); diff --git a/src/include/game/healthbar.h b/src/include/game/healthbar.h index 3c966a0b2..1bd258fbe 100644 --- a/src/include/game/healthbar.h +++ b/src/include/game/healthbar.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_HEALTHBAR_H #define _IN_GAME_HEALTHBAR_H #include +#include "data.h" #include "types.h" u32 func0f0d5a90(void); diff --git a/src/include/game/hudmsg.h b/src/include/game/hudmsg.h index c621ca8be..fb843cb35 100644 --- a/src/include/game/hudmsg.h +++ b/src/include/game/hudmsg.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_HUDMSG_H #define IN_GAME_HUDMSG_H #include +#include "data.h" #include "types.h" u8 func0f0dcdb0(void); diff --git a/src/include/game/inventory/init.h b/src/include/game/inventory/init.h index efc45a14e..59f60ab9a 100644 --- a/src/include/game/inventory/init.h +++ b/src/include/game/inventory/init.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_INVENTORY_INIT_H #define IN_GAME_INVENTORY_INIT_H #include +#include "data.h" #include "types.h" void invInitGunsHeld(void); diff --git a/src/include/game/inventory/inventory.h b/src/include/game/inventory/inventory.h index 504f72da0..333829267 100644 --- a/src/include/game/inventory/inventory.h +++ b/src/include/game/inventory/inventory.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_INVENTORY_INVENTORY_H #define IN_GAME_INVENTORY_INVENTORY_H #include +#include "data.h" #include "types.h" void invClear(void); diff --git a/src/include/game/lang.h b/src/include/game/lang.h index 1b748136a..7d06249a1 100644 --- a/src/include/game/lang.h +++ b/src/include/game/lang.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_LANG_H #define IN_GAME_LANG_H #include +#include "data.h" #include "types.h" u32 langGetLangBankIndexFromStagenum(s32 stagenum); diff --git a/src/include/game/menu/items.h b/src/include/game/menu/items.h index c2e7e84d1..3a587ec56 100644 --- a/src/include/game/menu/items.h +++ b/src/include/game/menu/items.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_MENU_ITEMS_H #define IN_GAME_MENU_ITEMS_H #include +#include "data.h" #include "types.h" u32 func0f0e5d2c(void); diff --git a/src/include/game/mplayer/ingame.h b/src/include/game/mplayer/ingame.h index 4b46f774b..ef8d06bde 100644 --- a/src/include/game/mplayer/ingame.h +++ b/src/include/game/mplayer/ingame.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_MPLAYER_INGAME_H #define _IN_GAME_MPLAYER_INGAME_H #include +#include "data.h" #include "types.h" s32 mpStatsForPlayerDropdownHandler(s32 operation, struct menuitem *item, union handlerdata *data); diff --git a/src/include/game/mplayer/mplayer.h b/src/include/game/mplayer/mplayer.h index a44471d3e..2d03285b6 100644 --- a/src/include/game/mplayer/mplayer.h +++ b/src/include/game/mplayer/mplayer.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_MPLAYER_MPLAYER_H #define IN_GAME_MPLAYER_MPLAYER_H #include +#include "data.h" #include "types.h" f32 func0f187770(u8 value); diff --git a/src/include/game/mplayer/scenarios.h b/src/include/game/mplayer/scenarios.h index 68df9bfad..d3681beff 100644 --- a/src/include/game/mplayer/scenarios.h +++ b/src/include/game/mplayer/scenarios.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_MPLAYER_SCENARIOS_H #define _IN_GAME_MPLAYER_SCENARIOS_H #include +#include "data.h" #include "types.h" extern struct menudialog g_MpScenarioMenuDialog; diff --git a/src/include/game/mplayer/setup.h b/src/include/game/mplayer/setup.h index e2432f822..f0421d1e8 100644 --- a/src/include/game/mplayer/setup.h +++ b/src/include/game/mplayer/setup.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_MPLAYER_SETUP_H #define _IN_GAME_MPLAYER_SETUP_H #include +#include "data.h" #include "types.h" char *mpGetCurrentPlayerName(struct menuitem *item); diff --git a/src/include/game/mpstats.h b/src/include/game/mpstats.h index ab7d6125f..547fa2d17 100644 --- a/src/include/game/mpstats.h +++ b/src/include/game/mpstats.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_MPSTATS_H #define IN_GAME_MPSTATS_H #include +#include "data.h" #include "types.h" void mpstatsIncrementPlayerShotCount(struct shorthand *hand, s32 region); diff --git a/src/include/game/music.h b/src/include/game/music.h index 7ac6d299b..7a0fe6310 100644 --- a/src/include/game/music.h +++ b/src/include/game/music.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_MUSIC_H #define IN_GAME_MUSIC_H #include +#include "data.h" #include "types.h" u16 musicGetVolume(void); diff --git a/src/include/game/nbomb.h b/src/include/game/nbomb.h index 254850049..928441c02 100644 --- a/src/include/game/nbomb.h +++ b/src/include/game/nbomb.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_NBOMB_H #define IN_GAME_NBOMB_H #include +#include "data.h" #include "types.h" u32 func0f006c80(void); diff --git a/src/include/game/objectives.h b/src/include/game/objectives.h index 56277170b..472c33dd1 100644 --- a/src/include/game/objectives.h +++ b/src/include/game/objectives.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_OBJECTIVES_H #define IN_GAME_OBJECTIVES_H #include +#include "data.h" #include "types.h" void objectivesAutocomplete(void); diff --git a/src/include/game/options.h b/src/include/game/options.h index 82b89765e..e7af53dc5 100644 --- a/src/include/game/options.h +++ b/src/include/game/options.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_PDOPTIONS_H #define IN_GAME_PDOPTIONS_H #include +#include "data.h" #include "types.h" s32 optionsGetControlMode(s32 mpchrnum); diff --git a/src/include/game/pad.h b/src/include/game/pad.h index 34489ffdd..01f3ac26f 100644 --- a/src/include/game/pad.h +++ b/src/include/game/pad.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_PAD_H #define IN_GAME_PAD_H #include +#include "data.h" #include "types.h" void padUnpack(s32 padnum, u32 fields, struct pad *pad); diff --git a/src/include/game/padhalllv.h b/src/include/game/padhalllv.h index 490d7f77a..c0a8669f2 100644 --- a/src/include/game/padhalllv.h +++ b/src/include/game/padhalllv.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_PADHALLLV_H #define IN_GAME_PADHALLLV_H #include +#include "data.h" #include "types.h" void waypointSetHashThing(s32 hash1, s32 hash2); diff --git a/src/include/game/pak/pak.h b/src/include/game/pak/pak.h index bc39aed27..546d42ab2 100644 --- a/src/include/game/pak/pak.h +++ b/src/include/game/pak/pak.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_PAK_PAK_H #define IN_GAME_PAK_PAK_H #include +#include "data.h" #include "types.h" u32 func0f1165d0(s8 device); diff --git a/src/include/game/prop.h b/src/include/game/prop.h index 4133e4772..d7622d76f 100644 --- a/src/include/game/prop.h +++ b/src/include/game/prop.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_PROP_H #define IN_GAME_PROP_H #include +#include "data.h" #include "types.h" extern f32 var80069880; diff --git a/src/include/game/propobj.h b/src/include/game/propobj.h index 2e80f1eb5..6eaea5a4a 100644 --- a/src/include/game/propobj.h +++ b/src/include/game/propobj.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_PROPOBJ_H #define IN_GAME_PROPOBJ_H #include +#include "data.h" #include "types.h" extern u32 var800698f0; diff --git a/src/include/game/radar.h b/src/include/game/radar.h index 4aa8fedf7..7082c3809 100644 --- a/src/include/game/radar.h +++ b/src/include/game/radar.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_RADAR_H #define IN_GAME_RADAR_H #include +#include "data.h" #include "types.h" Gfx *radarRenderBackground(Gfx *gdl, struct textureconfig *tconfig, s32 arg2, s32 arg3, s32 arg4); diff --git a/src/include/game/room.h b/src/include/game/room.h index 5ae2db4bb..7cffa5282 100644 --- a/src/include/game/room.h +++ b/src/include/game/room.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_ROOM_H #define IN_GAME_ROOM_H #include +#include "data.h" #include "types.h" u32 func0f157db0(void); diff --git a/src/include/game/shards.h b/src/include/game/shards.h index 9e30bc610..9dabc49ac 100644 --- a/src/include/game/shards.h +++ b/src/include/game/shards.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_SHARDS_H #define IN_GAME_SHARDS_H #include +#include "data.h" #include "types.h" u16 shardsCreate(struct coord *pos, f32 *rotx, f32 *roty, f32 *rotz, f32 arg4, f32 arg5, f32 arg6, f32 arg7, u32 arg8, struct prop *prop); diff --git a/src/include/game/sight.h b/src/include/game/sight.h index 0643d9d89..4f37ab33f 100644 --- a/src/include/game/sight.h +++ b/src/include/game/sight.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_SIGHT_H #define _IN_GAME_SIGHT_H #include +#include "data.h" #include "types.h" bool sightIsPropFriendly(struct prop *prop); diff --git a/src/include/game/sky.h b/src/include/game/sky.h index da3ce038a..9432416dc 100644 --- a/src/include/game/sky.h +++ b/src/include/game/sky.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_SKY_H #define _IN_GAME_SKY_H #include +#include "data.h" #include "types.h" void func0f135c70(void); diff --git a/src/include/game/smoke/init.h b/src/include/game/smoke/init.h index 74afdd7bf..76cee5775 100644 --- a/src/include/game/smoke/init.h +++ b/src/include/game/smoke/init.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_SMOKE_INIT_H #define _IN_GAME_SMOKE_INIT_H #include +#include "data.h" #include "types.h" void smokeInit(void); diff --git a/src/include/game/smoke/reset.h b/src/include/game/smoke/reset.h index a4d6a09a3..016fafae6 100644 --- a/src/include/game/smoke/reset.h +++ b/src/include/game/smoke/reset.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_SMOKE_RESET_H #define _IN_GAME_SMOKE_RESET_H #include +#include "data.h" #include "types.h" void smokeReset(void); diff --git a/src/include/game/smoke/smoke.h b/src/include/game/smoke/smoke.h index 8a0a62748..7b50b2fd1 100644 --- a/src/include/game/smoke/smoke.h +++ b/src/include/game/smoke/smoke.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_SMOKE_SMOKE_H #define _IN_GAME_SMOKE_SMOKE_H #include +#include "data.h" #include "types.h" Gfx *smokeRenderPart(struct smoke *smoke, struct smokepart *part, Gfx *gdl, struct coord *coord, f32 size); diff --git a/src/include/game/sparks/init.h b/src/include/game/sparks/init.h index 724d91b5d..9b035f74e 100644 --- a/src/include/game/sparks/init.h +++ b/src/include/game/sparks/init.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_SPARKS_INIT_H #define IN_GAME_SPARKS_INIT_H #include +#include "data.h" #include "types.h" void sparksInit(void); diff --git a/src/include/game/sparks/sparks.h b/src/include/game/sparks/sparks.h index 127c04ff7..5a4f92e61 100644 --- a/src/include/game/sparks/sparks.h +++ b/src/include/game/sparks/sparks.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_SPARKS_SPARKS_H #define _IN_GAME_SPARKS_SPARKS_H #include +#include "data.h" #include "types.h" u32 func0f12f6c0(void); diff --git a/src/include/game/sparks/tick.h b/src/include/game/sparks/tick.h index e425f73a1..be93aedc7 100644 --- a/src/include/game/sparks/tick.h +++ b/src/include/game/sparks/tick.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_SPARKS_TICK_H #define IN_GAME_SPARKS_TICK_H #include +#include "data.h" #include "types.h" void sparksTick(void); diff --git a/src/include/game/splat.h b/src/include/game/splat.h index 854888ba4..813b4a77e 100644 --- a/src/include/game/splat.h +++ b/src/include/game/splat.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_SPLAT_H #define _IN_GAME_SPLAT_H #include +#include "data.h" #include "types.h" void splatTick(struct prop *prop); diff --git a/src/include/game/stubs/game_000840.h b/src/include/game/stubs/game_000840.h index 2687d6e44..a27d181d7 100644 --- a/src/include/game/stubs/game_000840.h +++ b/src/include/game/stubs/game_000840.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_GAME_000840_H #define _IN_GAME_GAME_000840_H #include +#include "data.h" #include "types.h" void stub0f000840(void); diff --git a/src/include/game/stubs/game_000850.h b/src/include/game/stubs/game_000850.h index 4218b55b2..92e31cdcc 100644 --- a/src/include/game/stubs/game_000850.h +++ b/src/include/game/stubs/game_000850.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_GAME_000850_H #define IN_GAME_GAME_000850_H #include +#include "data.h" #include "types.h" void stub0f000850(void); diff --git a/src/include/game/stubs/game_000860.h b/src/include/game/stubs/game_000860.h index 7076d13c5..ef7ea9c33 100644 --- a/src/include/game/stubs/game_000860.h +++ b/src/include/game/stubs/game_000860.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_GAME_000860_H #define IN_GAME_GAME_000860_H #include +#include "data.h" #include "types.h" void stub0f000860(void); diff --git a/src/include/game/stubs/game_000870.h b/src/include/game/stubs/game_000870.h index a1f7e19bf..1699ad01e 100644 --- a/src/include/game/stubs/game_000870.h +++ b/src/include/game/stubs/game_000870.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_GAME_000870_H #define IN_GAME_GAME_000870_H #include +#include "data.h" #include "types.h" void stub0f000870(void); diff --git a/src/include/game/stubs/game_0008e0.h b/src/include/game/stubs/game_0008e0.h index 67cd15b3e..679eb2c5c 100644 --- a/src/include/game/stubs/game_0008e0.h +++ b/src/include/game/stubs/game_0008e0.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_GAME_0008E0_H #define IN_GAME_GAME_0008E0_H #include +#include "data.h" #include "types.h" void stub0f0008e0(void); diff --git a/src/include/game/stubs/game_0008f0.h b/src/include/game/stubs/game_0008f0.h index e15c641e9..18050053b 100644 --- a/src/include/game/stubs/game_0008f0.h +++ b/src/include/game/stubs/game_0008f0.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_GAME_0008F0_H #define IN_GAME_GAME_0008F0_H #include +#include "data.h" #include "types.h" void stub0f0008f0(void); diff --git a/src/include/game/stubs/game_000900.h b/src/include/game/stubs/game_000900.h index 3bab034bd..3212610b2 100644 --- a/src/include/game/stubs/game_000900.h +++ b/src/include/game/stubs/game_000900.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_GAME_000900_H #define IN_GAME_GAME_000900_H #include +#include "data.h" #include "types.h" void stub0f000900(void); diff --git a/src/include/game/stubs/game_000910.h b/src/include/game/stubs/game_000910.h index 77e1d77df..f9425cf4a 100644 --- a/src/include/game/stubs/game_000910.h +++ b/src/include/game/stubs/game_000910.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_GAME_000910_H #define IN_GAME_GAME_000910_H #include +#include "data.h" #include "types.h" void stub0f000910(void); diff --git a/src/include/game/stubs/game_00b180.h b/src/include/game/stubs/game_00b180.h index b767b0432..9541b5cf5 100644 --- a/src/include/game/stubs/game_00b180.h +++ b/src/include/game/stubs/game_00b180.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_GAME_00B180_H #define IN_GAME_GAME_00B180_H #include +#include "data.h" #include "types.h" void stub0f00b180(void); diff --git a/src/include/game/stubs/game_00b200.h b/src/include/game/stubs/game_00b200.h index 497675a3b..ede0480bd 100644 --- a/src/include/game/stubs/game_00b200.h +++ b/src/include/game/stubs/game_00b200.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_GAME_00B200_H #define IN_GAME_GAME_00B200_H #include +#include "data.h" #include "types.h" void stub0f00b200(void); diff --git a/src/include/game/stubs/game_013540.h b/src/include/game/stubs/game_013540.h index f512ea80f..34b6222e8 100644 --- a/src/include/game/stubs/game_013540.h +++ b/src/include/game/stubs/game_013540.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_GAME_013540_H #define IN_GAME_GAME_013540_H #include +#include "data.h" #include "types.h" void stub0f013540(void); diff --git a/src/include/game/stubs/game_015260.h b/src/include/game/stubs/game_015260.h index 199a0ff41..ad388ee88 100644 --- a/src/include/game/stubs/game_015260.h +++ b/src/include/game/stubs/game_015260.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_GAME_015260_H #define IN_GAME_GAME_015260_H #include +#include "data.h" #include "types.h" void stub0f015260(void); diff --git a/src/include/game/stubs/game_015270.h b/src/include/game/stubs/game_015270.h index a42609833..a8a42a03d 100644 --- a/src/include/game/stubs/game_015270.h +++ b/src/include/game/stubs/game_015270.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_GAME_015270_H #define IN_GAME_GAME_015270_H #include +#include "data.h" #include "types.h" void stub0f015270(void); diff --git a/src/include/game/stubs/game_0153f0.h b/src/include/game/stubs/game_0153f0.h index 735326384..c10d9ec35 100644 --- a/src/include/game/stubs/game_0153f0.h +++ b/src/include/game/stubs/game_0153f0.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_GAME_0153F0_H #define _IN_GAME_GAME_0153F0_H #include +#include "data.h" #include "types.h" void stub0f0153f0(void); diff --git a/src/include/game/stubs/game_015400.h b/src/include/game/stubs/game_015400.h index ccb998075..1d6e93e5b 100644 --- a/src/include/game/stubs/game_015400.h +++ b/src/include/game/stubs/game_015400.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_GAME_015400_H #define IN_GAME_GAME_015400_H #include +#include "data.h" #include "types.h" void stub0f015400(void); diff --git a/src/include/game/stubs/game_015410.h b/src/include/game/stubs/game_015410.h index 6723f2934..620fd94df 100644 --- a/src/include/game/stubs/game_015410.h +++ b/src/include/game/stubs/game_015410.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_GAME_015410_H #define IN_GAME_GAME_015410_H #include +#include "data.h" #include "types.h" void stub0f015410(void); diff --git a/src/include/game/stubs/game_102230.h b/src/include/game/stubs/game_102230.h index 9ecc2ee6b..988c78127 100644 --- a/src/include/game/stubs/game_102230.h +++ b/src/include/game/stubs/game_102230.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_GAME_102230_H #define _IN_GAME_GAME_102230_H #include +#include "data.h" #include "types.h" void stub0f102230(void); diff --git a/src/include/game/stubs/game_175f50.h b/src/include/game/stubs/game_175f50.h index 70b78668e..41c573f5b 100644 --- a/src/include/game/stubs/game_175f50.h +++ b/src/include/game/stubs/game_175f50.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_GAME_175F50_H #define IN_GAME_GAME_175F50_H #include +#include "data.h" #include "types.h" void stub0f175f50(void); diff --git a/src/include/game/stubs/game_176000.h b/src/include/game/stubs/game_176000.h index 3f2322005..eb27b0468 100644 --- a/src/include/game/stubs/game_176000.h +++ b/src/include/game/stubs/game_176000.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_GAME_176000_H #define IN_GAME_GAME_176000_H #include +#include "data.h" #include "types.h" #endif diff --git a/src/include/game/texture.h b/src/include/game/texture.h index 727172b77..499ea482a 100644 --- a/src/include/game/texture.h +++ b/src/include/game/texture.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_TEXTURE_H #define IN_GAME_TEXTURE_H #include +#include "data.h" #include "types.h" void func0f16e810(u32 arg0); diff --git a/src/include/game/timing.h b/src/include/game/timing.h index c1937ec20..b93b2ee81 100644 --- a/src/include/game/timing.h +++ b/src/include/game/timing.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_TIMING_H #define _IN_GAME_TIMING_H #include +#include "data.h" #include "types.h" void frametimeInit(void); diff --git a/src/include/game/title.h b/src/include/game/title.h index 818b6ebb1..73b463d32 100644 --- a/src/include/game/title.h +++ b/src/include/game/title.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_TITLE_H #define _IN_GAME_TITLE_H #include +#include "data.h" #include "types.h" extern u32 var800624d4; diff --git a/src/include/game/training/menus.h b/src/include/game/training/menus.h index a780634ef..8fe80dfcb 100644 --- a/src/include/game/training/menus.h +++ b/src/include/game/training/menus.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_TRAINING_MENUS_H #define IN_GAME_TRAINING_MENUS_H #include +#include "data.h" #include "types.h" char *frMenuTextFailReason(struct menuitem *item); diff --git a/src/include/game/training/training.h b/src/include/game/training/training.h index 1f67e736d..5efb075a8 100644 --- a/src/include/game/training/training.h +++ b/src/include/game/training/training.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_TRAINING_TRAINING_H #define IN_GAME_TRAINING_TRAINING_H #include +#include "data.h" #include "types.h" extern u8 g_FrIsValidWeapon; diff --git a/src/include/game/utils.h b/src/include/game/utils.h index 69e643ff8..4d7c6405f 100644 --- a/src/include/game/utils.h +++ b/src/include/game/utils.h @@ -1,6 +1,7 @@ #ifndef IN_GAME_UTILS_H #define IN_GAME_UTILS_H #include +#include "data.h" #include "types.h" void func0f176d70(s32 arg0); diff --git a/src/include/game/wallhit.h b/src/include/game/wallhit.h index 77da66ac8..711efa8bd 100644 --- a/src/include/game/wallhit.h +++ b/src/include/game/wallhit.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_WALLHIT_H #define _IN_GAME_WALLHIT_H #include +#include "data.h" #include "types.h" s16 func0f13e0e0(f32 arg0); diff --git a/src/include/game/weather/init.h b/src/include/game/weather/init.h index 35860b573..1f98fb0f9 100644 --- a/src/include/game/weather/init.h +++ b/src/include/game/weather/init.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_WEATHER_INIT_H #define _IN_GAME_WEATHER_INIT_H #include +#include "data.h" #include "types.h" void weatherInit(void); diff --git a/src/include/game/weather/tick.h b/src/include/game/weather/tick.h index 32f6e6f9c..822f70e01 100644 --- a/src/include/game/weather/tick.h +++ b/src/include/game/weather/tick.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_WEATHER_TICK_H #define _IN_GAME_WEATHER_TICK_H #include +#include "data.h" #include "types.h" void weatherTick(void); diff --git a/src/include/game/weather/weather.h b/src/include/game/weather/weather.h index 89fc85cc3..ef35fa9e6 100644 --- a/src/include/game/weather/weather.h +++ b/src/include/game/weather/weather.h @@ -1,6 +1,7 @@ #ifndef _IN_GAME_WEATHER_WEATHER_H #define _IN_GAME_WEATHER_WEATHER_H #include +#include "data.h" #include "types.h" Gfx *weatherRender(Gfx *gdl); diff --git a/src/include/gbiex.h b/src/include/gbiex.h index 9fef0afc5..bff4be861 100644 --- a/src/include/gbiex.h +++ b/src/include/gbiex.h @@ -1,6 +1,7 @@ #ifndef _IN_GBIEX_H #define _IN_GBIEX_H #include +#include "data.h" #include "types.h" /** diff --git a/src/include/gvars/gvars.h b/src/include/gvars/gvars.h index 03fdc8de3..fdd7eb658 100644 --- a/src/include/gvars/gvars.h +++ b/src/include/gvars/gvars.h @@ -1,6 +1,7 @@ #ifndef _IN_GVARS_H #define _IN_GVARS_H #include +#include "data.h" #include "types.h" struct g_vars { diff --git a/src/include/lib/args.h b/src/include/lib/args.h index 61ad459bf..307e1fa56 100644 --- a/src/include/lib/args.h +++ b/src/include/lib/args.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_ARGS_H #define _IN_LIB_ARGS_H #include +#include "data.h" #include "types.h" char *argParseString(char *str); diff --git a/src/include/lib/audiomgr.h b/src/include/lib/audiomgr.h index 5fed48735..ca6c2f6c0 100644 --- a/src/include/lib/audiomgr.h +++ b/src/include/lib/audiomgr.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_AUDIOMGR_H #define _IN_LIB_AUDIOMGR_H #include +#include "data.h" #include "types.h" void amgrAllocateStack(void); diff --git a/src/include/lib/controller.h b/src/include/lib/controller.h index 4cfafaabd..55c7e984f 100644 --- a/src/include/lib/controller.h +++ b/src/include/lib/controller.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_CONTROLLER_H #define _IN_LIB_CONTROLLER_H #include +#include "data.h" #include "types.h" void func00013900(void); diff --git a/src/include/lib/dma.h b/src/include/lib/dma.h index 7701aa9fa..9c7bf49cd 100644 --- a/src/include/lib/dma.h +++ b/src/include/lib/dma.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_DMA_H #define _IN_LIB_DMA_H #include +#include "data.h" #include "types.h" void dmaInit(void); diff --git a/src/include/lib/gvars.h b/src/include/lib/gvars.h index 15eba58ab..e6f44a10d 100644 --- a/src/include/lib/gvars.h +++ b/src/include/lib/gvars.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_GVARS_H #define _IN_LIB_GVARS_H #include +#include "data.h" #include "types.h" void gvarsInit(void); diff --git a/src/include/lib/lib_05dc0.h b/src/include/lib/lib_05dc0.h index c04cc2ed1..de4e1cf1a 100644 --- a/src/include/lib/lib_05dc0.h +++ b/src/include/lib/lib_05dc0.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_05DC0_H #define _IN_LIB_LIB_05DC0_H #include +#include "data.h" #include "types.h" u32 func00005dc0(void); diff --git a/src/include/lib/lib_06100.h b/src/include/lib/lib_06100.h index cde600e12..b675ed748 100644 --- a/src/include/lib/lib_06100.h +++ b/src/include/lib/lib_06100.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_06100_H #define _IN_LIB_LIB_06100_H #include +#include "data.h" #include "types.h" u32 func00006100(void); diff --git a/src/include/lib/lib_06330.h b/src/include/lib/lib_06330.h index 374f2e674..9e29dda4a 100644 --- a/src/include/lib/lib_06330.h +++ b/src/include/lib/lib_06330.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_06330_H #define _IN_LIB_LIB_06330_H #include +#include "data.h" #include "types.h" s32 func00006330(struct var800a3180 *arg0, u32 arg1); diff --git a/src/include/lib/lib_06440.h b/src/include/lib/lib_06440.h index 4b0793187..ccc64ec47 100644 --- a/src/include/lib/lib_06440.h +++ b/src/include/lib/lib_06440.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_06440_H #define _IN_LIB_LIB_06440_H #include +#include "data.h" #include "types.h" s32 osEepromLongWrite(OSMesgQueue *mq, u8 address, u8 *buffer, int nbytes); diff --git a/src/include/lib/lib_06550.h b/src/include/lib/lib_06550.h index 509264619..48a8aa4ab 100644 --- a/src/include/lib/lib_06550.h +++ b/src/include/lib/lib_06550.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_06550_H #define _IN_LIB_LIB_06550_H #include +#include "data.h" #include "types.h" s32 func00006550(struct var800a3180 *arg0, u16 company_code, u32 game_code, u8 *game_name, u8 *ext_name, u32 numbytes); diff --git a/src/include/lib/lib_070d0.h b/src/include/lib/lib_070d0.h index 36ea260f5..69d122700 100644 --- a/src/include/lib/lib_070d0.h +++ b/src/include/lib/lib_070d0.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_070D0_H #define _IN_LIB_LIB_070D0_H #include +#include "data.h" #include "types.h" u32 func000070d0(void); diff --git a/src/include/lib/lib_074f0.h b/src/include/lib/lib_074f0.h index e539d257c..d0faa6350 100644 --- a/src/include/lib/lib_074f0.h +++ b/src/include/lib/lib_074f0.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_074F0_H #define _IN_LIB_LIB_074F0_H #include +#include "data.h" #include "types.h" u32 rzipInflate(void *src, void *dst, void *tmpbuffer); diff --git a/src/include/lib/lib_09660.h b/src/include/lib/lib_09660.h index 098814731..d053e46cf 100644 --- a/src/include/lib/lib_09660.h +++ b/src/include/lib/lib_09660.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_09660_H #define _IN_LIB_LIB_09660_H #include +#include "data.h" #include "types.h" u32 func00009660(void); diff --git a/src/include/lib/lib_0bfb0.h b/src/include/lib/lib_0bfb0.h index fb52f45af..9caa82581 100644 --- a/src/include/lib/lib_0bfb0.h +++ b/src/include/lib/lib_0bfb0.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_0BFB0_H #define _IN_LIB_LIB_0BFB0_H #include +#include "data.h" #include "types.h" void faultCreateThread(void); diff --git a/src/include/lib/lib_0c000.h b/src/include/lib/lib_0c000.h index 2d5d93a07..f48a38cb5 100644 --- a/src/include/lib/lib_0c000.h +++ b/src/include/lib/lib_0c000.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_0C000_H #define _IN_LIB_LIB_0C000_H #include +#include "data.h" #include "types.h" extern const char var70052700[]; diff --git a/src/include/lib/lib_0e9d0.h b/src/include/lib/lib_0e9d0.h index fc7a56feb..c7568470c 100644 --- a/src/include/lib/lib_0e9d0.h +++ b/src/include/lib/lib_0e9d0.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_0E9D0_H #define _IN_LIB_LIB_0E9D0_H #include +#include "data.h" #include "types.h" bool audioIsFiltered(s32 audioid); diff --git a/src/include/lib/lib_11420.h b/src/include/lib/lib_11420.h index bebcd6763..7bcc53f67 100644 --- a/src/include/lib/lib_11420.h +++ b/src/include/lib/lib_11420.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_11420_H #define _IN_LIB_LIB_11420_H #include +#include "data.h" #include "types.h" u32 func00011420(void); diff --git a/src/include/lib/lib_126b0.h b/src/include/lib/lib_126b0.h index f9e05dc95..7049c9f22 100644 --- a/src/include/lib/lib_126b0.h +++ b/src/include/lib/lib_126b0.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_126B0_H #define _IN_LIB_LIB_126B0_H #include +#include "data.h" #include "types.h" u32 func000126b0(void); diff --git a/src/include/lib/lib_13710.h b/src/include/lib/lib_13710.h index 7a91f6b88..942efaae4 100644 --- a/src/include/lib/lib_13710.h +++ b/src/include/lib/lib_13710.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_13710_H #define _IN_LIB_LIB_13710_H #include +#include "data.h" #include "types.h" void func00013710(void); diff --git a/src/include/lib/lib_13750.h b/src/include/lib/lib_13750.h index 5f8304679..7ce8893d7 100644 --- a/src/include/lib/lib_13750.h +++ b/src/include/lib/lib_13750.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_13750_H #define _IN_LIB_LIB_13750_H #include +#include "data.h" #include "types.h" void func00013750(void); diff --git a/src/include/lib/lib_13790.h b/src/include/lib/lib_13790.h index 2b5d68ea4..58e7d8021 100644 --- a/src/include/lib/lib_13790.h +++ b/src/include/lib/lib_13790.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_13790_H #define _IN_LIB_LIB_13790_H #include +#include "data.h" #include "types.h" void func00013790(void); diff --git a/src/include/lib/lib_13820.h b/src/include/lib/lib_13820.h index 4c11d6184..86a5f4512 100644 --- a/src/include/lib/lib_13820.h +++ b/src/include/lib/lib_13820.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_13820_H #define _IN_LIB_LIB_13820_H #include +#include "data.h" #include "types.h" #endif diff --git a/src/include/lib/lib_159b0.h b/src/include/lib/lib_159b0.h index 8cd5612bd..9935dcd72 100644 --- a/src/include/lib/lib_159b0.h +++ b/src/include/lib/lib_159b0.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_159B0_H #define _IN_LIB_LIB_159B0_H #include +#include "data.h" #include "types.h" void func000159b0(Mtxf *matrix); diff --git a/src/include/lib/lib_16110.h b/src/include/lib/lib_16110.h index 979603bac..ebb4470db 100644 --- a/src/include/lib/lib_16110.h +++ b/src/include/lib/lib_16110.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_16110_H #define _IN_LIB_LIB_16110_H #include +#include "data.h" #include "types.h" u8 *ailistFindById(s32 ailistid); diff --git a/src/include/lib/lib_233c0.h b/src/include/lib/lib_233c0.h index 3c1892fe2..edf056b5e 100644 --- a/src/include/lib/lib_233c0.h +++ b/src/include/lib/lib_233c0.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_233C0_H #define _IN_LIB_LIB_233C0_H #include +#include "data.h" #include "types.h" void func000233c0(void); diff --git a/src/include/lib/lib_2f490.h b/src/include/lib/lib_2f490.h index 8c8e3545c..a2d24752a 100644 --- a/src/include/lib/lib_2f490.h +++ b/src/include/lib/lib_2f490.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_2F490_H #define _IN_LIB_LIB_2F490_H #include +#include "data.h" #include "types.h" u32 func0002f490(void); diff --git a/src/include/lib/lib_2fa00.h b/src/include/lib/lib_2fa00.h index abed96b3d..ce2b31c2f 100644 --- a/src/include/lib/lib_2fa00.h +++ b/src/include/lib/lib_2fa00.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_2FA00_H #define _IN_LIB_LIB_2FA00_H #include +#include "data.h" #include "types.h" void rmonproc(); diff --git a/src/include/lib/lib_2faf0.h b/src/include/lib/lib_2faf0.h index a4f322b50..5f5d5e6f0 100644 --- a/src/include/lib/lib_2faf0.h +++ b/src/include/lib/lib_2faf0.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_2FAF0_H #define _IN_LIB_LIB_2FAF0_H #include +#include "data.h" #include "types.h" u32 func0002faf0(void); diff --git a/src/include/lib/lib_2fba0.h b/src/include/lib/lib_2fba0.h index c9810936f..8d5b7c801 100644 --- a/src/include/lib/lib_2fba0.h +++ b/src/include/lib/lib_2fba0.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_2FBA0_H #define _IN_LIB_LIB_2FBA0_H #include +#include "data.h" #include "types.h" u32 func0002fba0(void); diff --git a/src/include/lib/lib_2fc60.h b/src/include/lib/lib_2fc60.h index a5471fdb8..1e919472a 100644 --- a/src/include/lib/lib_2fc60.h +++ b/src/include/lib/lib_2fc60.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_2FC60_H #define _IN_LIB_LIB_2FC60_H #include +#include "data.h" #include "types.h" u32 func0002fc60(void); diff --git a/src/include/lib/lib_30ce0.h b/src/include/lib/lib_30ce0.h index e414a3781..2261b5f4b 100644 --- a/src/include/lib/lib_30ce0.h +++ b/src/include/lib/lib_30ce0.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_30CE0_H #define _IN_LIB_LIB_30CE0_H #include +#include "data.h" #include "types.h" u32 func00030ce0(void); diff --git a/src/include/lib/lib_317f0.h b/src/include/lib/lib_317f0.h index 4d6fd7bb6..7cf641a6e 100644 --- a/src/include/lib/lib_317f0.h +++ b/src/include/lib/lib_317f0.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_317F0_H #define _IN_LIB_LIB_317F0_H #include +#include "data.h" #include "types.h" u32 func000317f0(void); diff --git a/src/include/lib/lib_34030.h b/src/include/lib/lib_34030.h index f33f9ecb9..39487b0f9 100644 --- a/src/include/lib/lib_34030.h +++ b/src/include/lib/lib_34030.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_34030_H #define _IN_LIB_LIB_34030_H #include +#include "data.h" #include "types.h" u32 func00034030(void); diff --git a/src/include/lib/lib_37650.h b/src/include/lib/lib_37650.h index 0a68adfb6..e45787026 100644 --- a/src/include/lib/lib_37650.h +++ b/src/include/lib/lib_37650.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_37650_H #define _IN_LIB_LIB_37650_H #include +#include "data.h" #include "types.h" u32 func00037650(void); diff --git a/src/include/lib/lib_37b00.h b/src/include/lib/lib_37b00.h index 5adfa1925..48fa0c6f3 100644 --- a/src/include/lib/lib_37b00.h +++ b/src/include/lib/lib_37b00.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_37B00_H #define _IN_LIB_LIB_37B00_H #include +#include "data.h" #include "types.h" u32 func00037b00(void); diff --git a/src/include/lib/lib_38d10.h b/src/include/lib/lib_38d10.h index 340620dbc..ccf5c60a3 100644 --- a/src/include/lib/lib_38d10.h +++ b/src/include/lib/lib_38d10.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_38D10_H #define _IN_LIB_LIB_38D10_H #include +#include "data.h" #include "types.h" u32 func00038d10(void); diff --git a/src/include/lib/lib_38d30.h b/src/include/lib/lib_38d30.h index 13b527dca..ff53912f4 100644 --- a/src/include/lib/lib_38d30.h +++ b/src/include/lib/lib_38d30.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_38D30_H #define _IN_LIB_LIB_38D30_H #include +#include "data.h" #include "types.h" u32 func00038d30(void); diff --git a/src/include/lib/lib_39c80.h b/src/include/lib/lib_39c80.h index 22b26fb5b..e5a0afe64 100644 --- a/src/include/lib/lib_39c80.h +++ b/src/include/lib/lib_39c80.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_39C80_H #define _IN_LIB_LIB_39C80_H #include +#include "data.h" #include "types.h" u32 func00039c80(void); diff --git a/src/include/lib/lib_39f70.h b/src/include/lib/lib_39f70.h index 430c087f9..0ea270e05 100644 --- a/src/include/lib/lib_39f70.h +++ b/src/include/lib/lib_39f70.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_39F70_H #define _IN_LIB_LIB_39F70_H #include +#include "data.h" #include "types.h" u32 func00039f70(void); diff --git a/src/include/lib/lib_39fc0.h b/src/include/lib/lib_39fc0.h index 1ec1b3d5b..0edb48e58 100644 --- a/src/include/lib/lib_39fc0.h +++ b/src/include/lib/lib_39fc0.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_39FC0_H #define _IN_LIB_LIB_39FC0_H #include +#include "data.h" #include "types.h" u32 func00039fc0(void); diff --git a/src/include/lib/lib_39fe0.h b/src/include/lib/lib_39fe0.h index 41316e153..fe37db330 100644 --- a/src/include/lib/lib_39fe0.h +++ b/src/include/lib/lib_39fe0.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_39FE0_H #define _IN_LIB_LIB_39FE0_H #include +#include "data.h" #include "types.h" u32 func00039fe0(void); diff --git a/src/include/lib/lib_3a100.h b/src/include/lib/lib_3a100.h index 0d57e6a27..a0f3c643a 100644 --- a/src/include/lib/lib_3a100.h +++ b/src/include/lib/lib_3a100.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_3A100_H #define _IN_LIB_LIB_3A100_H #include +#include "data.h" #include "types.h" u32 func0003a100(void); diff --git a/src/include/lib/lib_3c430.h b/src/include/lib/lib_3c430.h index 26a8ea324..0924d4f1a 100644 --- a/src/include/lib/lib_3c430.h +++ b/src/include/lib/lib_3c430.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_3C430_H #define _IN_LIB_LIB_3C430_H #include +#include "data.h" #include "types.h" u32 func0003c430(void); diff --git a/src/include/lib/lib_3c4d0.h b/src/include/lib/lib_3c4d0.h index 81f076cc6..bf1db5a66 100644 --- a/src/include/lib/lib_3c4d0.h +++ b/src/include/lib/lib_3c4d0.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_3C4D0_H #define _IN_LIB_LIB_3C4D0_H #include +#include "data.h" #include "types.h" u32 func0003c4d0(void); diff --git a/src/include/lib/lib_3ccf0.h b/src/include/lib/lib_3ccf0.h index 1c77de016..ab17f31f1 100644 --- a/src/include/lib/lib_3ccf0.h +++ b/src/include/lib/lib_3ccf0.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_3CCF0_H #define _IN_LIB_LIB_3CCF0_H #include +#include "data.h" #include "types.h" u32 func0003ccf0(void); diff --git a/src/include/lib/lib_3cdc0.h b/src/include/lib/lib_3cdc0.h index d3720b3b9..677187200 100644 --- a/src/include/lib/lib_3cdc0.h +++ b/src/include/lib/lib_3cdc0.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_3CDC0_H #define _IN_LIB_LIB_3CDC0_H #include +#include "data.h" #include "types.h" u32 func0003cdc0(void); diff --git a/src/include/lib/lib_3cef0.h b/src/include/lib/lib_3cef0.h index 1eefe0b78..a05d6fcc9 100644 --- a/src/include/lib/lib_3cef0.h +++ b/src/include/lib/lib_3cef0.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_3CEF0_H #define _IN_LIB_LIB_3CEF0_H #include +#include "data.h" #include "types.h" u32 func0003cef0(void); diff --git a/src/include/lib/lib_3d280.h b/src/include/lib/lib_3d280.h index 72eb72e1f..f1e7b1b35 100644 --- a/src/include/lib/lib_3d280.h +++ b/src/include/lib/lib_3d280.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_3D280_H #define _IN_LIB_LIB_3D280_H #include +#include "data.h" #include "types.h" u32 func0003d280(void); diff --git a/src/include/lib/lib_3e3e0.h b/src/include/lib/lib_3e3e0.h index 61bcaf15f..c461b99d2 100644 --- a/src/include/lib/lib_3e3e0.h +++ b/src/include/lib/lib_3e3e0.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_3E3E0_H #define _IN_LIB_LIB_3E3E0_H #include +#include "data.h" #include "types.h" u32 func0003e3e0(void); diff --git a/src/include/lib/lib_3e730.h b/src/include/lib/lib_3e730.h index 993b7fdce..dcb6ebda9 100644 --- a/src/include/lib/lib_3e730.h +++ b/src/include/lib/lib_3e730.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_3E730_H #define _IN_LIB_LIB_3E730_H #include +#include "data.h" #include "types.h" extern const u32 var70054b40[]; diff --git a/src/include/lib/lib_43dd0.h b/src/include/lib/lib_43dd0.h index 83df3d841..89c1c1d88 100644 --- a/src/include/lib/lib_43dd0.h +++ b/src/include/lib/lib_43dd0.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_43DD0_H #define _IN_LIB_LIB_43DD0_H #include +#include "data.h" #include "types.h" u32 func00043dd0(void); diff --git a/src/include/lib/lib_446d0.h b/src/include/lib/lib_446d0.h index 8d91c49da..057c8f6d0 100644 --- a/src/include/lib/lib_446d0.h +++ b/src/include/lib/lib_446d0.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_446D0_H #define _IN_LIB_LIB_446D0_H #include +#include "data.h" #include "types.h" u32 func000446d0(void); diff --git a/src/include/lib/lib_44bc0.h b/src/include/lib/lib_44bc0.h index f46f6f6a0..4e9949f58 100644 --- a/src/include/lib/lib_44bc0.h +++ b/src/include/lib/lib_44bc0.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_44BC0_H #define _IN_LIB_LIB_44BC0_H #include +#include "data.h" #include "types.h" u32 func00044bc0(void); diff --git a/src/include/lib/lib_44f60.h b/src/include/lib/lib_44f60.h index b99080d24..1dcfca2e5 100644 --- a/src/include/lib/lib_44f60.h +++ b/src/include/lib/lib_44f60.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_44F60_H #define _IN_LIB_LIB_44F60_H #include +#include "data.h" #include "types.h" u32 func00044f60(void); diff --git a/src/include/lib/lib_45ed0.h b/src/include/lib/lib_45ed0.h index 10662add9..b64f019bd 100644 --- a/src/include/lib/lib_45ed0.h +++ b/src/include/lib/lib_45ed0.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_45ED0_H #define _IN_LIB_LIB_45ED0_H #include +#include "data.h" #include "types.h" u32 func00045ed0(void); diff --git a/src/include/lib/lib_461c0.h b/src/include/lib/lib_461c0.h index 978e80b8d..789f090f4 100644 --- a/src/include/lib/lib_461c0.h +++ b/src/include/lib/lib_461c0.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_461C0_H #define _IN_LIB_LIB_461C0_H #include +#include "data.h" #include "types.h" u32 func000461c0(void); diff --git a/src/include/lib/lib_46650.h b/src/include/lib/lib_46650.h index aef397e9b..eb42c11f6 100644 --- a/src/include/lib/lib_46650.h +++ b/src/include/lib/lib_46650.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_46650_H #define _IN_LIB_LIB_46650_H #include +#include "data.h" #include "types.h" u32 func00046650(void); diff --git a/src/include/lib/lib_47550.h b/src/include/lib/lib_47550.h index 93b07a434..74be87633 100644 --- a/src/include/lib/lib_47550.h +++ b/src/include/lib/lib_47550.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_47550_H #define _IN_LIB_LIB_47550_H #include +#include "data.h" #include "types.h" u32 func00047550(void); diff --git a/src/include/lib/lib_47a90.h b/src/include/lib/lib_47a90.h index fb2f9daa9..a7ac79545 100644 --- a/src/include/lib/lib_47a90.h +++ b/src/include/lib/lib_47a90.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_47A90_H #define _IN_LIB_LIB_47A90_H #include +#include "data.h" #include "types.h" u32 func00047a90(void); diff --git a/src/include/lib/lib_47d20.h b/src/include/lib/lib_47d20.h index fb4c0254b..9f8e5d106 100644 --- a/src/include/lib/lib_47d20.h +++ b/src/include/lib/lib_47d20.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_47D20_H #define _IN_LIB_LIB_47D20_H #include +#include "data.h" #include "types.h" u32 func00047d20(void); diff --git a/src/include/lib/lib_48150.h b/src/include/lib/lib_48150.h index ccc60e9ea..a9ab6cd62 100644 --- a/src/include/lib/lib_48150.h +++ b/src/include/lib/lib_48150.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_48150_H #define _IN_LIB_LIB_48150_H #include +#include "data.h" #include "types.h" void osInvalICache(void *vaddr, s32 nbytes); diff --git a/src/include/lib/lib_4b170.h b/src/include/lib/lib_4b170.h index 6187ea474..c4dcad6f8 100644 --- a/src/include/lib/lib_4b170.h +++ b/src/include/lib/lib_4b170.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_4B170_H #define _IN_LIB_LIB_4B170_H #include +#include "data.h" #include "types.h" u32 func0004b170(void); diff --git a/src/include/lib/lib_4c090.h b/src/include/lib/lib_4c090.h index dc160d9b3..14d6390e4 100644 --- a/src/include/lib/lib_4c090.h +++ b/src/include/lib/lib_4c090.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_4C090_H #define _IN_LIB_LIB_4C090_H #include +#include "data.h" #include "types.h" u32 func0004c090(void); diff --git a/src/include/lib/lib_4cc10.h b/src/include/lib/lib_4cc10.h index 8b94d2896..9de011b25 100644 --- a/src/include/lib/lib_4cc10.h +++ b/src/include/lib/lib_4cc10.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_4CC10_H #define _IN_LIB_LIB_4CC10_H #include +#include "data.h" #include "types.h" u32 func0004cc10(u32 arg0, u32 arg1, u32 arg2, u32 arg3, u32 arg4, u32 *arg5); diff --git a/src/include/lib/lib_4ce60.h b/src/include/lib/lib_4ce60.h index 783ec6338..a91ea6bf1 100644 --- a/src/include/lib/lib_4ce60.h +++ b/src/include/lib/lib_4ce60.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_4CE60_H #define _IN_LIB_LIB_4CE60_H #include +#include "data.h" #include "types.h" s32 func0004ce60(struct var800a3180 *arg0, s32 *arg1); diff --git a/src/include/lib/lib_4d000.h b/src/include/lib/lib_4d000.h index 2421a5cdd..4cbf2b1ef 100644 --- a/src/include/lib/lib_4d000.h +++ b/src/include/lib/lib_4d000.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_4D000_H #define _IN_LIB_LIB_4D000_H #include +#include "data.h" #include "types.h" u32 func0004d000(u32 arg0, u32 arg1, u32 arg2, u32 arg3, u32 arg4, u32 arg5, u32 *arg6); diff --git a/src/include/lib/lib_4d480.h b/src/include/lib/lib_4d480.h index b3789b340..f23de8c7d 100644 --- a/src/include/lib/lib_4d480.h +++ b/src/include/lib/lib_4d480.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_4D480_H #define _IN_LIB_LIB_4D480_H #include +#include "data.h" #include "types.h" u32 func0004d480(struct var800a3180 *arg0, u16 company_code, u32 game_code, char *game_name, char *ext_name); diff --git a/src/include/lib/lib_4d6f0.h b/src/include/lib/lib_4d6f0.h index a74e88cea..60408fe33 100644 --- a/src/include/lib/lib_4d6f0.h +++ b/src/include/lib/lib_4d6f0.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_4D6F0_H #define _IN_LIB_LIB_4D6F0_H #include +#include "data.h" #include "types.h" u32 func0004d6f0(void); diff --git a/src/include/lib/lib_4f5e0.h b/src/include/lib/lib_4f5e0.h index ff58bf775..48988640f 100644 --- a/src/include/lib/lib_4f5e0.h +++ b/src/include/lib/lib_4f5e0.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_4F5E0_H #define _IN_LIB_LIB_4F5E0_H #include +#include "data.h" #include "types.h" void func0004f5e0(struct var800a3180 *arg0, u32 arg1); diff --git a/src/include/lib/lib_4fff0.h b/src/include/lib/lib_4fff0.h index d795f199f..ea1cd7d52 100644 --- a/src/include/lib/lib_4fff0.h +++ b/src/include/lib/lib_4fff0.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_4FFF0_H #define _IN_LIB_LIB_4FFF0_H #include +#include "data.h" #include "types.h" u32 func0004fff0(void); diff --git a/src/include/lib/lib_50480.h b/src/include/lib/lib_50480.h index ca7b9c09d..7d03cfe87 100644 --- a/src/include/lib/lib_50480.h +++ b/src/include/lib/lib_50480.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_50480_H #define _IN_LIB_LIB_50480_H #include +#include "data.h" #include "types.h" u32 func00050480(void); diff --git a/src/include/lib/lib_50a00.h b/src/include/lib/lib_50a00.h index 6ad6a0842..15a8cb2a2 100644 --- a/src/include/lib/lib_50a00.h +++ b/src/include/lib/lib_50a00.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_50A00_H #define _IN_LIB_LIB_50A00_H #include +#include "data.h" #include "types.h" s32 func00050a00(s32 arg0, s32 arg1, OSPfsState *note); diff --git a/src/include/lib/lib_50f20.h b/src/include/lib/lib_50f20.h index 32044c14c..c7d71c6cb 100644 --- a/src/include/lib/lib_50f20.h +++ b/src/include/lib/lib_50f20.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_50F20_H #define _IN_LIB_LIB_50F20_H #include +#include "data.h" #include "types.h" u32 func50f20(void); diff --git a/src/include/lib/lib_513b0.h b/src/include/lib/lib_513b0.h index 5fc76edd2..344744d18 100644 --- a/src/include/lib/lib_513b0.h +++ b/src/include/lib/lib_513b0.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_513B0_H #define _IN_LIB_LIB_513B0_H #include +#include "data.h" #include "types.h" s32 func000513b0(struct var800a3180 *arg0, bool arg1, u16 arg2, char *arg3, u16 arg4); diff --git a/src/include/lib/lib_51d50.h b/src/include/lib/lib_51d50.h index 019051f98..99abc74b1 100644 --- a/src/include/lib/lib_51d50.h +++ b/src/include/lib/lib_51d50.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_51D50_H #define _IN_LIB_LIB_51D50_H #include +#include "data.h" #include "types.h" u32 func00051d50(void); diff --git a/src/include/lib/lib_52360.h b/src/include/lib/lib_52360.h index e21ebb0c6..2fd482a7d 100644 --- a/src/include/lib/lib_52360.h +++ b/src/include/lib/lib_52360.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIB_52360_H #define _IN_LIB_LIB_52360_H #include +#include "data.h" #include "types.h" u32 func00052360(void); diff --git a/src/include/lib/libc/ll.h b/src/include/lib/libc/ll.h index a9efe02b3..d496e99fb 100644 --- a/src/include/lib/libc/ll.h +++ b/src/include/lib/libc/ll.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_LIBC_LL_H #define _IN_LIB_LIBC_LL_H #include +#include "data.h" #include "types.h" unsigned long long __ull_rshift(unsigned long long a0, unsigned long long a1); diff --git a/src/include/lib/main.h b/src/include/lib/main.h index 51ef84ac9..3bb0e5251 100644 --- a/src/include/lib/main.h +++ b/src/include/lib/main.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_MAIN_H #define _IN_LIB_MAIN_H #include +#include "data.h" #include "types.h" extern s32 var8005dd18; diff --git a/src/include/lib/memory.h b/src/include/lib/memory.h index 22712c01f..c5e41f8d2 100644 --- a/src/include/lib/memory.h +++ b/src/include/lib/memory.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_MEMORY_H #define _IN_LIB_MEMORY_H #include +#include "data.h" #include "types.h" void func000121e0(void); diff --git a/src/include/lib/model.h b/src/include/lib/model.h index faa8f5f4f..adae77948 100644 --- a/src/include/lib/model.h +++ b/src/include/lib/model.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_MODEL_H #define _IN_LIB_MODEL_H #include +#include "data.h" #include "types.h" u32 func0001a500(void); diff --git a/src/include/lib/rng.h b/src/include/lib/rng.h index 03d41a0d2..467ed9c93 100644 --- a/src/include/lib/rng.h +++ b/src/include/lib/rng.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_RNG_H #define _IN_LIB_RNG_H #include +#include "data.h" #include "types.h" u32 random(void); diff --git a/src/include/lib/str.h b/src/include/lib/str.h index c0e1b8651..a47d035c1 100644 --- a/src/include/lib/str.h +++ b/src/include/lib/str.h @@ -1,6 +1,7 @@ #ifndef _IN_LIB_STR_H #define _IN_LIB_STR_H #include +#include "data.h" #include "types.h" char *strcpy(char *dst, char *src); diff --git a/src/include/stagesetup.h b/src/include/stagesetup.h index e665f1b79..9c9df8973 100644 --- a/src/include/stagesetup.h +++ b/src/include/stagesetup.h @@ -3,6 +3,7 @@ #include "commands.h" #include "intro.h" #include "props.h" +#include "data.h" #include "types.h" #include "gunscript.h" diff --git a/src/inflate/inflate.c b/src/inflate/inflate.c index d95b986a6..d52a2f55d 100644 --- a/src/inflate/inflate.c +++ b/src/inflate/inflate.c @@ -1,6 +1,7 @@ #include #include "constants.h" #include "inflate/inflate.h" +#include "data.h" #include "types.h" #define GETBYTE() (inbuf[inptr++]) diff --git a/src/lib/args.c b/src/lib/args.c index a8b081b32..0d6e5d531 100644 --- a/src/lib/args.c +++ b/src/lib/args.c @@ -1,16 +1,9 @@ #include #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/args.h" #include "lib/lib_2fa00.h" +#include "data.h" #include "types.h" s32 argc = 1; diff --git a/src/lib/audiomgr.c b/src/lib/audiomgr.c index 841f675bb..3d8a539da 100644 --- a/src/lib/audiomgr.c +++ b/src/lib/audiomgr.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 "gvars/gvars.h" #include "lib/lib_09660.h" #include "lib/lib_2faf0.h" @@ -16,6 +9,7 @@ #include "lib/lib_2fc60.h" #include "lib/lib_30ce0.h" #include "lib/libc/ll.h" +#include "data.h" #include "types.h" u32 var8005cf90 = 0x00000000; diff --git a/src/lib/controller.c b/src/lib/controller.c index 6582a3d4f..60913d2ec 100644 --- a/src/lib/controller.c +++ b/src/lib/controller.c @@ -1,17 +1,11 @@ #include #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/pak/pak.h" #include "gvars/gvars.h" #include "lib/main.h" #include "lib/controller.h" #include "lib/lib_4f5e0.h" +#include "data.h" #include "types.h" /** diff --git a/src/lib/dma.c b/src/lib/dma.c index efae607d2..326292800 100644 --- a/src/lib/dma.c +++ b/src/lib/dma.c @@ -1,14 +1,8 @@ #include #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 "data.h" #include "types.h" u8 g_LoadState = 0; diff --git a/src/lib/gvars.c b/src/lib/gvars.c index 26dbc868e..06d6ae187 100644 --- a/src/lib/gvars.c +++ b/src/lib/gvars.c @@ -1,13 +1,7 @@ #include #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" void gvarsInit(void) diff --git a/src/lib/lib_06100.c b/src/lib/lib_06100.c index 0cf609bf9..33b7aabdb 100644 --- a/src/lib/lib_06100.c +++ b/src/lib/lib_06100.c @@ -1,13 +1,7 @@ #include #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" GLOBAL_ASM( diff --git a/src/lib/lib_06330.c b/src/lib/lib_06330.c index be08e74ab..e8887aec2 100644 --- a/src/lib/lib_06330.c +++ b/src/lib/lib_06330.c @@ -1,14 +1,8 @@ #include #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_06100.h" +#include "data.h" #include "types.h" GLOBAL_ASM( diff --git a/src/lib/lib_06550.c b/src/lib/lib_06550.c index 790706b57..c62c27ee2 100644 --- a/src/lib/lib_06550.c +++ b/src/lib/lib_06550.c @@ -1,12 +1,5 @@ #include #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_06550.h" #include "lib/lib_4b170.h" @@ -16,6 +9,7 @@ #include "lib/lib_4d000.h" #include "lib/lib_4d480.h" #include "lib/lib_4d6f0.h" +#include "data.h" #include "types.h" GLOBAL_ASM( diff --git a/src/lib/lib_070d0.c b/src/lib/lib_070d0.c index c4a4ea8f1..e2d05dd27 100644 --- a/src/lib/lib_070d0.c +++ b/src/lib/lib_070d0.c @@ -1,18 +1,12 @@ #include #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 "gvars/gvars.h" #include "lib/lib_074f0.h" #include "lib/dma.h" #include "lib/lib_48150.h" #include "lib/lib_4d6f0.h" +#include "data.h" #include "types.h" GLOBAL_ASM( diff --git a/src/lib/lib_074f0.c b/src/lib/lib_074f0.c index df7ace95d..f7d7d587c 100644 --- a/src/lib/lib_074f0.c +++ b/src/lib/lib_074f0.c @@ -1,15 +1,9 @@ #include #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_074f0.h" #include "lib/lib_2fa00.h" +#include "data.h" #include "types.h" const u32 var70052530[] = {0x00000001}; diff --git a/src/lib/lib_09660.c b/src/lib/lib_09660.c index be0162ff1..5e3972d15 100644 --- a/src/lib/lib_09660.c +++ b/src/lib/lib_09660.c @@ -1,12 +1,5 @@ #include #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_0b3350.h" #include "game/game_0b69d0.h" #include "game/file.h" @@ -19,6 +12,7 @@ #include "lib/lib_2faf0.h" #include "lib/lib_30ce0.h" #include "lib/lib_4b170.h" +#include "data.h" #include "types.h" const u32 var700526d0[] = {0x01400140}; diff --git a/src/lib/lib_0bfb0.c b/src/lib/lib_0bfb0.c index 4fadbe80a..a2b0d8d0b 100644 --- a/src/lib/lib_0bfb0.c +++ b/src/lib/lib_0bfb0.c @@ -1,15 +1,9 @@ #include #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_0c000.h" #include "lib/lib_2fa00.h" +#include "data.h" #include "types.h" void faultCreateThread(void) diff --git a/src/lib/lib_0c000.c b/src/lib/lib_0c000.c index 563f9dda3..466a08afd 100644 --- a/src/lib/lib_0c000.c +++ b/src/lib/lib_0c000.c @@ -1,16 +1,10 @@ #include #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_09660.h" #include "lib/lib_0c000.h" #include "lib/lib_2fa00.h" +#include "data.h" #include "types.h" const char var70052700[] = "BD"; diff --git a/src/lib/lib_0e9d0.c b/src/lib/lib_0e9d0.c index 4a2c6b73f..06fd2eb56 100644 --- a/src/lib/lib_0e9d0.c +++ b/src/lib/lib_0e9d0.c @@ -1,12 +1,5 @@ #include #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/core.h" #include "game/music.h" @@ -24,6 +17,7 @@ #include "lib/lib_38d10.h" #include "lib/lib_38d30.h" #include "lib/lib_39c80.h" +#include "data.h" #include "types.h" const char var70053b20[] = "RUSSES SOUND GUARD STRING"; diff --git a/src/lib/lib_11420.c b/src/lib/lib_11420.c index cf0ecb4a6..59bbe5b40 100644 --- a/src/lib/lib_11420.c +++ b/src/lib/lib_11420.c @@ -1,12 +1,5 @@ #include #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/music.h" #include "game/game_176080.h" #include "gvars/gvars.h" @@ -15,6 +8,7 @@ #include "lib/lib_38d10.h" #include "lib/lib_39c80.h" #include "lib/lib_39f70.h" +#include "data.h" #include "types.h" const u32 var70053ca0[] = {0x00000000}; diff --git a/src/lib/lib_126b0.c b/src/lib/lib_126b0.c index cdc692104..54e0b0d7e 100644 --- a/src/lib/lib_126b0.c +++ b/src/lib/lib_126b0.c @@ -1,14 +1,8 @@ #include #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_126b0.h" +#include "data.h" #include "types.h" GLOBAL_ASM( diff --git a/src/lib/lib_13710.c b/src/lib/lib_13710.c index c4984ee00..e19a6389e 100644 --- a/src/lib/lib_13710.c +++ b/src/lib/lib_13710.c @@ -1,14 +1,8 @@ #include #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_13710.h" +#include "data.h" #include "types.h" void func00013710(void) diff --git a/src/lib/lib_13750.c b/src/lib/lib_13750.c index 37f150dbd..3328167ae 100644 --- a/src/lib/lib_13750.c +++ b/src/lib/lib_13750.c @@ -1,14 +1,8 @@ #include #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_13750.h" +#include "data.h" #include "types.h" void func00013750(void) diff --git a/src/lib/lib_13790.c b/src/lib/lib_13790.c index 6d97b8e15..a649c0d7d 100644 --- a/src/lib/lib_13790.c +++ b/src/lib/lib_13790.c @@ -1,14 +1,8 @@ #include #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_13790.h" +#include "data.h" #include "types.h" void func00013790(void) diff --git a/src/lib/lib_13820.c b/src/lib/lib_13820.c index d4fab6694..d3eff4067 100644 --- a/src/lib/lib_13820.c +++ b/src/lib/lib_13820.c @@ -1,14 +1,8 @@ #include #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/libc/ll.h" +#include "data.h" #include "types.h" const char var70054030[] = "0123456789abcdefghijklmnopqrstuvwxyz"; diff --git a/src/lib/lib_159b0.c b/src/lib/lib_159b0.c index 7ee2a2f63..ac31a1648 100644 --- a/src/lib/lib_159b0.c +++ b/src/lib/lib_159b0.c @@ -1,13 +1,7 @@ #include #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" GLOBAL_ASM( diff --git a/src/lib/lib_16110.c b/src/lib/lib_16110.c index 8510d70f3..2a204033d 100644 --- a/src/lib/lib_16110.c +++ b/src/lib/lib_16110.c @@ -1,19 +1,12 @@ #include #include "constants.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 "game/atan2f.h" #include "game/padhalllv.h" #include "gvars/gvars.h" #include "lib/lib_159b0.h" #include "lib/lib_16110.h" #include "lib/lib_4f5e0.h" +#include "data.h" #include "types.h" const u32 var70054200[] = {0x42652ee0}; diff --git a/src/lib/lib_233c0.c b/src/lib/lib_233c0.c index 7e9274a80..0e5440043 100644 --- a/src/lib/lib_233c0.c +++ b/src/lib/lib_233c0.c @@ -1,12 +1,5 @@ #include #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 "game/game_1531a0.h" #include "game/room.h" @@ -18,6 +11,7 @@ #include "lib/lib_2f490.h" #include "lib/libc/ll.h" #include "lib/lib_4b170.h" +#include "data.h" #include "types.h" const u32 var70054690[] = {0x3a83126f}; diff --git a/src/lib/lib_2f490.c b/src/lib/lib_2f490.c index dac893fec..c92db37a4 100644 --- a/src/lib/lib_2f490.c +++ b/src/lib/lib_2f490.c @@ -1,14 +1,8 @@ #include #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" GLOBAL_ASM( diff --git a/src/lib/lib_2fa00.c b/src/lib/lib_2fa00.c index 9acadf289..c42154516 100644 --- a/src/lib/lib_2fa00.c +++ b/src/lib/lib_2fa00.c @@ -1,14 +1,8 @@ #include #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_0c000.h" +#include "data.h" #include "types.h" void rmonproc() diff --git a/src/lib/lib_2faf0.c b/src/lib/lib_2faf0.c index 201696a21..39cf81f46 100644 --- a/src/lib/lib_2faf0.c +++ b/src/lib/lib_2faf0.c @@ -1,13 +1,7 @@ #include #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" GLOBAL_ASM( diff --git a/src/lib/lib_2fba0.c b/src/lib/lib_2fba0.c index 4b95105ad..453dac701 100644 --- a/src/lib/lib_2fba0.c +++ b/src/lib/lib_2fba0.c @@ -1,15 +1,9 @@ #include #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_30ce0.h" #include "lib/lib_39fc0.h" +#include "data.h" #include "types.h" GLOBAL_ASM( diff --git a/src/lib/lib_2fc60.c b/src/lib/lib_2fc60.c index fb28e50dc..76b7035b2 100644 --- a/src/lib/lib_2fc60.c +++ b/src/lib/lib_2fc60.c @@ -1,16 +1,10 @@ #include #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_16110.h" #include "lib/lib_2fc60.h" #include "lib/lib_39fe0.h" +#include "data.h" #include "types.h" const u32 var700546b0[] = {0x3f83f794}; diff --git a/src/lib/lib_30ce0.c b/src/lib/lib_30ce0.c index 855faf214..13ad6967e 100644 --- a/src/lib/lib_30ce0.c +++ b/src/lib/lib_30ce0.c @@ -1,18 +1,12 @@ #include #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_2faf0.h" #include "lib/lib_30ce0.h" #include "lib/lib_39fe0.h" #include "lib/lib_3a100.h" #include "lib/lib_3c430.h" +#include "data.h" #include "types.h" const u32 var70054730[] = {0x49742400}; diff --git a/src/lib/lib_317f0.c b/src/lib/lib_317f0.c index 611d0cf77..07ecd3842 100644 --- a/src/lib/lib_317f0.c +++ b/src/lib/lib_317f0.c @@ -1,12 +1,5 @@ #include #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_0e9d0.h" #include "lib/lib_2faf0.h" @@ -24,6 +17,7 @@ #include "lib/lib_3d280.h" #include "lib/lib_3e3e0.h" #include "lib/lib_3e730.h" +#include "data.h" #include "types.h" const u32 var70054740[] = {0x70031ce0}; diff --git a/src/lib/lib_34030.c b/src/lib/lib_34030.c index fe8c7b605..3a3756bd6 100644 --- a/src/lib/lib_34030.c +++ b/src/lib/lib_34030.c @@ -1,12 +1,5 @@ #include #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_0e9d0.h" #include "lib/lib_2faf0.h" @@ -24,6 +17,7 @@ #include "lib/lib_3d280.h" #include "lib/lib_3e3e0.h" #include "lib/lib_3e730.h" +#include "data.h" #include "types.h" const u32 var70054780[] = {0x70034500}; diff --git a/src/lib/lib_37650.c b/src/lib/lib_37650.c index da3745d18..306d0e41e 100644 --- a/src/lib/lib_37650.c +++ b/src/lib/lib_37650.c @@ -1,15 +1,9 @@ #include #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_37650.h" #include "lib/lib_3c4d0.h" +#include "data.h" #include "types.h" GLOBAL_ASM( diff --git a/src/lib/lib_37b00.c b/src/lib/lib_37b00.c index 51de2b0dd..5f17043bf 100644 --- a/src/lib/lib_37b00.c +++ b/src/lib/lib_37b00.c @@ -1,12 +1,5 @@ #include #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_2faf0.h" #include "lib/lib_37b00.h" @@ -14,6 +7,7 @@ #include "lib/lib_43dd0.h" #include "lib/libc/ll.h" #include "lib/lib_4b170.h" +#include "data.h" #include "types.h" GLOBAL_ASM( diff --git a/src/lib/lib_38d10.c b/src/lib/lib_38d10.c index a7a04f819..0b6f21ee4 100644 --- a/src/lib/lib_38d10.c +++ b/src/lib/lib_38d10.c @@ -1,13 +1,7 @@ #include #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" GLOBAL_ASM( diff --git a/src/lib/lib_38d30.c b/src/lib/lib_38d30.c index f178b086b..d2366fc9d 100644 --- a/src/lib/lib_38d30.c +++ b/src/lib/lib_38d30.c @@ -1,15 +1,9 @@ #include #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_38d30.h" #include "lib/lib_3c4d0.h" +#include "data.h" #include "types.h" GLOBAL_ASM( diff --git a/src/lib/lib_39c80.c b/src/lib/lib_39c80.c index f19ad60ef..40be6cd15 100644 --- a/src/lib/lib_39c80.c +++ b/src/lib/lib_39c80.c @@ -1,15 +1,9 @@ #include #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_3c4d0.h" #include "lib/lib_43dd0.h" +#include "data.h" #include "types.h" GLOBAL_ASM( diff --git a/src/lib/lib_39f70.c b/src/lib/lib_39f70.c index ea4fa6f86..91e956cb3 100644 --- a/src/lib/lib_39f70.c +++ b/src/lib/lib_39f70.c @@ -1,14 +1,8 @@ #include #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_3c4d0.h" +#include "data.h" #include "types.h" GLOBAL_ASM( diff --git a/src/lib/lib_39fc0.c b/src/lib/lib_39fc0.c index a0d0e95e0..fe1561e8a 100644 --- a/src/lib/lib_39fc0.c +++ b/src/lib/lib_39fc0.c @@ -1,13 +1,7 @@ #include #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" GLOBAL_ASM( diff --git a/src/lib/lib_39fe0.c b/src/lib/lib_39fe0.c index ca3f80348..87d4df7ee 100644 --- a/src/lib/lib_39fe0.c +++ b/src/lib/lib_39fe0.c @@ -1,14 +1,8 @@ #include #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_3a100.h" +#include "data.h" #include "types.h" const u32 var70054a80[] = {0x3f8012ef}; diff --git a/src/lib/lib_3a100.c b/src/lib/lib_3a100.c index c677ab67b..f1947e6d3 100644 --- a/src/lib/lib_3a100.c +++ b/src/lib/lib_3a100.c @@ -1,17 +1,11 @@ #include #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/atan2f.h" #include "gvars/gvars.h" #include "lib/lib_2faf0.h" #include "lib/lib_3a100.h" #include "lib/lib_446d0.h" +#include "data.h" #include "types.h" const u32 var70054a90[] = {0x3fb50481}; diff --git a/src/lib/lib_3c430.c b/src/lib/lib_3c430.c index a26887c14..06677a1a7 100644 --- a/src/lib/lib_3c430.c +++ b/src/lib/lib_3c430.c @@ -1,14 +1,8 @@ #include #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_44bc0.h" +#include "data.h" #include "types.h" GLOBAL_ASM( diff --git a/src/lib/lib_3c4d0.c b/src/lib/lib_3c4d0.c index 155205c4a..d843bb4a0 100644 --- a/src/lib/lib_3c4d0.c +++ b/src/lib/lib_3c4d0.c @@ -1,17 +1,11 @@ #include #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_30ce0.h" #include "lib/lib_3c4d0.h" #include "lib/lib_3e730.h" #include "lib/lib_4b170.h" +#include "data.h" #include "types.h" GLOBAL_ASM( diff --git a/src/lib/lib_3ccf0.c b/src/lib/lib_3ccf0.c index 44e9f151b..cf44338ee 100644 --- a/src/lib/lib_3ccf0.c +++ b/src/lib/lib_3ccf0.c @@ -1,15 +1,9 @@ #include #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_30ce0.h" #include "lib/lib_3e730.h" +#include "data.h" #include "types.h" GLOBAL_ASM( diff --git a/src/lib/lib_3cdc0.c b/src/lib/lib_3cdc0.c index 3eea48d46..1cd152de3 100644 --- a/src/lib/lib_3cdc0.c +++ b/src/lib/lib_3cdc0.c @@ -1,15 +1,9 @@ #include #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_30ce0.h" #include "lib/lib_3e730.h" +#include "data.h" #include "types.h" GLOBAL_ASM( diff --git a/src/lib/lib_3cef0.c b/src/lib/lib_3cef0.c index 251c15d31..875cb3c7d 100644 --- a/src/lib/lib_3cef0.c +++ b/src/lib/lib_3cef0.c @@ -1,15 +1,9 @@ #include #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_30ce0.h" #include "lib/lib_3e730.h" +#include "data.h" #include "types.h" GLOBAL_ASM( diff --git a/src/lib/lib_3d280.c b/src/lib/lib_3d280.c index e1954ba97..87fb7372f 100644 --- a/src/lib/lib_3d280.c +++ b/src/lib/lib_3d280.c @@ -1,18 +1,12 @@ #include #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_30ce0.h" #include "lib/lib_3c4d0.h" #include "lib/lib_3ccf0.h" #include "lib/lib_3d280.h" #include "lib/lib_44bc0.h" +#include "data.h" #include "types.h" GLOBAL_ASM( diff --git a/src/lib/lib_3e3e0.c b/src/lib/lib_3e3e0.c index 97ec14865..3e3f5e330 100644 --- a/src/lib/lib_3e3e0.c +++ b/src/lib/lib_3e3e0.c @@ -1,16 +1,10 @@ #include #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_30ce0.h" #include "lib/lib_3a100.h" #include "lib/lib_3e730.h" +#include "data.h" #include "types.h" const u32 var70054ae0[] = {0x3dcccccd}; diff --git a/src/lib/lib_3e730.c b/src/lib/lib_3e730.c index f66f0ec8c..e303689bf 100644 --- a/src/lib/lib_3e730.c +++ b/src/lib/lib_3e730.c @@ -1,12 +1,5 @@ #include #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_16110.h" #include "lib/lib_30ce0.h" @@ -19,6 +12,7 @@ #include "lib/lib_47550.h" #include "lib/libc/ll.h" #include "lib/lib_4b170.h" +#include "data.h" #include "types.h" const u32 var70054af0[] = {0x7003eff8}; diff --git a/src/lib/lib_43dd0.c b/src/lib/lib_43dd0.c index 25465c2d0..af767d6ae 100644 --- a/src/lib/lib_43dd0.c +++ b/src/lib/lib_43dd0.c @@ -1,12 +1,5 @@ #include #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_3c4d0.h" #include "lib/lib_3e730.h" @@ -14,6 +7,7 @@ #include "lib/lib_461c0.h" #include "lib/libc/ll.h" #include "lib/lib_4b170.h" +#include "data.h" #include "types.h" GLOBAL_ASM( diff --git a/src/lib/lib_446d0.c b/src/lib/lib_446d0.c index f6682869e..4011c97bd 100644 --- a/src/lib/lib_446d0.c +++ b/src/lib/lib_446d0.c @@ -1,14 +1,8 @@ #include #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_3e730.h" +#include "data.h" #include "types.h" GLOBAL_ASM( diff --git a/src/lib/lib_44bc0.c b/src/lib/lib_44bc0.c index c9c285a13..1bc27ce8b 100644 --- a/src/lib/lib_44bc0.c +++ b/src/lib/lib_44bc0.c @@ -1,15 +1,9 @@ #include #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_37b00.h" #include "lib/lib_3a100.h" +#include "data.h" #include "types.h" GLOBAL_ASM( diff --git a/src/lib/lib_44f60.c b/src/lib/lib_44f60.c index b90f433c7..410925ca1 100644 --- a/src/lib/lib_44f60.c +++ b/src/lib/lib_44f60.c @@ -1,17 +1,11 @@ #include #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_3a100.h" #include "lib/lib_44f60.h" #include "lib/lib_47a90.h" #include "lib/lib_4b170.h" +#include "data.h" #include "types.h" GLOBAL_ASM( diff --git a/src/lib/lib_45ed0.c b/src/lib/lib_45ed0.c index 64d7548e7..d9c6e6da4 100644 --- a/src/lib/lib_45ed0.c +++ b/src/lib/lib_45ed0.c @@ -1,14 +1,8 @@ #include #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_47d20.h" +#include "data.h" #include "types.h" GLOBAL_ASM( diff --git a/src/lib/lib_461c0.c b/src/lib/lib_461c0.c index 4b8fa63a2..172c02887 100644 --- a/src/lib/lib_461c0.c +++ b/src/lib/lib_461c0.c @@ -1,14 +1,8 @@ #include #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_461c0.h" +#include "data.h" #include "types.h" GLOBAL_ASM( diff --git a/src/lib/lib_46650.c b/src/lib/lib_46650.c index 515e14288..462fba962 100644 --- a/src/lib/lib_46650.c +++ b/src/lib/lib_46650.c @@ -1,13 +1,7 @@ #include #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" GLOBAL_ASM( diff --git a/src/lib/lib_47550.c b/src/lib/lib_47550.c index 96d9d1d24..245666d09 100644 --- a/src/lib/lib_47550.c +++ b/src/lib/lib_47550.c @@ -1,13 +1,7 @@ #include #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" GLOBAL_ASM( diff --git a/src/lib/lib_47a90.c b/src/lib/lib_47a90.c index ecceffb58..653e2ef2e 100644 --- a/src/lib/lib_47a90.c +++ b/src/lib/lib_47a90.c @@ -1,14 +1,8 @@ #include #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_44f60.h" +#include "data.h" #include "types.h" GLOBAL_ASM( diff --git a/src/lib/lib_47d20.c b/src/lib/lib_47d20.c index 3b2b65f14..976f3650b 100644 --- a/src/lib/lib_47d20.c +++ b/src/lib/lib_47d20.c @@ -1,13 +1,7 @@ #include #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" GLOBAL_ASM( diff --git a/src/lib/lib_4b170.c b/src/lib/lib_4b170.c index 78a77b89f..02e51683c 100644 --- a/src/lib/lib_4b170.c +++ b/src/lib/lib_4b170.c @@ -1,13 +1,7 @@ #include #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" GLOBAL_ASM( diff --git a/src/lib/lib_4c090.c b/src/lib/lib_4c090.c index edf7f8603..1dd47fb3b 100644 --- a/src/lib/lib_4c090.c +++ b/src/lib/lib_4c090.c @@ -1,16 +1,10 @@ #include #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_4b170.h" #include "lib/lib_4c090.h" #include "lib/lib_4d6f0.h" +#include "data.h" #include "types.h" GLOBAL_ASM( diff --git a/src/lib/lib_4cc10.c b/src/lib/lib_4cc10.c index dd59910b6..a22d34e8c 100644 --- a/src/lib/lib_4cc10.c +++ b/src/lib/lib_4cc10.c @@ -1,14 +1,8 @@ #include #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_4c090.h" +#include "data.h" #include "types.h" GLOBAL_ASM( diff --git a/src/lib/lib_4ce60.c b/src/lib/lib_4ce60.c index 9b623c670..130b9da16 100644 --- a/src/lib/lib_4ce60.c +++ b/src/lib/lib_4ce60.c @@ -1,14 +1,8 @@ #include #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_4c090.h" +#include "data.h" #include "types.h" GLOBAL_ASM( diff --git a/src/lib/lib_4d000.c b/src/lib/lib_4d000.c index 59487c67f..c2b95f387 100644 --- a/src/lib/lib_4d000.c +++ b/src/lib/lib_4d000.c @@ -1,18 +1,12 @@ #include #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_4b170.h" #include "lib/lib_4c090.h" #include "lib/lib_4cc10.h" #include "lib/lib_4ce60.h" #include "lib/lib_4d000.h" +#include "data.h" #include "types.h" GLOBAL_ASM( diff --git a/src/lib/lib_4d480.c b/src/lib/lib_4d480.c index 200bfb179..09b35f096 100644 --- a/src/lib/lib_4d480.c +++ b/src/lib/lib_4d480.c @@ -1,17 +1,11 @@ #include #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/libc/ll.h" #include "lib/lib_4c090.h" #include "lib/lib_4cc10.h" #include "lib/lib_4d480.h" +#include "data.h" #include "types.h" GLOBAL_ASM( diff --git a/src/lib/lib_4d6f0.c b/src/lib/lib_4d6f0.c index 379660deb..b70965b8a 100644 --- a/src/lib/lib_4d6f0.c +++ b/src/lib/lib_4d6f0.c @@ -1,16 +1,10 @@ #include #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/libc/ll.h" #include "lib/lib_4c090.h" #include "lib/lib_4d6f0.h" +#include "data.h" #include "types.h" GLOBAL_ASM( diff --git a/src/lib/lib_4f5e0.c b/src/lib/lib_4f5e0.c index 8630841b9..d72e1c7e7 100644 --- a/src/lib/lib_4f5e0.c +++ b/src/lib/lib_4f5e0.c @@ -1,16 +1,10 @@ #include #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_16110.h" #include "lib/lib_4f5e0.h" #include "lib/lib_51d50.h" +#include "data.h" #include "types.h" GLOBAL_ASM( diff --git a/src/lib/lib_4fff0.c b/src/lib/lib_4fff0.c index 872145c52..d48206135 100644 --- a/src/lib/lib_4fff0.c +++ b/src/lib/lib_4fff0.c @@ -1,13 +1,7 @@ #include #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" GLOBAL_ASM( diff --git a/src/lib/lib_50480.c b/src/lib/lib_50480.c index fe6359ba0..1b7fe6754 100644 --- a/src/lib/lib_50480.c +++ b/src/lib/lib_50480.c @@ -1,15 +1,9 @@ #include #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_4c090.h" #include "lib/lib_50480.h" +#include "data.h" #include "types.h" GLOBAL_ASM( diff --git a/src/lib/lib_50a00.c b/src/lib/lib_50a00.c index 8d73db18d..d52c659df 100644 --- a/src/lib/lib_50a00.c +++ b/src/lib/lib_50a00.c @@ -1,12 +1,5 @@ #include #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_06100.h" #include "lib/lib_06330.h" @@ -15,6 +8,7 @@ #include "lib/lib_4d6f0.h" #include "lib/lib_50a00.h" #include "lib/lib_513b0.h" +#include "data.h" #include "types.h" GLOBAL_ASM( diff --git a/src/lib/lib_50f20.c b/src/lib/lib_50f20.c index 3b95c8156..dca8e2ac3 100644 --- a/src/lib/lib_50f20.c +++ b/src/lib/lib_50f20.c @@ -1,18 +1,12 @@ #include #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_06330.h" #include "lib/libc/ll.h" #include "lib/lib_4d6f0.h" #include "lib/lib_50a00.h" #include "lib/lib_513b0.h" +#include "data.h" #include "types.h" GLOBAL_ASM( diff --git a/src/lib/lib_513b0.c b/src/lib/lib_513b0.c index 8a34d5789..72f271ba3 100644 --- a/src/lib/lib_513b0.c +++ b/src/lib/lib_513b0.c @@ -1,18 +1,12 @@ #include #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_4b170.h" #include "lib/lib_4c090.h" #include "lib/lib_4d6f0.h" #include "lib/lib_513b0.h" #include "lib/lib_52360.h" +#include "data.h" #include "types.h" GLOBAL_ASM( diff --git a/src/lib/lib_51d50.c b/src/lib/lib_51d50.c index e44e1ffec..f41aa7127 100644 --- a/src/lib/lib_51d50.c +++ b/src/lib/lib_51d50.c @@ -1,13 +1,7 @@ #include #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" GLOBAL_ASM( diff --git a/src/lib/lib_52360.c b/src/lib/lib_52360.c index 43f89c6e2..208307d7c 100644 --- a/src/lib/lib_52360.c +++ b/src/lib/lib_52360.c @@ -1,14 +1,8 @@ #include #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_06100.h" +#include "data.h" #include "types.h" GLOBAL_ASM( diff --git a/src/lib/main.c b/src/lib/main.c index c1672bde4..beeff1ffe 100644 --- a/src/lib/main.c +++ b/src/lib/main.c @@ -3,13 +3,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/debug.h" #include "game/game_000000.h" #include "game/game_000090.h" @@ -63,6 +56,7 @@ #include "lib/lib_233c0.h" #include "lib/lib_2f490.h" #include "lib/lib_2fa00.h" +#include "data.h" #include "types.h" s32 var8005d9b0 = 0; diff --git a/src/lib/memory.c b/src/lib/memory.c index ec100c070..5b43c5ef3 100644 --- a/src/lib/memory.c +++ b/src/lib/memory.c @@ -1,14 +1,8 @@ #include #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 func000121e0(void) diff --git a/src/lib/model.c b/src/lib/model.c index e20599b2c..184e2cfff 100644 --- a/src/lib/model.c +++ b/src/lib/model.c @@ -1,12 +1,5 @@ #include #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_096700.h" #include "game/game_0969d0.h" #include "game/game_096ca0.h" @@ -22,6 +15,7 @@ #include "lib/lib_233c0.h" #include "lib/lib_4f5e0.h" #include "lib/model.h" +#include "data.h" #include "types.h" GLOBAL_ASM( diff --git a/src/lib/rng.c b/src/lib/rng.c index 7f6ede95a..1f269adae 100644 --- a/src/lib/rng.c +++ b/src/lib/rng.c @@ -1,16 +1,9 @@ #include #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/rng.h" #include "lib/lib_2fa00.h" +#include "data.h" #include "types.h" u64 g_RngSeed = 0xab8d9f7781280783; diff --git a/src/lib/ultra/io/aisetfreq.c b/src/lib/ultra/io/aisetfreq.c index b4114d8c1..4c961c0d4 100644 --- a/src/lib/ultra/io/aisetfreq.c +++ b/src/lib/ultra/io/aisetfreq.c @@ -1,5 +1,5 @@ #include -#include "game/data/data_000000.h" +#include "data.h" s32 osAiSetFrequency(u32 frequency) { diff --git a/src/lib/ultra/io/conteeplongread.c b/src/lib/ultra/io/conteeplongread.c index 54e5ae990..203f1c3ce 100644 --- a/src/lib/ultra/io/conteeplongread.c +++ b/src/lib/ultra/io/conteeplongread.c @@ -1,4 +1,5 @@ #include +#include "data.h" s32 osEepromLongRead(OSMesgQueue *mq, u8 address, u8 *buffer, int length) { diff --git a/src/lib/ultra/io/conteeplongwrite.c b/src/lib/ultra/io/conteeplongwrite.c index d9df969a9..7ea2626cc 100644 --- a/src/lib/ultra/io/conteeplongwrite.c +++ b/src/lib/ultra/io/conteeplongwrite.c @@ -1,4 +1,5 @@ #include +#include "data.h" GLOBAL_ASM( glabel osEepromLongWrite diff --git a/src/lib/ultra/io/conteepprobe.c b/src/lib/ultra/io/conteepprobe.c index 73eb79910..5dec518f7 100644 --- a/src/lib/ultra/io/conteepprobe.c +++ b/src/lib/ultra/io/conteepprobe.c @@ -1,4 +1,5 @@ #include +#include "data.h" s32 osEepromProbe(OSMesgQueue *mq) { diff --git a/src/lib/ultra/io/conteepread.c b/src/lib/ultra/io/conteepread.c index f1f129f56..6c46a29e7 100644 --- a/src/lib/ultra/io/conteepread.c +++ b/src/lib/ultra/io/conteepread.c @@ -1,4 +1,5 @@ #include +#include "data.h" GLOBAL_ASM( glabel osEepromRead diff --git a/src/lib/ultra/io/conteepwrite.c b/src/lib/ultra/io/conteepwrite.c index ec9f36285..fa9ce8917 100644 --- a/src/lib/ultra/io/conteepwrite.c +++ b/src/lib/ultra/io/conteepwrite.c @@ -1,4 +1,5 @@ #include +#include "data.h" GLOBAL_ASM( glabel osEepromWrite diff --git a/src/lib/ultra/io/contquery.c b/src/lib/ultra/io/contquery.c index 6c76f5ffc..ff30f6baf 100644 --- a/src/lib/ultra/io/contquery.c +++ b/src/lib/ultra/io/contquery.c @@ -1,4 +1,5 @@ #include +#include "data.h" #include "gvars/gvars.h" s32 osContStartQuery(OSMesgQueue *mq) diff --git a/src/lib/ultra/io/contramread.c b/src/lib/ultra/io/contramread.c index 258ad2e3d..937268827 100644 --- a/src/lib/ultra/io/contramread.c +++ b/src/lib/ultra/io/contramread.c @@ -1,4 +1,5 @@ #include +#include "data.h" GLOBAL_ASM( glabel __osContRamRead diff --git a/src/lib/ultra/io/contramwrite.c b/src/lib/ultra/io/contramwrite.c index 81df7442c..a1ccb90fe 100644 --- a/src/lib/ultra/io/contramwrite.c +++ b/src/lib/ultra/io/contramwrite.c @@ -1,4 +1,5 @@ #include +#include "data.h" GLOBAL_ASM( glabel __osContRamWrite diff --git a/src/lib/ultra/io/contreaddata.c b/src/lib/ultra/io/contreaddata.c index 64e65c7b5..ea5d3bf8d 100644 --- a/src/lib/ultra/io/contreaddata.c +++ b/src/lib/ultra/io/contreaddata.c @@ -1,4 +1,5 @@ #include +#include "data.h" #include "gvars/gvars.h" void __osPackReadData(void); diff --git a/src/lib/ultra/io/controller.c b/src/lib/ultra/io/controller.c index dce32d863..0a3e5ccf4 100644 --- a/src/lib/ultra/io/controller.c +++ b/src/lib/ultra/io/controller.c @@ -1,4 +1,5 @@ #include +#include "data.h" GLOBAL_ASM( glabel osContInit diff --git a/src/lib/ultra/io/devmgr.c b/src/lib/ultra/io/devmgr.c index aaee6633a..291b0fb91 100644 --- a/src/lib/ultra/io/devmgr.c +++ b/src/lib/ultra/io/devmgr.c @@ -1,4 +1,5 @@ #include +#include "data.h" GLOBAL_ASM( glabel __osDevMgrMain diff --git a/src/lib/ultra/io/dpctr.c b/src/lib/ultra/io/dpctr.c index de9ada189..f1cd1645d 100644 --- a/src/lib/ultra/io/dpctr.c +++ b/src/lib/ultra/io/dpctr.c @@ -1,4 +1,5 @@ #include "libultra_internal.h" +#include "data.h" void osDpGetCounters(u32 *array) { diff --git a/src/lib/ultra/io/dpsetstat.c b/src/lib/ultra/io/dpsetstat.c index a51f56bea..fea9905e6 100644 --- a/src/lib/ultra/io/dpsetstat.c +++ b/src/lib/ultra/io/dpsetstat.c @@ -1,4 +1,5 @@ #include "libultra_internal.h" +#include "data.h" void osDpSetStatus(u32 data) { diff --git a/src/lib/ultra/io/epirawdma.c b/src/lib/ultra/io/epirawdma.c index 7dd33b4ef..1ac0b2d79 100644 --- a/src/lib/ultra/io/epirawdma.c +++ b/src/lib/ultra/io/epirawdma.c @@ -1,4 +1,5 @@ #include +#include "data.h" GLOBAL_ASM( glabel osEPiRawStartDma diff --git a/src/lib/ultra/io/epirawread.c b/src/lib/ultra/io/epirawread.c index 158e8fec8..bfe370683 100644 --- a/src/lib/ultra/io/epirawread.c +++ b/src/lib/ultra/io/epirawread.c @@ -1,4 +1,5 @@ #include +#include "data.h" GLOBAL_ASM( glabel osEPiRawReadIo diff --git a/src/lib/ultra/io/epirawwrite.c b/src/lib/ultra/io/epirawwrite.c index 469fce031..5334ffc68 100644 --- a/src/lib/ultra/io/epirawwrite.c +++ b/src/lib/ultra/io/epirawwrite.c @@ -1,4 +1,5 @@ #include +#include "data.h" GLOBAL_ASM( glabel osEPiRawWriteIo diff --git a/src/lib/ultra/io/pfsgetstatus.c b/src/lib/ultra/io/pfsgetstatus.c index 0973c0990..68cfd0382 100644 --- a/src/lib/ultra/io/pfsgetstatus.c +++ b/src/lib/ultra/io/pfsgetstatus.c @@ -1,5 +1,5 @@ #include -#include "game/data/data_000000.h" +#include "data.h" #include "gvars/gvars.h" void __osPfsRequestOneChannel(int channel, int cmd); diff --git a/src/lib/ultra/io/pfsisplug.c b/src/lib/ultra/io/pfsisplug.c index 5e2404a18..6c4b3fab8 100644 --- a/src/lib/ultra/io/pfsisplug.c +++ b/src/lib/ultra/io/pfsisplug.c @@ -1,4 +1,5 @@ #include +#include "data.h" GLOBAL_ASM( glabel osPfsIsPlug diff --git a/src/lib/ultra/io/piacs.c b/src/lib/ultra/io/piacs.c index 6ffa656e5..4236c29a4 100644 --- a/src/lib/ultra/io/piacs.c +++ b/src/lib/ultra/io/piacs.c @@ -1,5 +1,5 @@ #include -#include "game/data/data_000000.h" +#include "data.h" #include "gvars/gvars.h" void __osPiCreateAccessQueue(void) diff --git a/src/lib/ultra/io/pidma.c b/src/lib/ultra/io/pidma.c index ff87815ec..62db999cb 100644 --- a/src/lib/ultra/io/pidma.c +++ b/src/lib/ultra/io/pidma.c @@ -1,4 +1,5 @@ #include +#include "data.h" GLOBAL_ASM( glabel osPiStartDma diff --git a/src/lib/ultra/io/pigetcmdq.c b/src/lib/ultra/io/pigetcmdq.c index fbaabcbc4..52b67225b 100644 --- a/src/lib/ultra/io/pigetcmdq.c +++ b/src/lib/ultra/io/pigetcmdq.c @@ -1,5 +1,5 @@ #include -#include "game/data/data_000000.h" +#include "data.h" OSMesgQueue *osPiGetCmdQueue(void) { diff --git a/src/lib/ultra/io/pimgr.c b/src/lib/ultra/io/pimgr.c index 63e20fb72..1ef36b096 100644 --- a/src/lib/ultra/io/pimgr.c +++ b/src/lib/ultra/io/pimgr.c @@ -1,4 +1,5 @@ #include +#include "data.h" GLOBAL_ASM( glabel osCreatePiPanager diff --git a/src/lib/ultra/io/pirawdma.c b/src/lib/ultra/io/pirawdma.c index 53a28b404..387e516ae 100644 --- a/src/lib/ultra/io/pirawdma.c +++ b/src/lib/ultra/io/pirawdma.c @@ -1,4 +1,5 @@ #include +#include "data.h" s32 osPiRawStartDma(s32 direction, u32 devAddr, void *dramAddr, u32 size) { diff --git a/src/lib/ultra/io/pirawread.c b/src/lib/ultra/io/pirawread.c index 085f3027e..82551515b 100644 --- a/src/lib/ultra/io/pirawread.c +++ b/src/lib/ultra/io/pirawread.c @@ -1,4 +1,5 @@ #include +#include "data.h" s32 osPiRawReadIo(u32 devAddr, u32 *data) { diff --git a/src/lib/ultra/io/piread.c b/src/lib/ultra/io/piread.c index c907d5943..71fd30920 100644 --- a/src/lib/ultra/io/piread.c +++ b/src/lib/ultra/io/piread.c @@ -1,4 +1,5 @@ #include +#include "data.h" s32 osPiReadIo(u32 devAddr, u32 *data) { diff --git a/src/lib/ultra/io/si.c b/src/lib/ultra/io/si.c index 117af47f6..868472e3e 100644 --- a/src/lib/ultra/io/si.c +++ b/src/lib/ultra/io/si.c @@ -1,4 +1,5 @@ #include +#include "data.h" int __osSiDeviceBusy() { diff --git a/src/lib/ultra/io/siacs.c b/src/lib/ultra/io/siacs.c index a6ce4928e..1ef46f577 100644 --- a/src/lib/ultra/io/siacs.c +++ b/src/lib/ultra/io/siacs.c @@ -1,5 +1,5 @@ #include -#include "game/data/data_000000.h" +#include "data.h" #include "gvars/gvars.h" void __osSiCreateAccessQueue(void) diff --git a/src/lib/ultra/io/sirawdma.c b/src/lib/ultra/io/sirawdma.c index 482abd510..464027899 100644 --- a/src/lib/ultra/io/sirawdma.c +++ b/src/lib/ultra/io/sirawdma.c @@ -1,4 +1,5 @@ #include +#include "data.h" s32 __osSiRawStartDma(s32 direction, void *dramAddr) { diff --git a/src/lib/ultra/io/sirawread.c b/src/lib/ultra/io/sirawread.c index 034dff1ba..0b273778b 100644 --- a/src/lib/ultra/io/sirawread.c +++ b/src/lib/ultra/io/sirawread.c @@ -1,4 +1,5 @@ #include +#include "data.h" s32 __osSiRawReadIo(u32 devAddr, u32 *data) { diff --git a/src/lib/ultra/io/sirawwrite.c b/src/lib/ultra/io/sirawwrite.c index 63e11a20e..da0f823d5 100644 --- a/src/lib/ultra/io/sirawwrite.c +++ b/src/lib/ultra/io/sirawwrite.c @@ -1,4 +1,5 @@ #include +#include "data.h" s32 __osSiRawWriteIo(u32 devAddr, u32 data) { diff --git a/src/lib/ultra/io/sp.c b/src/lib/ultra/io/sp.c index fa86c72ff..bc84c1658 100644 --- a/src/lib/ultra/io/sp.c +++ b/src/lib/ultra/io/sp.c @@ -1,4 +1,5 @@ #include "libultra_internal.h" +#include "data.h" int __osSpDeviceBusy() { diff --git a/src/lib/ultra/io/spgetstat.c b/src/lib/ultra/io/spgetstat.c index 4e4722d4d..2c8832a60 100644 --- a/src/lib/ultra/io/spgetstat.c +++ b/src/lib/ultra/io/spgetstat.c @@ -1,4 +1,5 @@ #include "libultra_internal.h" +#include "data.h" u32 __osSpGetStatus() { diff --git a/src/lib/ultra/io/sprawdma.c b/src/lib/ultra/io/sprawdma.c index 88e24f04a..4c43a0bd0 100644 --- a/src/lib/ultra/io/sprawdma.c +++ b/src/lib/ultra/io/sprawdma.c @@ -1,4 +1,5 @@ #include "libultra_internal.h" +#include "data.h" s32 __osSpRawStartDma(s32 direction, u32 devAddr, void *dramAddr, u32 size) { diff --git a/src/lib/ultra/io/spsetpc.c b/src/lib/ultra/io/spsetpc.c index 570d55af4..87a2a4095 100644 --- a/src/lib/ultra/io/spsetpc.c +++ b/src/lib/ultra/io/spsetpc.c @@ -1,4 +1,5 @@ #include "libultra_internal.h" +#include "data.h" s32 __osSpSetPc(u32 data) { diff --git a/src/lib/ultra/io/spsetstat.c b/src/lib/ultra/io/spsetstat.c index f0e2380e8..4dd087363 100644 --- a/src/lib/ultra/io/spsetstat.c +++ b/src/lib/ultra/io/spsetstat.c @@ -1,4 +1,5 @@ #include "libultra_internal.h" +#include "data.h" void __osSpSetStatus(u32 data) { diff --git a/src/lib/ultra/io/sptask.c b/src/lib/ultra/io/sptask.c index 1c3d10e43..914f91d58 100644 --- a/src/lib/ultra/io/sptask.c +++ b/src/lib/ultra/io/sptask.c @@ -1,5 +1,6 @@ #include #include "libultra_internal.h" +#include "data.h" OSTask *_VirtualToPhysicalTask(OSTask *intp); diff --git a/src/lib/ultra/io/sptaskyielded.c b/src/lib/ultra/io/sptaskyielded.c index 4fe6c56a7..9853cc75d 100644 --- a/src/lib/ultra/io/sptaskyielded.c +++ b/src/lib/ultra/io/sptaskyielded.c @@ -1,4 +1,5 @@ #include "libultra_internal.h" +#include "data.h" OSYieldResult osSpTaskYielded(OSTask *tp) { diff --git a/src/lib/ultra/io/vi.c b/src/lib/ultra/io/vi.c index 8398eedf6..296a5a95d 100644 --- a/src/lib/ultra/io/vi.c +++ b/src/lib/ultra/io/vi.c @@ -1,5 +1,5 @@ #include -#include "game/data/data_000000.h" +#include "data.h" void __osViInit(void) { diff --git a/src/lib/ultra/io/viblack.c b/src/lib/ultra/io/viblack.c index 8f8042ce8..e08b649c6 100644 --- a/src/lib/ultra/io/viblack.c +++ b/src/lib/ultra/io/viblack.c @@ -1,5 +1,5 @@ #include -#include "game/data/data_000000.h" +#include "data.h" void osViBlack(u8 active) { diff --git a/src/lib/ultra/io/vigetcurrcontext.c b/src/lib/ultra/io/vigetcurrcontext.c index e610df98a..c07b1d43a 100644 --- a/src/lib/ultra/io/vigetcurrcontext.c +++ b/src/lib/ultra/io/vigetcurrcontext.c @@ -1,5 +1,5 @@ #include -#include "game/data/data_000000.h" +#include "data.h" __OSViContext *__osViGetCurrentContext(void) { diff --git a/src/lib/ultra/io/vigetcurrframebuf.c b/src/lib/ultra/io/vigetcurrframebuf.c index d993cffae..51386ea5d 100644 --- a/src/lib/ultra/io/vigetcurrframebuf.c +++ b/src/lib/ultra/io/vigetcurrframebuf.c @@ -1,5 +1,5 @@ #include -#include "game/data/data_000000.h" +#include "data.h" void *osViGetCurrentFramebuffer(void) { diff --git a/src/lib/ultra/io/vigetnextframebuf.c b/src/lib/ultra/io/vigetnextframebuf.c index 3c67e3bd3..576c8ebb1 100644 --- a/src/lib/ultra/io/vigetnextframebuf.c +++ b/src/lib/ultra/io/vigetnextframebuf.c @@ -1,5 +1,5 @@ #include -#include "game/data/data_000000.h" +#include "data.h" void *osViGetNextFramebuffer(void) { diff --git a/src/lib/ultra/io/vimgr.c b/src/lib/ultra/io/vimgr.c index 603f2bb11..1a80815f0 100644 --- a/src/lib/ultra/io/vimgr.c +++ b/src/lib/ultra/io/vimgr.c @@ -1,4 +1,5 @@ #include +#include "data.h" GLOBAL_ASM( glabel osCreateViManager diff --git a/src/lib/ultra/io/visetevent.c b/src/lib/ultra/io/visetevent.c index 1572924db..fb6e28d11 100644 --- a/src/lib/ultra/io/visetevent.c +++ b/src/lib/ultra/io/visetevent.c @@ -1,5 +1,5 @@ #include "libultra_internal.h" -#include "game/data/data_000000.h" +#include "data.h" void osViSetEvent(OSMesgQueue *mq, OSMesg m, u32 retraceCount) { diff --git a/src/lib/ultra/io/visetmode.c b/src/lib/ultra/io/visetmode.c index d9d17d31f..a9a69a925 100644 --- a/src/lib/ultra/io/visetmode.c +++ b/src/lib/ultra/io/visetmode.c @@ -1,5 +1,5 @@ #include -#include "game/data/data_000000.h" +#include "data.h" void osViSetMode(OSViMode *modep) { diff --git a/src/lib/ultra/io/visetspecial.c b/src/lib/ultra/io/visetspecial.c index 1d01982ad..8e069a74e 100644 --- a/src/lib/ultra/io/visetspecial.c +++ b/src/lib/ultra/io/visetspecial.c @@ -1,5 +1,5 @@ #include -#include "game/data/data_000000.h" +#include "data.h" void osViSetSpecialFeatures(u32 func) { diff --git a/src/lib/ultra/io/visetxscale.c b/src/lib/ultra/io/visetxscale.c index 04d1be52c..8ec846533 100644 --- a/src/lib/ultra/io/visetxscale.c +++ b/src/lib/ultra/io/visetxscale.c @@ -1,5 +1,5 @@ #include -#include "game/data/data_000000.h" +#include "data.h" void osViSetXScale(f32 value) { diff --git a/src/lib/ultra/io/visetyscale.c b/src/lib/ultra/io/visetyscale.c index f3eb7c5a8..a75773aaf 100644 --- a/src/lib/ultra/io/visetyscale.c +++ b/src/lib/ultra/io/visetyscale.c @@ -1,5 +1,5 @@ #include -#include "game/data/data_000000.h" +#include "data.h" void osViSetYScale(f32 value) { diff --git a/src/lib/ultra/io/viswapbuf.c b/src/lib/ultra/io/viswapbuf.c index 0afebf064..d330b7eef 100644 --- a/src/lib/ultra/io/viswapbuf.c +++ b/src/lib/ultra/io/viswapbuf.c @@ -1,5 +1,5 @@ #include -#include "game/data/data_000000.h" +#include "data.h" void osViSwapBuffer(void *frameBufPtr) { diff --git a/src/lib/ultra/io/viswapcontext.c b/src/lib/ultra/io/viswapcontext.c index 4e3d3ac01..2b212ec20 100644 --- a/src/lib/ultra/io/viswapcontext.c +++ b/src/lib/ultra/io/viswapcontext.c @@ -1,5 +1,5 @@ #include -#include "game/data/data_000000.h" +#include "data.h" void __osViSwapContext() { diff --git a/src/lib/ultra/libc/xlitob.c b/src/lib/ultra/libc/xlitob.c index f7fe7b647..d94279e59 100644 --- a/src/lib/ultra/libc/xlitob.c +++ b/src/lib/ultra/libc/xlitob.c @@ -1,6 +1,6 @@ #include +#include "data.h" #include "lib/libc/ldiv.h" -#include "game/data/data_000000.h" #define BUFF_LEN 0x18 diff --git a/src/lib/ultra/os/createmesgqueue.c b/src/lib/ultra/os/createmesgqueue.c index 175be7fdb..919bd99d6 100644 --- a/src/lib/ultra/os/createmesgqueue.c +++ b/src/lib/ultra/os/createmesgqueue.c @@ -1,5 +1,5 @@ #include -#include "game/data/data_000000.h" +#include "data.h" void osCreateMesgQueue(OSMesgQueue *mq, OSMesg *msg, s32 msgCount) { diff --git a/src/lib/ultra/os/createthread.c b/src/lib/ultra/os/createthread.c index 9b886cfad..953d85a3e 100644 --- a/src/lib/ultra/os/createthread.c +++ b/src/lib/ultra/os/createthread.c @@ -1,5 +1,5 @@ #include -#include "game/data/data_000000.h" +#include "data.h" void __osCleanupThread(void); diff --git a/src/lib/ultra/os/destroythread.c b/src/lib/ultra/os/destroythread.c index f736337c7..9a823dc4d 100644 --- a/src/lib/ultra/os/destroythread.c +++ b/src/lib/ultra/os/destroythread.c @@ -1,5 +1,5 @@ #include -#include "game/data/data_000000.h" +#include "data.h" void osDestroyThread(OSThread *t) { diff --git a/src/lib/ultra/os/exceptasm.c b/src/lib/ultra/os/exceptasm.c index 4abf98371..3452a809d 100644 --- a/src/lib/ultra/os/exceptasm.c +++ b/src/lib/ultra/os/exceptasm.c @@ -1,4 +1,5 @@ #include +#include "data.h" const u32 var70052450[] = {0x00141818}; const u32 var70052454[] = {0x1c1c1c1c}; diff --git a/src/lib/ultra/os/getcause.c b/src/lib/ultra/os/getcause.c index f366dae7c..e1aded0ca 100644 --- a/src/lib/ultra/os/getcause.c +++ b/src/lib/ultra/os/getcause.c @@ -1,4 +1,5 @@ #include +#include "data.h" GLOBAL_ASM( glabel __osGetCause diff --git a/src/lib/ultra/os/getcount.c b/src/lib/ultra/os/getcount.c index 58a9c24b0..5f6baa692 100644 --- a/src/lib/ultra/os/getcount.c +++ b/src/lib/ultra/os/getcount.c @@ -1,4 +1,5 @@ #include +#include "data.h" GLOBAL_ASM( glabel osGetCount diff --git a/src/lib/ultra/os/getcurrfaultthread.c b/src/lib/ultra/os/getcurrfaultthread.c index 53c857b00..f46be6c3b 100644 --- a/src/lib/ultra/os/getcurrfaultthread.c +++ b/src/lib/ultra/os/getcurrfaultthread.c @@ -1,5 +1,5 @@ #include -#include "game/data/data_000000.h" +#include "data.h" OSThread *__osGetCurrFaultedThread() { diff --git a/src/lib/ultra/os/getsr.c b/src/lib/ultra/os/getsr.c index 674162bae..e7ad27cd9 100644 --- a/src/lib/ultra/os/getsr.c +++ b/src/lib/ultra/os/getsr.c @@ -1,4 +1,5 @@ #include +#include "data.h" GLOBAL_ASM( glabel __osGetSR diff --git a/src/lib/ultra/os/gettime.c b/src/lib/ultra/os/gettime.c index 7abda6726..10b96d952 100644 --- a/src/lib/ultra/os/gettime.c +++ b/src/lib/ultra/os/gettime.c @@ -1,5 +1,4 @@ #include -#include "game/data/data_000000.h" #include "gvars/gvars.h" OSTime osGetTime() diff --git a/src/lib/ultra/os/initialize.c b/src/lib/ultra/os/initialize.c index 4ec94a1e5..4a641bded 100644 --- a/src/lib/ultra/os/initialize.c +++ b/src/lib/ultra/os/initialize.c @@ -1,5 +1,5 @@ #include -#include "game/data/data_000000.h" +#include "data.h" #include "gvars/gvars.h" typedef struct { diff --git a/src/lib/ultra/os/interrupt.c b/src/lib/ultra/os/interrupt.c index be033fb77..c4f898235 100644 --- a/src/lib/ultra/os/interrupt.c +++ b/src/lib/ultra/os/interrupt.c @@ -1,4 +1,5 @@ #include +#include "data.h" GLOBAL_ASM( glabel __osDisableInt diff --git a/src/lib/ultra/os/invaldcache.c b/src/lib/ultra/os/invaldcache.c index 64fdb400d..91ab49ab0 100644 --- a/src/lib/ultra/os/invaldcache.c +++ b/src/lib/ultra/os/invaldcache.c @@ -1,4 +1,5 @@ #include +#include "data.h" GLOBAL_ASM( glabel osInvalDCache diff --git a/src/lib/ultra/os/invalicache.c b/src/lib/ultra/os/invalicache.c index 9c8730c0d..c634dd180 100644 --- a/src/lib/ultra/os/invalicache.c +++ b/src/lib/ultra/os/invalicache.c @@ -1,4 +1,5 @@ #include +#include "data.h" GLOBAL_ASM( glabel osInvalICache diff --git a/src/lib/ultra/os/jammesg.c b/src/lib/ultra/os/jammesg.c index f1fe76c40..a08f03489 100644 --- a/src/lib/ultra/os/jammesg.c +++ b/src/lib/ultra/os/jammesg.c @@ -1,5 +1,5 @@ #include -#include "game/data/data_000000.h" +#include "data.h" s32 osJamMesg(OSMesgQueue *mq, OSMesg msg, s32 flag) { diff --git a/src/lib/ultra/os/maptlb.c b/src/lib/ultra/os/maptlb.c index 62e3ba726..9f462a6fa 100644 --- a/src/lib/ultra/os/maptlb.c +++ b/src/lib/ultra/os/maptlb.c @@ -1,4 +1,5 @@ #include +#include "data.h" GLOBAL_ASM( glabel osMapTLB diff --git a/src/lib/ultra/os/probetlb.c b/src/lib/ultra/os/probetlb.c index 1a3252023..e68600340 100644 --- a/src/lib/ultra/os/probetlb.c +++ b/src/lib/ultra/os/probetlb.c @@ -1,4 +1,5 @@ #include +#include "data.h" GLOBAL_ASM( glabel __osProbeTLB diff --git a/src/lib/ultra/os/recvmesg.c b/src/lib/ultra/os/recvmesg.c index b89f194f6..edcf690af 100644 --- a/src/lib/ultra/os/recvmesg.c +++ b/src/lib/ultra/os/recvmesg.c @@ -1,5 +1,5 @@ #include -#include "game/data/data_000000.h" +#include "data.h" s32 osRecvMesg(OSMesgQueue *mq, OSMesg *msg, s32 flags) { diff --git a/src/lib/ultra/os/resetglobalintmask.c b/src/lib/ultra/os/resetglobalintmask.c index f21b0a0fc..b656cc000 100644 --- a/src/lib/ultra/os/resetglobalintmask.c +++ b/src/lib/ultra/os/resetglobalintmask.c @@ -1,5 +1,5 @@ #include -#include "game/data/data_000000.h" +#include "data.h" void __osResetGlobalIntMask(OSHWIntr interrupt) { diff --git a/src/lib/ultra/os/sendmesg.c b/src/lib/ultra/os/sendmesg.c index b2e9b88fa..d98acc728 100644 --- a/src/lib/ultra/os/sendmesg.c +++ b/src/lib/ultra/os/sendmesg.c @@ -1,5 +1,5 @@ #include -#include "game/data/data_000000.h" +#include "data.h" s32 osSendMesg(OSMesgQueue *mq, OSMesg msg, s32 flags) { diff --git a/src/lib/ultra/os/setcompare.c b/src/lib/ultra/os/setcompare.c index 9fd271eba..3297dfa4d 100644 --- a/src/lib/ultra/os/setcompare.c +++ b/src/lib/ultra/os/setcompare.c @@ -1,4 +1,5 @@ #include +#include "data.h" GLOBAL_ASM( glabel __osSetCompare diff --git a/src/lib/ultra/os/seteventmesg.c b/src/lib/ultra/os/seteventmesg.c index 2646f827a..f60313da7 100644 --- a/src/lib/ultra/os/seteventmesg.c +++ b/src/lib/ultra/os/seteventmesg.c @@ -1,5 +1,5 @@ #include -#include "game/data/data_000000.h" +#include "data.h" #include "gvars/gvars.h" void osSetEventMesg(OSEvent event, OSMesgQueue *mq, OSMesg msg) diff --git a/src/lib/ultra/os/setfpccsr.c b/src/lib/ultra/os/setfpccsr.c index fd1550ec0..ddedccfa5 100644 --- a/src/lib/ultra/os/setfpccsr.c +++ b/src/lib/ultra/os/setfpccsr.c @@ -1,4 +1,5 @@ #include +#include "data.h" GLOBAL_ASM( glabel __osSetFpcCsr diff --git a/src/lib/ultra/os/setglobalintmask.c b/src/lib/ultra/os/setglobalintmask.c index b3d290e0a..8e2ec630b 100644 --- a/src/lib/ultra/os/setglobalintmask.c +++ b/src/lib/ultra/os/setglobalintmask.c @@ -1,4 +1,5 @@ #include +#include "data.h" GLOBAL_ASM( glabel __osSetGlobalIntMask diff --git a/src/lib/ultra/os/setintmask.c b/src/lib/ultra/os/setintmask.c index 8563abb2f..b78835306 100644 --- a/src/lib/ultra/os/setintmask.c +++ b/src/lib/ultra/os/setintmask.c @@ -1,4 +1,5 @@ #include +#include "data.h" GLOBAL_ASM( glabel osSetIntMask diff --git a/src/lib/ultra/os/setsr.c b/src/lib/ultra/os/setsr.c index fae9d434f..16abfe8eb 100644 --- a/src/lib/ultra/os/setsr.c +++ b/src/lib/ultra/os/setsr.c @@ -1,4 +1,5 @@ #include +#include "data.h" GLOBAL_ASM( glabel __osSetSR diff --git a/src/lib/ultra/os/setthreadpri.c b/src/lib/ultra/os/setthreadpri.c index 6b2fd3210..4095df3ae 100644 --- a/src/lib/ultra/os/setthreadpri.c +++ b/src/lib/ultra/os/setthreadpri.c @@ -1,5 +1,5 @@ #include -#include "game/data/data_000000.h" +#include "data.h" void osSetThreadPri(OSThread *t, OSPri pri) { diff --git a/src/lib/ultra/os/settimer.c b/src/lib/ultra/os/settimer.c index cf9a92f58..1f0270ba6 100644 --- a/src/lib/ultra/os/settimer.c +++ b/src/lib/ultra/os/settimer.c @@ -1,5 +1,5 @@ #include -#include "game/data/data_000000.h" +#include "data.h" int osSetTimer(OSTimer *t, OSTime value, OSTime interval, OSMesgQueue *mq, OSMesg msg) { diff --git a/src/lib/ultra/os/startthread.c b/src/lib/ultra/os/startthread.c index 37827ef0d..5ab29a67a 100644 --- a/src/lib/ultra/os/startthread.c +++ b/src/lib/ultra/os/startthread.c @@ -1,5 +1,5 @@ #include -#include "game/data/data_000000.h" +#include "data.h" void osStartThread(OSThread *t) { diff --git a/src/lib/ultra/os/stopthread.c b/src/lib/ultra/os/stopthread.c index 2218b1d3a..bd15c7677 100644 --- a/src/lib/ultra/os/stopthread.c +++ b/src/lib/ultra/os/stopthread.c @@ -1,5 +1,5 @@ #include -#include "game/data/data_000000.h" +#include "data.h" void osStopThread(OSThread *t) { diff --git a/src/lib/ultra/os/stoptimer.c b/src/lib/ultra/os/stoptimer.c index f5cc1b3ae..81cc27abd 100644 --- a/src/lib/ultra/os/stoptimer.c +++ b/src/lib/ultra/os/stoptimer.c @@ -1,5 +1,5 @@ #include -#include "game/data/data_000000.h" +#include "data.h" int osStopTimer(OSTimer *t) { diff --git a/src/lib/ultra/os/thread.c b/src/lib/ultra/os/thread.c index a161f5a46..6437d42a7 100644 --- a/src/lib/ultra/os/thread.c +++ b/src/lib/ultra/os/thread.c @@ -1,4 +1,5 @@ #include +#include "data.h" void __osDequeueThread(OSThread **queue, OSThread *t) { diff --git a/src/lib/ultra/os/timerintr.c b/src/lib/ultra/os/timerintr.c index 0b51ea1f9..fedfa885d 100644 --- a/src/lib/ultra/os/timerintr.c +++ b/src/lib/ultra/os/timerintr.c @@ -1,5 +1,5 @@ #include -#include "game/data/data_000000.h" +#include "data.h" #include "gvars/gvars.h" GLOBAL_ASM( diff --git a/src/lib/ultra/os/virtualtophysical.c b/src/lib/ultra/os/virtualtophysical.c index 59510cf42..518ef92ed 100644 --- a/src/lib/ultra/os/virtualtophysical.c +++ b/src/lib/ultra/os/virtualtophysical.c @@ -1,4 +1,5 @@ #include +#include "data.h" u32 osVirtualToPhysical(void *addr) { diff --git a/src/lib/ultra/os/writebackdcache.c b/src/lib/ultra/os/writebackdcache.c index 10738626c..02e681f66 100644 --- a/src/lib/ultra/os/writebackdcache.c +++ b/src/lib/ultra/os/writebackdcache.c @@ -1,4 +1,5 @@ #include +#include "data.h" GLOBAL_ASM( glabel osWritebackDCache diff --git a/src/lib/ultra/os/yieldthread.c b/src/lib/ultra/os/yieldthread.c index 303dc69ba..9e3143a29 100644 --- a/src/lib/ultra/os/yieldthread.c +++ b/src/lib/ultra/os/yieldthread.c @@ -1,5 +1,5 @@ #include -#include "game/data/data_000000.h" +#include "data.h" void osYieldThread(void) {