From 4f391275c1813f75d17e4a0f4e124d50d1b5c818 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Mon, 10 Feb 2020 17:09:03 +1000 Subject: [PATCH] Generate include statements programatically, make declarations consistent with declarations and treat warnings as fatal --- Makefile | 2 +- src/boot/boot.c | 41 ++++++++++++++++++++++-- src/game/cheats.c | 27 ++++++++-------- src/game/chr/chr.c | 27 +++++++++------- src/game/chr/chrai.c | 8 +++-- src/game/chr/chraicommands.c | 48 +++++++++++++++++++++-------- src/game/game_000000.c | 3 +- src/game/game_000090.c | 8 +++-- src/game/game_000130.c | 5 +-- src/game/game_000850.c | 5 +++ src/game/game_000860.c | 5 +++ src/game/game_000870.c | 5 +++ src/game/game_000880.c | 5 +++ src/game/game_0008e0.c | 5 +++ src/game/game_0008f0.c | 5 +++ src/game/game_000900.c | 5 +++ src/game/game_000910.c | 5 +++ src/game/game_000920.c | 13 ++++++-- src/game/game_005fd0.c | 15 +++++++-- src/game/game_00b190.c | 4 ++- src/game/game_00b200.c | 6 ++-- src/game/game_00b820.c | 11 ++++--- src/game/game_00c240.c | 5 +-- src/game/game_00c490.c | 18 +++++++---- src/game/game_0109d0.c | 7 +++-- src/game/game_011110.c | 13 ++++---- src/game/game_012450.c | 7 ++--- src/game/game_0125a0.c | 10 ++++-- src/game/game_013260.c | 6 ++-- src/game/game_013540.c | 12 +++++--- src/game/game_014f10.c | 7 +++-- src/game/game_015010.c | 5 +-- src/game/game_0150a0.c | 4 ++- src/game/game_015260.c | 5 +++ src/game/game_015270.c | 5 +++ src/game/game_015280.c | 5 +-- src/game/game_015400.c | 5 +++ src/game/game_015410.c | 5 +++ src/game/game_015420.c | 2 +- src/game/game_015470.c | 23 ++++++++++++-- src/game/game_01d860.c | 4 +-- src/game/game_01d9f0.c | 7 +++-- src/game/game_0601b0.c | 17 +++++++--- src/game/game_066310.c | 35 ++++++++++++++++----- src/game/game_096750.c | 6 ++-- src/game/game_097890.c | 2 +- src/game/game_097970.c | 2 +- src/game/game_097a50.c | 29 ++++++++++++----- src/game/game_0abe70.c | 11 +++++-- src/game/game_0b0420.c | 12 ++++---- src/game/game_0b2150.c | 5 +-- src/game/game_0b28d0.c | 27 ++++++++++++---- src/game/game_0c3620.c | 3 +- src/game/game_0c37d0.c | 14 ++++++--- src/game/game_0c79f0.c | 18 ++++++++--- src/game/game_0cf150.c | 17 +++++++--- src/game/game_0d1fe0.c | 14 ++++++--- src/game/game_0d4690.c | 17 +++++++--- src/game/game_0dcdb0.c | 17 +++++++--- src/game/game_0f09f0.c | 23 +++++++++++--- src/game/game_102240.c | 15 ++++----- src/game/game_107fb0.c | 19 +++++++----- src/game/game_10ccd0.c | 19 ++++++++---- src/game/game_111600.c | 8 ++--- src/game/game_113220.c | 7 +++-- src/game/game_114240.c | 9 ++++-- src/game/game_1165d0.c | 24 +++++++++++++-- src/game/game_11ecf0.c | 14 ++++++--- src/game/game_128f30.c | 8 +++-- src/game/game_129900.c | 29 ++++++++++++++--- src/game/game_150820.c | 8 +++-- src/game/game_152fa0.c | 12 ++++++-- src/game/game_157db0.c | 21 ++++++++++--- src/game/game_165670.c | 5 +-- src/game/game_1668e0.c | 31 ++++++++++++++++--- src/game/game_16cfa0.c | 8 ++--- src/game/game_16e810.c | 17 ++++++---- src/game/game_175f50.c | 7 +++++ src/game/game_175f90.c | 7 +++-- src/game/game_176000.c | 4 +-- src/game/game_176080.c | 8 +++-- src/game/game_176d70.c | 21 ++++++++----- src/game/game_187770.c | 21 +++++++++---- src/game/game_197600.c | 6 ++-- src/game/game_1999b0.c | 15 ++++++--- src/game/game_19c990.c | 18 ++++++++--- src/game/game_1a3340.c | 14 ++++++--- src/game/game_1a78b0.c | 5 +++ src/game/lang.c | 9 ++---- src/game/pad.c | 12 +++----- src/game/pdoptions.c | 6 ++-- src/include/boot/boot.h | 2 +- src/include/game/game_000090.h | 4 +-- src/include/game/game_000850.h | 2 +- src/include/game/game_000860.h | 2 +- src/include/game/game_014f10.h | 2 +- src/include/game/game_015260.h | 2 +- src/include/game/game_015270.h | 2 +- src/include/game/game_097a50.h | 2 +- src/include/game/game_0b28d0.h | 2 +- src/include/game/game_107fb0.h | 2 +- src/include/game/game_11ecf0.h | 2 +- src/include/game/game_129900.h | 2 +- src/include/game/game_175f90.h | 4 +-- src/include/library/library_04790.h | 2 +- src/include/library/library_0c000.h | 2 +- src/include/library/library_11420.h | 2 +- src/include/library/library_13130.h | 4 +-- src/include/library/library_159b0.h | 2 +- src/include/library/library_481e0.h | 4 +-- src/inflate/inflate.c | 7 +++++ src/library/library_03050.c | 8 ++++- src/library/library_034f0.c | 8 ++++- src/library/library_03ee0.c | 8 ++++- src/library/library_03fb0.c | 8 ++++- src/library/library_04320.c | 8 ++++- src/library/library_04790.c | 9 +++++- src/library/library_04840.c | 8 ++++- src/library/library_04a80.c | 8 ++++- src/library/library_05e40.c | 8 ++++- src/library/library_06100.c | 8 ++++- src/library/library_06330.c | 8 ++++- src/library/library_06440.c | 8 ++++- src/library/library_06550.c | 8 ++++- src/library/library_070d0.c | 8 ++++- src/library/library_074f0.c | 8 ++++- src/library/library_08a20.c | 8 ++++- src/library/library_09660.c | 10 ++++-- src/library/library_0bfb0.c | 8 ++++- src/library/library_0c000.c | 8 ++++- src/library/library_0d0a0.c | 8 ++++- src/library/library_0d520.c | 13 +++++--- src/library/library_0e9d0.c | 8 ++++- src/library/library_11420.c | 8 ++++- src/library/library_121e0.c | 7 ++++- src/library/library_126b0.c | 9 ++++-- src/library/library_12dc0.c | 9 ++++-- src/library/library_13130.c | 8 ++++- src/library/library_13710.c | 6 ++++ src/library/library_13750.c | 5 +++ src/library/library_13790.c | 7 +++++ src/library/library_13820.c | 8 ++++- src/library/library_13900.c | 10 ++++-- src/library/library_15860.c | 6 ++++ src/library/library_159b0.c | 8 ++++- src/library/library_16110.c | 10 ++++-- src/library/library_1a500.c | 8 ++++- src/library/library_233c0.c | 8 ++++- src/library/library_2f490.c | 8 ++++- src/library/library_2fa00.c | 8 ++++- src/library/library_2faf0.c | 6 ++++ src/library/library_2fba0.c | 8 ++++- src/library/library_2fc60.c | 8 ++++- src/library/library_30ce0.c | 8 ++++- src/library/library_317f0.c | 8 ++++- src/library/library_37650.c | 8 ++++- src/library/library_37b00.c | 8 ++++- src/library/library_38d10.c | 6 ++++ src/library/library_38d30.c | 8 ++++- src/library/library_39c80.c | 8 ++++- src/library/library_39f70.c | 8 ++++- src/library/library_39fc0.c | 6 ++++ src/library/library_39fe0.c | 8 ++++- src/library/library_3a100.c | 8 ++++- src/library/library_3c430.c | 8 ++++- src/library/library_3c4d0.c | 8 ++++- src/library/library_3ccf0.c | 8 ++++- src/library/library_3cdc0.c | 8 ++++- src/library/library_3cef0.c | 8 ++++- src/library/library_3d280.c | 8 ++++- src/library/library_3e3e0.c | 8 ++++- src/library/library_3e730.c | 8 ++++- src/library/library_43dd0.c | 8 ++++- src/library/library_446d0.c | 8 ++++- src/library/library_44bc0.c | 8 ++++- src/library/library_44f60.c | 8 ++++- src/library/library_45ed0.c | 8 ++++- src/library/library_461c0.c | 8 ++++- src/library/library_46650.c | 6 ++++ src/library/library_47550.c | 6 ++++ src/library/library_47a90.c | 8 ++++- src/library/library_47d20.c | 6 ++++ src/library/library_48120.c | 6 ++++ src/library/library_48150.c | 6 ++++ src/library/library_481d0.c | 6 ++++ src/library/library_481e0.c | 8 ++++- src/library/library_48520.c | 8 ++++- src/library/library_485e0.c | 8 ++++- src/library/library_48650.c | 8 ++++- src/library/library_48830.c | 8 ++++- src/library/library_488e0.c | 8 ++++- src/library/library_48b20.c | 8 ++++- src/library/library_48c00.c | 8 ++++- src/library/library_48cd0.c | 8 ++++- src/library/library_48dc0.c | 8 ++++- src/library/library_48ef0.c | 8 ++++- src/library/library_48f50.c | 8 ++++- src/library/library_490b0.c | 8 ++++- src/library/library_491b0.c | 8 ++++- src/library/library_49640.c | 8 ++++- src/library/library_49780.c | 8 ++++- src/library/library_49a90.c | 8 ++++- src/library/library_49c20.c | 8 ++++- src/library/library_4a360.c | 8 ++++- src/library/library_4a5e0.c | 6 ++++ src/library/library_4a680.c | 8 ++++- src/library/library_4a810.c | 8 ++++- src/library/library_4a980.c | 8 ++++- src/library/library_4acc0.c | 6 ++++ src/library/library_4ace0.c | 8 ++++- src/library/library_4ad30.c | 8 ++++- src/library/library_4ad80.c | 6 ++++ src/library/library_4ae00.c | 6 ++++ src/library/library_4b160.c | 6 ++++ src/library/library_4b170.c | 6 ++++ src/library/library_4b480.c | 8 ++++- src/library/library_4b500.c | 6 ++++ src/library/library_4b550.c | 8 ++++- src/library/library_4b5e0.c | 8 ++++- src/library/library_4ba90.c | 8 ++++- src/library/library_4c090.c | 8 ++++- src/library/library_4cc10.c | 8 ++++- src/library/library_4cde0.c | 8 ++++- src/library/library_4ce60.c | 8 ++++- src/library/library_4d000.c | 8 ++++- src/library/library_4d480.c | 8 ++++- src/library/library_4d6f0.c | 8 ++++- src/library/library_4e270.c | 6 ++++ src/library/library_4e3c0.c | 8 ++++- src/library/library_4e470.c | 6 ++++ src/library/library_4e530.c | 8 ++++- src/library/library_4e690.c | 8 ++++- src/library/library_4f350.c | 8 ++++- src/library/library_4f400.c | 8 ++++- src/library/library_4f5e0.c | 8 ++++- src/library/library_4fe20.c | 8 ++++- src/library/library_4fff0.c | 8 ++++- src/library/library_50090.c | 8 ++++- src/library/library_50130.c | 10 ++++-- src/library/library_50480.c | 8 ++++- src/library/library_50a00.c | 8 ++++- src/library/library_50f20.c | 8 ++++- src/library/library_513b0.c | 8 ++++- src/library/library_51880.c | 6 ++++ src/library/library_51890.c | 8 ++++- src/library/library_51900.c | 6 ++++ src/library/library_51a60.c | 8 ++++- src/library/library_51c10.c | 8 ++++- src/library/library_51c60.c | 6 ++++ src/library/library_51d50.c | 6 ++++ src/library/library_51ec0.c | 8 ++++- src/library/library_52070.c | 8 ++++- src/library/library_52360.c | 8 ++++- 253 files changed, 1787 insertions(+), 454 deletions(-) diff --git a/Makefile b/Makefile index c8292d4b8..5cc0ee269 100644 --- a/Makefile +++ b/Makefile @@ -43,7 +43,7 @@ ifeq ($(RELEASE),final) RELEASE_CFLAGS := -DBETA=0 -DREL1=0 -DFINAL=1 endif -CFLAGS := $(VERSION_CFLAGS) $(RELEASE_CFLAGS) -DPIRACYCHECKS=1 -Wo,-loopunroll,0 -Wab,-r4300_mul -non_shared -G 0 -Xcpluscomm -woff 649,819,820,821,838,852 -signed -I src/include -mips2 +CFLAGS := $(VERSION_CFLAGS) $(RELEASE_CFLAGS) -DPIRACYCHECKS=1 -Wo,-loopunroll,0 -Wab,-r4300_mul -non_shared -G 0 -Xcpluscomm -woff 649,819,820,821,838,852 -w2 -I src/include -mips2 C_FILES := $(shell find src -name '*.c') O_FILES := $(patsubst %.c, %.o, $(C_FILES)) diff --git a/src/boot/boot.c b/src/boot/boot.c index 2981212e1..40712e932 100644 --- a/src/boot/boot.c +++ b/src/boot/boot.c @@ -1,6 +1,43 @@ #include +#include "boot/boot.h" +#include "constants.h" #include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "game/game_0dcdb0.h" #include "gvars/gvars.h" +#include "library/library_03050.h" +#include "library/library_03ee0.h" +#include "library/library_04a80.h" +#include "library/library_05e40.h" +#include "library/library_074f0.h" +#include "library/library_08a20.h" +#include "library/library_09660.h" +#include "library/library_0c000.h" +#include "library/library_0d520.h" +#include "library/library_0e9d0.h" +#include "library/library_12dc0.h" +#include "library/library_13710.h" +#include "library/library_13750.h" +#include "library/library_13900.h" +#include "library/library_48120.h" +#include "library/library_48150.h" +#include "library/library_481d0.h" +#include "library/library_481e0.h" +#include "library/library_48520.h" +#include "library/library_485e0.h" +#include "library/library_48650.h" +#include "library/library_48830.h" +#include "library/library_488e0.h" +#include "library/library_48b20.h" +#include "library/library_48c00.h" +#include "library/library_48cd0.h" +#include "library/library_48dc0.h" +#include "library/library_48ef0.h" +#include "library/library_48f50.h" +#include "library/library_490b0.h" +#include "types.h" GLOBAL_ASM( glabel func00001000 @@ -827,10 +864,10 @@ void func00001b34(u32 value) var8005ce6c = value; } -void func00001b40(void) +void func00001b40(u32 arg0) { if ((var8005ce68 && var8005ce64) || var8005ce60) { - func0000cf54(); + func0000cf54(arg0); var8005ce70 = func00048510(); } } diff --git a/src/game/cheats.c b/src/game/cheats.c index cd143f9b1..66744a37e 100644 --- a/src/game/cheats.c +++ b/src/game/cheats.c @@ -1,20 +1,20 @@ #include -#include "boot/boot.h" #include "constants.h" -#include "gvars/gvars.h" +#include "game/cheats.h" #include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" -#include "types.h" -#include "game/cheats.h" #include "game/game_10ccd0.h" #include "game/game_111600.h" -#include "game/pad.h" +#include "game/game_1165d0.h" #include "game/game_11ecf0.h" #include "game/game_129900.h" -#include "game/game_16cfa0.h" #include "game/game_19c990.h" #include "game/lang.h" +#include "gvars/gvars.h" +#include "library/library_13130.h" +#include "types.h" u32 cheatIsUnlocked(s32 cheat_id) { @@ -530,9 +530,9 @@ glabel cheatMenuHandleDialog char *cheatGetMarquee(struct menu_item *arg0) { u32 cheat_id; - u8 *ptr; - u8 difficultyname[256]; - u8 cheatname[256]; + char *ptr; + char difficultyname[256]; + char cheatname[256]; if (g_MenuStack[g_MpPlayerNum].unk00 && g_MenuStack[g_MpPlayerNum].unk00->item && g_MenuStack[g_MpPlayerNum].unk00->item->type == MENUITEMTYPE_CHECKBOX) { cheat_id = g_MenuStack[g_MpPlayerNum].unk00->item->param; @@ -553,7 +553,7 @@ char *cheatGetMarquee(struct menu_item *arg0) } // Locked - strcpy(&cheatname, langGet(g_Cheats[cheat_id].nametextid)); + strcpy(cheatname, langGet(g_Cheats[cheat_id].nametextid)); ptr = cheatname; while (*ptr != '\n') { @@ -572,7 +572,7 @@ char *cheatGetMarquee(struct menu_item *arg0) ); } else { // Timed - strcpy(&difficultyname, langGet(0x56fb + g_Cheats[cheat_id].difficulty)); + strcpy(difficultyname, langGet(0x56fb + g_Cheats[cheat_id].difficulty)); ptr = difficultyname; while (*ptr != '\n') { @@ -596,10 +596,11 @@ char *cheatGetMarquee(struct menu_item *arg0) } if (g_Cheats[cheat_id].flags & CHEATFLAG_TRANSFERPAK) { - func00013224(&g_CheatMarqueeString, langGet(0x548d)); // " or insert Game Boy ..." + func00013224(g_CheatMarqueeString, langGet(0x548d)); // " or insert Game Boy ..." } - func00013224(&g_CheatMarqueeString, "\n"); + func00013224(g_CheatMarqueeString, "\n"); + return g_CheatMarqueeString; } diff --git a/src/game/chr/chr.c b/src/game/chr/chr.c index 0e2a4897c..da42a2e4a 100644 --- a/src/game/chr/chr.c +++ b/src/game/chr/chr.c @@ -1,16 +1,15 @@ #include #include "constants.h" -#include "gvars/gvars.h" +#include "game/cheats.h" +#include "game/chr/chr.h" +#include "game/chr/chrai.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" -#include "types.h" #include "game/game_000920.h" #include "game/game_005fd0.h" -#include "game/game_011110.h" #include "game/game_015470.h" -#include "game/chr/chr.h" #include "game/game_0601b0.h" #include "game/game_066310.h" #include "game/game_096750.h" @@ -19,31 +18,37 @@ #include "game/game_0b0420.h" #include "game/game_0b28d0.h" #include "game/game_0c79f0.h" -#include "game/game_0dcdb0.h" -#include "game/cheats.h" -#include "game/game_10ccd0.h" #include "game/game_111600.h" #include "game/game_114240.h" -#include "game/pad.h" +#include "game/game_1165d0.h" #include "game/game_11ecf0.h" #include "game/game_128f30.h" #include "game/game_129900.h" -#include "game/pdoptions.h" #include "game/game_157db0.h" #include "game/game_165670.h" #include "game/game_1668e0.h" -#include "game/game_16cfa0.h" #include "game/game_176d70.h" #include "game/game_187770.h" #include "game/game_197600.h" #include "game/game_1999b0.h" -#include "game/game_19c990.h" #include "game/game_1a3340.h" +#include "game/pad.h" +#include "gvars/gvars.h" +#include "library/library_04790.h" +#include "library/library_04a80.h" +#include "library/library_09660.h" +#include "library/library_0d520.h" +#include "library/library_0e9d0.h" +#include "library/library_121e0.h" #include "library/library_12dc0.h" +#include "library/library_13900.h" +#include "library/library_159b0.h" #include "library/library_16110.h" #include "library/library_1a500.h" #include "library/library_233c0.h" #include "library/library_4a360.h" +#include "library/library_4b480.h" +#include "types.h" const u32 var7f1a8680[] = {0xb8d1b717}; const u32 var7f1a8684[] = {0x00000000}; diff --git a/src/game/chr/chrai.c b/src/game/chr/chrai.c index e64f95fe6..51d92d3dd 100644 --- a/src/game/chr/chrai.c +++ b/src/game/chr/chrai.c @@ -1,15 +1,17 @@ #include #include "constants.h" -#include "gvars/gvars.h" +#include "game/chr/chr.h" +#include "game/chr/chrai.h" #include "game/data/ailists.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" -#include "types.h" -#include "game/chr/chrai.h" +#include "gvars/gvars.h" #include "library/library_12dc0.h" #include "library/library_16110.h" +#include "library/library_1a500.h" +#include "types.h" s32 chraiGetListIdByList(u8 *ailist, bool *is_global) { diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c index 4f678374c..b6ae25253 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -1,28 +1,52 @@ #include #include "constants.h" -#include "gvars/gvars.h" +#include "game/cheats.h" #include "game/chr/chr.h" -#include "game/game_000920.h" -#include "game/game_0601b0.h" -#include "game/game_066310.h" -#include "game/game_096750.h" -#include "game/game_0b28d0.h" -#include "game/game_165670.h" -#include "game/game_16cfa0.h" -#include "game/game_19c990.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_0160b0.h" #include "game/data/data_020df0.h" -#include "types.h" -#include "game/chr/chraicommands.h" +#include "game/game_000920.h" +#include "game/game_011110.h" +#include "game/game_015470.h" +#include "game/game_0601b0.h" +#include "game/game_066310.h" +#include "game/game_096750.h" +#include "game/game_097a50.h" +#include "game/game_0b0420.h" +#include "game/game_0b28d0.h" +#include "game/game_0c79f0.h" +#include "game/game_0dcdb0.h" +#include "game/game_10ccd0.h" +#include "game/game_111600.h" +#include "game/game_11ecf0.h" +#include "game/game_129900.h" +#include "game/game_157db0.h" +#include "game/game_165670.h" +#include "game/game_1668e0.h" +#include "game/game_16cfa0.h" +#include "game/game_19c990.h" #include "game/lang.h" +#include "game/pad.h" +#include "game/pdoptions.h" +#include "gvars/gvars.h" +#include "library/library_04790.h" +#include "library/library_04a80.h" +#include "library/library_0d520.h" #include "library/library_0e9d0.h" +#include "library/library_11420.h" #include "library/library_12dc0.h" +#include "library/library_159b0.h" #include "library/library_16110.h" +#include "library/library_1a500.h" +#include "library/library_233c0.h" #include "library/library_317f0.h" #include "library/library_481e0.h" #include "library/library_48830.h" +#include "library/library_4ae00.h" +#include "types.h" const u32 var7f1a9c30[] = {0x40c907a9}; const u32 var7f1a9c34[] = {0x40c907a9}; @@ -12932,7 +12956,7 @@ bool aiFadeScreen(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u32 color = (cmd[3] << 16) | (cmd[4] << 8) | cmd[5] | (cmd[2] << 24); - u32 num_frames = ((cmd[7] | (cmd[6] << 8)) << 16) >> 16; + s16 num_frames = (cmd[7] | (cmd[6] << 8)); fadeConfigure(color, num_frames); g_Vars.aioffset += 8; diff --git a/src/game/game_000000.c b/src/game/game_000000.c index fb015bee7..999561906 100644 --- a/src/game/game_000000.c +++ b/src/game/game_000000.c @@ -1,10 +1,11 @@ #include #include "constants.h" -#include "gvars/gvars.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" +#include "gvars/gvars.h" +#include "library/library_121e0.h" #include "types.h" GLOBAL_ASM( diff --git a/src/game/game_000090.c b/src/game/game_000090.c index ad3f27aab..98e38d332 100644 --- a/src/game/game_000090.c +++ b/src/game/game_000090.c @@ -1,10 +1,14 @@ #include #include "constants.h" #include "game/chr/chr.h" -#include "game/game_000130.h" -#include "gvars/gvars.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "game/game_000090.h" +#include "game/game_000130.h" +#include "gvars/gvars.h" +#include "library/library_1a500.h" #include "types.h" void func0f000090(void) diff --git a/src/game/game_000130.c b/src/game/game_000130.c index 357a6ace9..c64c88167 100644 --- a/src/game/game_000130.c +++ b/src/game/game_000130.c @@ -1,13 +1,14 @@ #include #include "constants.h" -#include "gvars/gvars.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" -#include "types.h" #include "game/game_000130.h" #include "game/game_097890.h" +#include "gvars/gvars.h" +#include "library/library_233c0.h" +#include "types.h" const u32 var7f1a78c0[] = {0x40c907a9}; const u32 var7f1a78c4[] = {0x38c907a9}; diff --git a/src/game/game_000850.c b/src/game/game_000850.c index f78986f64..2e9aaec12 100644 --- a/src/game/game_000850.c +++ b/src/game/game_000850.c @@ -1,5 +1,10 @@ #include #include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "game/game_000850.h" #include "gvars/gvars.h" #include "types.h" diff --git a/src/game/game_000860.c b/src/game/game_000860.c index 92951e77c..3c03c5282 100644 --- a/src/game/game_000860.c +++ b/src/game/game_000860.c @@ -1,5 +1,10 @@ #include #include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "game/game_000860.h" #include "gvars/gvars.h" #include "types.h" diff --git a/src/game/game_000870.c b/src/game/game_000870.c index e98f8ea2e..d284526f9 100644 --- a/src/game/game_000870.c +++ b/src/game/game_000870.c @@ -1,5 +1,10 @@ #include #include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "game/game_000870.h" #include "gvars/gvars.h" #include "types.h" diff --git a/src/game/game_000880.c b/src/game/game_000880.c index e3d50b43c..d3a575360 100644 --- a/src/game/game_000880.c +++ b/src/game/game_000880.c @@ -1,5 +1,10 @@ #include #include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "game/game_000880.h" #include "gvars/gvars.h" #include "library/library_50090.h" #include "types.h" diff --git a/src/game/game_0008e0.c b/src/game/game_0008e0.c index 0afdd2b86..50909fd64 100644 --- a/src/game/game_0008e0.c +++ b/src/game/game_0008e0.c @@ -1,5 +1,10 @@ #include #include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "game/game_0008e0.h" #include "gvars/gvars.h" #include "types.h" diff --git a/src/game/game_0008f0.c b/src/game/game_0008f0.c index ba2b4dece..c6581e7b6 100644 --- a/src/game/game_0008f0.c +++ b/src/game/game_0008f0.c @@ -1,5 +1,10 @@ #include #include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "game/game_0008f0.h" #include "gvars/gvars.h" #include "types.h" diff --git a/src/game/game_000900.c b/src/game/game_000900.c index 1274bc16c..4ec32fdca 100644 --- a/src/game/game_000900.c +++ b/src/game/game_000900.c @@ -1,5 +1,10 @@ #include #include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "game/game_000900.h" #include "gvars/gvars.h" #include "types.h" diff --git a/src/game/game_000910.c b/src/game/game_000910.c index ad5a34029..869887a91 100644 --- a/src/game/game_000910.c +++ b/src/game/game_000910.c @@ -1,5 +1,10 @@ #include #include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "game/game_000910.h" #include "gvars/gvars.h" #include "types.h" diff --git a/src/game/game_000920.c b/src/game/game_000920.c index 8cf3b66d5..4a7b7c428 100644 --- a/src/game/game_000920.c +++ b/src/game/game_000920.c @@ -1,21 +1,28 @@ #include #include "constants.h" -#include "gvars/gvars.h" +#include "game/cheats.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" -#include "types.h" #include "game/game_000920.h" #include "game/game_066310.h" #include "game/game_0b28d0.h" -#include "game/cheats.h" #include "game/game_129900.h" #include "game/game_157db0.h" #include "game/game_1668e0.h" #include "game/game_176080.h" #include "game/game_176d70.h" +#include "gvars/gvars.h" +#include "library/library_0e9d0.h" +#include "library/library_121e0.h" #include "library/library_12dc0.h" +#include "library/library_16110.h" +#include "library/library_2f490.h" +#include "library/library_317f0.h" +#include "library/library_481e0.h" +#include "library/library_4a360.h" +#include "types.h" const char var7f1a78e0[] = "LIGHTS : Hit occured on light %d in room %d\n"; const char var7f1a7910[] = "L2(%d) -> "; diff --git a/src/game/game_005fd0.c b/src/game/game_005fd0.c index bdbba24df..6617bb8b7 100644 --- a/src/game/game_005fd0.c +++ b/src/game/game_005fd0.c @@ -1,14 +1,12 @@ #include #include "constants.h" -#include "gvars/gvars.h" +#include "game/chr/chr.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" -#include "types.h" #include "game/game_000920.h" #include "game/game_005fd0.h" -#include "game/chr/chr.h" #include "game/game_0601b0.h" #include "game/game_066310.h" #include "game/game_096750.h" @@ -17,7 +15,18 @@ #include "game/game_11ecf0.h" #include "game/game_157db0.h" #include "game/game_1668e0.h" +#include "gvars/gvars.h" +#include "library/library_04790.h" +#include "library/library_09660.h" +#include "library/library_0e9d0.h" #include "library/library_12dc0.h" +#include "library/library_159b0.h" +#include "library/library_16110.h" +#include "library/library_1a500.h" +#include "library/library_317f0.h" +#include "library/library_4a360.h" +#include "library/library_4b480.h" +#include "types.h" const u32 var7f1a7df0[] = {0x7f006060}; const u32 var7f1a7df4[] = {0x7f006060}; diff --git a/src/game/game_00b190.c b/src/game/game_00b190.c index 0106d2ab5..51da2c99a 100644 --- a/src/game/game_00b190.c +++ b/src/game/game_00b190.c @@ -1,10 +1,12 @@ #include #include "constants.h" -#include "gvars/gvars.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" +#include "gvars/gvars.h" +#include "library/library_0d0a0.h" +#include "library/library_121e0.h" #include "types.h" GLOBAL_ASM( diff --git a/src/game/game_00b200.c b/src/game/game_00b200.c index a70a4e98c..f62c7eb1c 100644 --- a/src/game/game_00b200.c +++ b/src/game/game_00b200.c @@ -1,18 +1,18 @@ #include #include "constants.h" -#include "gvars/gvars.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" -#include "types.h" #include "game/game_00b200.h" #include "game/game_00b820.h" #include "game/game_1668e0.h" -#include "game/game_16cfa0.h" #include "game/game_187770.h" #include "game/game_1999b0.h" #include "game/lang.h" +#include "gvars/gvars.h" +#include "library/library_121e0.h" +#include "types.h" GLOBAL_ASM( glabel func0f00b200 diff --git a/src/game/game_00b820.c b/src/game/game_00b820.c index d32597d79..6c416e39b 100644 --- a/src/game/game_00b820.c +++ b/src/game/game_00b820.c @@ -1,16 +1,19 @@ #include #include "constants.h" -#include "gvars/gvars.h" +#include "game/cheats.h" +#include "game/chr/chr.h" +#include "game/chr/chrai.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" -#include "types.h" +#include "game/game_00b820.h" #include "game/game_011110.h" -#include "game/chr/chr.h" #include "game/game_066310.h" -#include "game/cheats.h" +#include "gvars/gvars.h" +#include "library/library_121e0.h" #include "library/library_12dc0.h" +#include "types.h" GLOBAL_ASM( glabel func0f00b820 diff --git a/src/game/game_00c240.c b/src/game/game_00c240.c index 1c6e01651..e5d7bfb0b 100644 --- a/src/game/game_00c240.c +++ b/src/game/game_00c240.c @@ -1,12 +1,13 @@ #include #include "constants.h" -#include "gvars/gvars.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" -#include "types.h" #include "game/game_00c240.h" +#include "gvars/gvars.h" +#include "library/library_121e0.h" +#include "types.h" GLOBAL_ASM( glabel func0f00c240 diff --git a/src/game/game_00c490.c b/src/game/game_00c490.c index 785fd7818..a4a76f29b 100644 --- a/src/game/game_00c490.c +++ b/src/game/game_00c490.c @@ -1,35 +1,41 @@ #include #include "constants.h" -#include "gvars/gvars.h" +#include "game/cheats.h" +#include "game/chr/chr.h" +#include "game/data/ailists.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" -#include "types.h" #include "game/game_00b200.h" #include "game/game_00b820.h" #include "game/game_00c490.h" #include "game/game_0109d0.h" #include "game/game_011110.h" +#include "game/game_012450.h" #include "game/game_0125a0.h" #include "game/game_013540.h" -#include "game/chr/chr.h" #include "game/game_0601b0.h" #include "game/game_066310.h" #include "game/game_096750.h" -#include "game/cheats.h" #include "game/game_111600.h" -#include "game/pad.h" #include "game/game_11ecf0.h" #include "game/game_157db0.h" #include "game/game_1668e0.h" -#include "game/game_16cfa0.h" #include "game/game_176d70.h" #include "game/game_187770.h" #include "game/game_1999b0.h" #include "game/lang.h" +#include "game/pad.h" +#include "gvars/gvars.h" +#include "library/library_121e0.h" #include "library/library_12dc0.h" +#include "library/library_159b0.h" #include "library/library_16110.h" +#include "library/library_1a500.h" +#include "library/library_233c0.h" +#include "library/library_4a360.h" +#include "types.h" const char var7f1a7f60[] = "-nochr"; const char var7f1a7f68[] = "-noprop"; diff --git a/src/game/game_0109d0.c b/src/game/game_0109d0.c index c0a30f0b6..c749ac48e 100644 --- a/src/game/game_0109d0.c +++ b/src/game/game_0109d0.c @@ -1,13 +1,16 @@ #include #include "constants.h" -#include "gvars/gvars.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" -#include "types.h" +#include "game/data/inventory.h" #include "game/game_097a50.h" #include "game/game_157db0.h" +#include "gvars/gvars.h" +#include "library/library_0d520.h" +#include "library/library_121e0.h" +#include "types.h" const u32 var7f1a8230[] = {0x3f666666}; const u32 var7f1a8234[] = {0xc0490fdb}; diff --git a/src/game/game_011110.c b/src/game/game_011110.c index 7af16a597..de877a2d0 100644 --- a/src/game/game_011110.c +++ b/src/game/game_011110.c @@ -1,29 +1,28 @@ #include #include "constants.h" -#include "gvars/gvars.h" -#include "math.h" -#include "game/data/inventory.h" +#include "game/cheats.h" +#include "game/chr/chr.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" -#include "types.h" +#include "game/data/inventory.h" #include "game/game_011110.h" -#include "game/chr/chr.h" #include "game/game_0601b0.h" #include "game/game_066310.h" #include "game/game_097a50.h" #include "game/game_0b28d0.h" #include "game/game_0c79f0.h" -#include "game/cheats.h" #include "game/game_111600.h" -#include "game/pad.h" #include "game/game_157db0.h" #include "game/game_176d70.h" #include "game/game_187770.h" +#include "game/pad.h" +#include "gvars/gvars.h" #include "library/library_121e0.h" #include "library/library_16110.h" #include "library/library_233c0.h" +#include "types.h" const u32 var7f1a8240[] = {0x7f011a44}; const u32 var7f1a8244[] = {0x7f011a90}; diff --git a/src/game/game_012450.c b/src/game/game_012450.c index 8c5fe6bfb..268732c37 100644 --- a/src/game/game_012450.c +++ b/src/game/game_012450.c @@ -1,14 +1,13 @@ #include #include "constants.h" #include "game/cheats.h" -#include "game/chr/chr.h" -#include "game/game_012450.h" -#include "game/game_111600.h" -#include "gvars/gvars.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" +#include "game/game_012450.h" +#include "game/game_111600.h" +#include "gvars/gvars.h" #include "library/library_121e0.h" #include "types.h" diff --git a/src/game/game_0125a0.c b/src/game/game_0125a0.c index 5547b8e3b..27b46e86c 100644 --- a/src/game/game_0125a0.c +++ b/src/game/game_0125a0.c @@ -1,16 +1,20 @@ #include #include "constants.h" -#include "gvars/gvars.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" -#include "types.h" #include "game/game_0125a0.h" #include "game/game_013540.h" #include "game/game_113220.h" -#include "game/pad.h" #include "game/game_157db0.h" +#include "game/pad.h" +#include "gvars/gvars.h" +#include "library/library_121e0.h" +#include "library/library_159b0.h" +#include "library/library_1a500.h" +#include "library/library_233c0.h" +#include "types.h" const u32 var7f1a8280[] = {0x3dccccce}; const u32 var7f1a8284[] = {0x4164924b}; diff --git a/src/game/game_013260.c b/src/game/game_013260.c index 81bbdede6..7b1cda28a 100644 --- a/src/game/game_013260.c +++ b/src/game/game_013260.c @@ -1,12 +1,14 @@ #include #include "constants.h" -#include "gvars/gvars.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" -#include "types.h" +#include "game/game_013260.h" #include "game/game_129900.h" +#include "gvars/gvars.h" +#include "library/library_121e0.h" +#include "types.h" GLOBAL_ASM( glabel func0f013260 diff --git a/src/game/game_013540.c b/src/game/game_013540.c index 7d5c5401f..f81b0eda4 100644 --- a/src/game/game_013540.c +++ b/src/game/game_013540.c @@ -1,21 +1,25 @@ #include #include "constants.h" -#include "gvars/gvars.h" +#include "game/chr/chr.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" -#include "types.h" #include "game/game_013540.h" -#include "game/chr/chr.h" #include "game/game_0601b0.h" -#include "game/pad.h" #include "game/game_157db0.h" #include "game/game_1668e0.h" #include "game/game_187770.h" #include "game/game_197600.h" +#include "game/pad.h" +#include "gvars/gvars.h" +#include "library/library_04790.h" +#include "library/library_121e0.h" #include "library/library_12dc0.h" #include "library/library_16110.h" +#include "library/library_1a500.h" +#include "library/library_233c0.h" +#include "types.h" const u32 var7f1a8290[] = {0x3e99999a}; const u32 var7f1a8294[] = {0x3ecccccd}; diff --git a/src/game/game_014f10.c b/src/game/game_014f10.c index aea28020b..42e9d8967 100644 --- a/src/game/game_014f10.c +++ b/src/game/game_014f10.c @@ -1,14 +1,15 @@ #include #include "constants.h" -#include "gvars/gvars.h" +#include "game/chr/chr.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" -#include "types.h" -#include "game/chr/chr.h" +#include "game/game_014f10.h" #include "game/game_0601b0.h" #include "game/game_066310.h" +#include "gvars/gvars.h" +#include "types.h" GLOBAL_ASM( glabel func0f014f10 diff --git a/src/game/game_015010.c b/src/game/game_015010.c index 4c4c534d5..05b32e31d 100644 --- a/src/game/game_015010.c +++ b/src/game/game_015010.c @@ -1,12 +1,13 @@ #include #include "constants.h" -#include "gvars/gvars.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" -#include "types.h" +#include "game/game_015010.h" #include "game/game_066310.h" +#include "gvars/gvars.h" +#include "types.h" const u32 var7f1a82c0[] = {0x7f01505c}; const u32 var7f1a82c4[] = {0x7f015068}; diff --git a/src/game/game_0150a0.c b/src/game/game_0150a0.c index f49b3a9f9..40383b3ab 100644 --- a/src/game/game_0150a0.c +++ b/src/game/game_0150a0.c @@ -1,10 +1,12 @@ #include #include "constants.h" -#include "gvars/gvars.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" +#include "gvars/gvars.h" +#include "library/library_0e9d0.h" +#include "library/library_317f0.h" #include "types.h" GLOBAL_ASM( diff --git a/src/game/game_015260.c b/src/game/game_015260.c index 1dc5c05a4..c6e07c248 100644 --- a/src/game/game_015260.c +++ b/src/game/game_015260.c @@ -1,5 +1,10 @@ #include #include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "game/game_015260.h" #include "gvars/gvars.h" #include "types.h" diff --git a/src/game/game_015270.c b/src/game/game_015270.c index 6f6681d67..fb426023d 100644 --- a/src/game/game_015270.c +++ b/src/game/game_015270.c @@ -1,5 +1,10 @@ #include #include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "game/game_015270.h" #include "gvars/gvars.h" #include "types.h" diff --git a/src/game/game_015280.c b/src/game/game_015280.c index ea7193422..27de05077 100644 --- a/src/game/game_015280.c +++ b/src/game/game_015280.c @@ -1,12 +1,13 @@ #include #include "constants.h" -#include "gvars/gvars.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" -#include "types.h" #include "game/game_0601b0.h" +#include "gvars/gvars.h" +#include "library/library_09660.h" +#include "types.h" GLOBAL_ASM( glabel func0f015280 diff --git a/src/game/game_015400.c b/src/game/game_015400.c index ea9596a28..3d3e387c3 100644 --- a/src/game/game_015400.c +++ b/src/game/game_015400.c @@ -1,5 +1,10 @@ #include #include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "game/game_015400.h" #include "gvars/gvars.h" #include "types.h" diff --git a/src/game/game_015410.c b/src/game/game_015410.c index d342c8e27..858b7622e 100644 --- a/src/game/game_015410.c +++ b/src/game/game_015410.c @@ -1,5 +1,10 @@ #include #include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "game/game_015410.h" #include "gvars/gvars.h" #include "types.h" diff --git a/src/game/game_015420.c b/src/game/game_015420.c index 43b599b78..450535e52 100644 --- a/src/game/game_015420.c +++ b/src/game/game_015420.c @@ -1,10 +1,10 @@ #include #include "constants.h" -#include "gvars/gvars.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "types.h" /** diff --git a/src/game/game_015470.c b/src/game/game_015470.c index fab9a3185..bc942588a 100644 --- a/src/game/game_015470.c +++ b/src/game/game_015470.c @@ -1,11 +1,9 @@ #include #include "constants.h" -#include "gvars/gvars.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" -#include "types.h" #include "game/game_005fd0.h" #include "game/game_015470.h" #include "game/game_066310.h" @@ -19,7 +17,6 @@ #include "game/game_111600.h" #include "game/game_11ecf0.h" #include "game/game_129900.h" -#include "game/pdoptions.h" #include "game/game_152fa0.h" #include "game/game_1668e0.h" #include "game/game_16cfa0.h" @@ -29,6 +26,26 @@ #include "game/game_19c990.h" #include "game/game_1a3340.h" #include "game/lang.h" +#include "game/pdoptions.h" +#include "gvars/gvars.h" +#include "library/library_03fb0.h" +#include "library/library_04320.h" +#include "library/library_04790.h" +#include "library/library_04840.h" +#include "library/library_04a80.h" +#include "library/library_09660.h" +#include "library/library_0d0a0.h" +#include "library/library_0d520.h" +#include "library/library_0e9d0.h" +#include "library/library_13130.h" +#include "library/library_13900.h" +#include "library/library_159b0.h" +#include "library/library_16110.h" +#include "library/library_1a500.h" +#include "library/library_317f0.h" +#include "library/library_4a5e0.h" +#include "library/library_4b480.h" +#include "types.h" const u32 var7f1a83b0[] = {0x459c4000}; const u32 var7f1a83b4[] = {0x00000000}; diff --git a/src/game/game_01d860.c b/src/game/game_01d860.c index 965545900..6d0a3a9c4 100644 --- a/src/game/game_01d860.c +++ b/src/game/game_01d860.c @@ -1,12 +1,12 @@ #include #include "constants.h" -#include "gvars/gvars.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" -#include "types.h" #include "game/game_1668e0.h" +#include "gvars/gvars.h" +#include "types.h" GLOBAL_ASM( glabel func0f01d860 diff --git a/src/game/game_01d9f0.c b/src/game/game_01d9f0.c index 7fb852134..002e8323b 100644 --- a/src/game/game_01d9f0.c +++ b/src/game/game_01d9f0.c @@ -1,13 +1,16 @@ #include #include "constants.h" -#include "gvars/gvars.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" -#include "types.h" #include "game/game_01d9f0.h" +#include "gvars/gvars.h" +#include "library/library_0e9d0.h" #include "library/library_12dc0.h" +#include "library/library_16110.h" +#include "library/library_317f0.h" +#include "types.h" const u32 var7f1a8660[] = {0x3e8e38e4}; const u32 var7f1a8664[] = {0x3f7ae148}; diff --git a/src/game/game_0601b0.c b/src/game/game_0601b0.c index fa477d5db..d06b0df46 100644 --- a/src/game/game_0601b0.c +++ b/src/game/game_0601b0.c @@ -1,13 +1,11 @@ #include #include "constants.h" -#include "gvars/gvars.h" +#include "game/chr/chr.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" -#include "types.h" #include "game/game_000920.h" -#include "game/chr/chr.h" #include "game/game_0601b0.h" #include "game/game_066310.h" #include "game/game_097890.h" @@ -17,13 +15,24 @@ #include "game/game_0b28d0.h" #include "game/game_0c37d0.h" #include "game/game_0c79f0.h" -#include "game/pad.h" #include "game/game_11ecf0.h" #include "game/game_129900.h" #include "game/game_157db0.h" #include "game/game_187770.h" #include "game/game_19c990.h" +#include "game/pad.h" +#include "gvars/gvars.h" +#include "library/library_0e9d0.h" #include "library/library_12dc0.h" +#include "library/library_159b0.h" +#include "library/library_16110.h" +#include "library/library_1a500.h" +#include "library/library_233c0.h" +#include "library/library_317f0.h" +#include "library/library_481e0.h" +#include "library/library_48830.h" +#include "library/library_4a360.h" +#include "types.h" const u32 var7f1a9e20[] = {0x7f0607b4}; const u32 var7f1a9e24[] = {0x7f060754}; diff --git a/src/game/game_066310.c b/src/game/game_066310.c index 5b5b6a4ec..91d97e9a3 100644 --- a/src/game/game_066310.c +++ b/src/game/game_066310.c @@ -1,15 +1,16 @@ #include #include "constants.h" -#include "gvars/gvars.h" +#include "game/cheats.h" +#include "game/chr/chr.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_0160b0.h" #include "game/data/data_020df0.h" -#include "types.h" #include "game/game_000920.h" #include "game/game_005fd0.h" #include "game/game_011110.h" -#include "game/chr/chr.h" #include "game/game_0601b0.h" #include "game/game_066310.h" #include "game/game_096750.h" @@ -23,28 +24,46 @@ #include "game/game_0c79f0.h" #include "game/game_0dcdb0.h" #include "game/game_0f09f0.h" -#include "game/cheats.h" #include "game/game_111600.h" -#include "game/pad.h" #include "game/game_11ecf0.h" #include "game/game_128f30.h" #include "game/game_129900.h" #include "game/game_150820.h" -#include "game/pdoptions.h" #include "game/game_152fa0.h" #include "game/game_157db0.h" #include "game/game_165670.h" #include "game/game_1668e0.h" -#include "game/game_16cfa0.h" -#include "game/lang.h" #include "game/game_176d70.h" #include "game/game_187770.h" #include "game/game_1999b0.h" #include "game/game_19c990.h" #include "game/game_1a3340.h" +#include "game/lang.h" +#include "game/pad.h" +#include "game/pdoptions.h" +#include "gvars/gvars.h" +#include "library/library_04790.h" +#include "library/library_04a80.h" +#include "library/library_09660.h" +#include "library/library_0d0a0.h" +#include "library/library_0d520.h" +#include "library/library_0e9d0.h" +#include "library/library_121e0.h" #include "library/library_12dc0.h" +#include "library/library_13130.h" +#include "library/library_159b0.h" +#include "library/library_16110.h" +#include "library/library_1a500.h" #include "library/library_233c0.h" +#include "library/library_317f0.h" +#include "library/library_481e0.h" +#include "library/library_48830.h" +#include "library/library_49a90.h" #include "library/library_4a360.h" +#include "library/library_4a5e0.h" +#include "library/library_4b480.h" +#include "library/library_4e270.h" +#include "types.h" const char var7f1aa1c0[] = "propobj.c"; diff --git a/src/game/game_096750.c b/src/game/game_096750.c index bf23fb59a..6587e92fc 100644 --- a/src/game/game_096750.c +++ b/src/game/game_096750.c @@ -1,12 +1,14 @@ #include #include "constants.h" -#include "gvars/gvars.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" -#include "types.h" #include "game/game_096750.h" +#include "gvars/gvars.h" +#include "library/library_16110.h" +#include "library/library_4a360.h" +#include "types.h" const u32 var7f1ab830[] = {0x40490fdb}; const u32 var7f1ab834[] = {0x3fc90fdb}; diff --git a/src/game/game_097890.c b/src/game/game_097890.c index faefbd137..eb4304830 100644 --- a/src/game/game_097890.c +++ b/src/game/game_097890.c @@ -1,10 +1,10 @@ #include #include "constants.h" -#include "gvars/gvars.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "types.h" GLOBAL_ASM( diff --git a/src/game/game_097970.c b/src/game/game_097970.c index 23e61bbe0..1605fd0b7 100644 --- a/src/game/game_097970.c +++ b/src/game/game_097970.c @@ -1,10 +1,10 @@ #include #include "constants.h" -#include "gvars/gvars.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "types.h" GLOBAL_ASM( diff --git a/src/game/game_097a50.c b/src/game/game_097a50.c index 27c18d840..7c2c222b6 100644 --- a/src/game/game_097a50.c +++ b/src/game/game_097a50.c @@ -1,13 +1,12 @@ #include #include "constants.h" -#include "gvars/gvars.h" +#include "game/cheats.h" +#include "game/chr/chr.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" -#include "types.h" #include "game/game_005fd0.h" -#include "game/chr/chr.h" #include "game/game_0601b0.h" #include "game/game_066310.h" #include "game/game_096750.h" @@ -17,21 +16,37 @@ #include "game/game_0b28d0.h" #include "game/game_0c79f0.h" #include "game/game_0d4690.h" -#include "game/cheats.h" #include "game/game_111600.h" -#include "game/pad.h" +#include "game/game_1165d0.h" #include "game/game_11ecf0.h" #include "game/game_129900.h" -#include "game/pdoptions.h" #include "game/game_152fa0.h" #include "game/game_1668e0.h" -#include "game/game_16cfa0.h" +#include "game/game_16e810.h" #include "game/game_176080.h" #include "game/game_187770.h" #include "game/game_19c990.h" #include "game/game_1a3340.h" #include "game/lang.h" +#include "game/pdoptions.h" +#include "gvars/gvars.h" +#include "library/library_04790.h" +#include "library/library_04a80.h" +#include "library/library_09660.h" +#include "library/library_0d520.h" +#include "library/library_0e9d0.h" #include "library/library_12dc0.h" +#include "library/library_13130.h" +#include "library/library_13900.h" +#include "library/library_159b0.h" +#include "library/library_16110.h" +#include "library/library_1a500.h" +#include "library/library_233c0.h" +#include "library/library_317f0.h" +#include "library/library_481e0.h" +#include "library/library_48830.h" +#include "library/library_4a360.h" +#include "types.h" const char var7f1ab890[] = "rontime"; const char var7f1ab898[] = "rofftime"; diff --git a/src/game/game_0abe70.c b/src/game/game_0abe70.c index 98ae6059d..898b06fe1 100644 --- a/src/game/game_0abe70.c +++ b/src/game/game_0abe70.c @@ -1,18 +1,25 @@ #include #include "constants.h" -#include "gvars/gvars.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" -#include "types.h" #include "game/game_096750.h" #include "game/game_097a50.h" #include "game/game_0abe70.h" #include "game/game_0b0420.h" #include "game/game_0b28d0.h" #include "game/game_1668e0.h" +#include "gvars/gvars.h" +#include "library/library_04790.h" +#include "library/library_0d520.h" #include "library/library_12dc0.h" +#include "library/library_159b0.h" +#include "library/library_16110.h" +#include "library/library_1a500.h" +#include "library/library_4a360.h" +#include "library/library_4b480.h" +#include "types.h" const u32 var7f1acc10[] = {0x73703100}; const u32 var7f1acc14[] = {0x73703200}; diff --git a/src/game/game_0b0420.c b/src/game/game_0b0420.c index d19d79a62..eb3decc62 100644 --- a/src/game/game_0b0420.c +++ b/src/game/game_0b0420.c @@ -1,24 +1,24 @@ #include #include "constants.h" -#include "gvars/gvars.h" -#include "game/data/inventory.h" +#include "game/cheats.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" -#include "types.h" +#include "game/data/inventory.h" #include "game/game_097a50.h" #include "game/game_0b0420.h" #include "game/game_0b28d0.h" #include "game/game_0dcdb0.h" -#include "game/cheats.h" #include "game/game_11ecf0.h" -#include "game/pdoptions.h" -#include "game/game_16cfa0.h" #include "game/game_176d70.h" #include "game/game_187770.h" #include "game/game_197600.h" #include "game/lang.h" +#include "game/pdoptions.h" +#include "gvars/gvars.h" +#include "library/library_13130.h" +#include "types.h" const u32 var7f1acdd0[] = {0x3dcccccd}; const u32 var7f1acdd4[] = {0x3dcccccd}; diff --git a/src/game/game_0b2150.c b/src/game/game_0b2150.c index fa65a4e57..069b216d7 100644 --- a/src/game/game_0b2150.c +++ b/src/game/game_0b2150.c @@ -1,12 +1,13 @@ #include #include "constants.h" -#include "gvars/gvars.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" -#include "types.h" #include "game/game_0b2150.h" +#include "gvars/gvars.h" +#include "library/library_09660.h" +#include "types.h" GLOBAL_ASM( glabel func0f0b2150 diff --git a/src/game/game_0b28d0.c b/src/game/game_0b28d0.c index 763ce9cf8..bed9e478e 100644 --- a/src/game/game_0b28d0.c +++ b/src/game/game_0b28d0.c @@ -1,14 +1,13 @@ #include #include "constants.h" -#include "gvars/gvars.h" +#include "game/cheats.h" +#include "game/chr/chr.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" -#include "types.h" #include "game/game_005fd0.h" #include "game/game_015470.h" -#include "game/chr/chr.h" #include "game/game_0601b0.h" #include "game/game_066310.h" #include "game/game_096750.h" @@ -23,24 +22,40 @@ #include "game/game_0dcdb0.h" #include "game/game_0f09f0.h" #include "game/game_102240.h" -#include "game/cheats.h" #include "game/game_107fb0.h" #include "game/game_111600.h" -#include "game/pad.h" +#include "game/game_1165d0.h" #include "game/game_11ecf0.h" #include "game/game_129900.h" -#include "game/pdoptions.h" #include "game/game_152fa0.h" #include "game/game_157db0.h" #include "game/game_165670.h" #include "game/game_1668e0.h" #include "game/game_16cfa0.h" +#include "game/game_16e810.h" #include "game/game_176d70.h" #include "game/game_187770.h" #include "game/game_19c990.h" #include "game/game_1a3340.h" +#include "game/pad.h" +#include "game/pdoptions.h" +#include "gvars/gvars.h" +#include "library/library_04320.h" +#include "library/library_04840.h" +#include "library/library_09660.h" +#include "library/library_0d520.h" +#include "library/library_0e9d0.h" +#include "library/library_121e0.h" #include "library/library_12dc0.h" +#include "library/library_13900.h" +#include "library/library_159b0.h" #include "library/library_16110.h" +#include "library/library_1a500.h" +#include "library/library_233c0.h" +#include "library/library_317f0.h" +#include "library/library_4a360.h" +#include "library/library_4b480.h" +#include "types.h" const u32 var7f1ad140[] = {0x42e52ee0}; const u32 var7f1ad144[] = {0x3c0efa35}; diff --git a/src/game/game_0c3620.c b/src/game/game_0c3620.c index 6d077923c..9b6da9a48 100644 --- a/src/game/game_0c3620.c +++ b/src/game/game_0c3620.c @@ -1,10 +1,11 @@ #include #include "constants.h" -#include "gvars/gvars.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" +#include "gvars/gvars.h" +#include "library/library_317f0.h" #include "types.h" GLOBAL_ASM( diff --git a/src/game/game_0c37d0.c b/src/game/game_0c37d0.c index 15e582c04..0d6317cca 100644 --- a/src/game/game_0c37d0.c +++ b/src/game/game_0c37d0.c @@ -1,24 +1,30 @@ #include #include "constants.h" -#include "gvars/gvars.h" +#include "game/cheats.h" +#include "game/chr/chr.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" -#include "types.h" #include "game/game_005fd0.h" -#include "game/chr/chr.h" #include "game/game_0601b0.h" #include "game/game_066310.h" #include "game/game_097a50.h" #include "game/game_0b28d0.h" #include "game/game_0c37d0.h" #include "game/game_0c79f0.h" -#include "game/cheats.h" #include "game/game_111600.h" #include "game/game_113220.h" #include "game/game_11ecf0.h" +#include "gvars/gvars.h" +#include "library/library_04790.h" +#include "library/library_0e9d0.h" #include "library/library_12dc0.h" +#include "library/library_16110.h" +#include "library/library_1a500.h" +#include "library/library_233c0.h" +#include "library/library_4a360.h" +#include "types.h" const u32 var7f1ad780[] = {0xb8d1b717}; const u32 var7f1ad784[] = {0x3dcccccd}; diff --git a/src/game/game_0c79f0.c b/src/game/game_0c79f0.c index aa64c7ffc..fd157ea54 100644 --- a/src/game/game_0c79f0.c +++ b/src/game/game_0c79f0.c @@ -1,13 +1,12 @@ #include #include "constants.h" -#include "gvars/gvars.h" +#include "game/cheats.h" +#include "game/chr/chr.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" -#include "types.h" #include "game/game_005fd0.h" -#include "game/chr/chr.h" #include "game/game_0601b0.h" #include "game/game_066310.h" #include "game/game_096750.h" @@ -19,15 +18,24 @@ #include "game/game_0c79f0.h" #include "game/game_0d1fe0.h" #include "game/game_0f09f0.h" -#include "game/cheats.h" #include "game/game_113220.h" #include "game/game_11ecf0.h" -#include "game/pdoptions.h" #include "game/game_157db0.h" #include "game/game_1668e0.h" #include "game/game_176d70.h" #include "game/game_187770.h" +#include "game/pdoptions.h" +#include "gvars/gvars.h" +#include "library/library_04790.h" +#include "library/library_09660.h" +#include "library/library_0e9d0.h" #include "library/library_12dc0.h" +#include "library/library_13900.h" +#include "library/library_159b0.h" +#include "library/library_16110.h" +#include "library/library_233c0.h" +#include "library/library_4a360.h" +#include "types.h" const char var7f1ad860[] = "bondmove.c"; diff --git a/src/game/game_0cf150.c b/src/game/game_0cf150.c index 71bdc25f3..c49099a3f 100644 --- a/src/game/game_0cf150.c +++ b/src/game/game_0cf150.c @@ -1,12 +1,10 @@ #include #include "constants.h" -#include "gvars/gvars.h" +#include "game/chr/chr.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" -#include "types.h" -#include "game/chr/chr.h" #include "game/game_0601b0.h" #include "game/game_066310.h" #include "game/game_097a50.h" @@ -15,10 +13,19 @@ #include "game/game_0dcdb0.h" #include "game/game_111600.h" #include "game/game_11ecf0.h" -#include "game/pdoptions.h" #include "game/game_157db0.h" -#include "game/game_16cfa0.h" #include "game/lang.h" +#include "game/pdoptions.h" +#include "gvars/gvars.h" +#include "library/library_04790.h" +#include "library/library_0d520.h" +#include "library/library_0e9d0.h" +#include "library/library_13130.h" +#include "library/library_13900.h" +#include "library/library_16110.h" +#include "library/library_233c0.h" +#include "library/library_4a360.h" +#include "types.h" const u32 var7f1ada80[] = {0xc6ea6000}; const u32 var7f1ada84[] = {0x3dcccccd}; diff --git a/src/game/game_0d1fe0.c b/src/game/game_0d1fe0.c index 5768a58db..39a4f6e22 100644 --- a/src/game/game_0d1fe0.c +++ b/src/game/game_0d1fe0.c @@ -1,12 +1,10 @@ #include #include "constants.h" -#include "gvars/gvars.h" +#include "game/chr/chr.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" -#include "types.h" -#include "game/chr/chr.h" #include "game/game_0601b0.h" #include "game/game_066310.h" #include "game/game_096750.h" @@ -15,8 +13,16 @@ #include "game/game_0c79f0.h" #include "game/game_0d1fe0.h" #include "game/game_113220.h" -#include "game/pdoptions.h" #include "game/game_1668e0.h" +#include "game/pdoptions.h" +#include "gvars/gvars.h" +#include "library/library_04790.h" +#include "library/library_13900.h" +#include "library/library_159b0.h" +#include "library/library_16110.h" +#include "library/library_233c0.h" +#include "library/library_4a360.h" +#include "types.h" const char var7f1adb10[] = "bondbike.c"; const char var7f1adb1c[] = "bondbike.c"; diff --git a/src/game/game_0d4690.c b/src/game/game_0d4690.c index c21c78272..e6c35d913 100644 --- a/src/game/game_0d4690.c +++ b/src/game/game_0d4690.c @@ -1,24 +1,31 @@ #include #include "constants.h" -#include "gvars/gvars.h" +#include "game/chr/chr.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" -#include "types.h" -#include "game/chr/chr.h" #include "game/game_066310.h" #include "game/game_097a50.h" #include "game/game_0b0420.h" #include "game/game_0b2150.h" #include "game/game_0b28d0.h" #include "game/game_0d4690.h" -#include "game/pdoptions.h" #include "game/game_152fa0.h" #include "game/game_1668e0.h" -#include "game/game_16cfa0.h" #include "game/game_176d70.h" #include "game/lang.h" +#include "game/pdoptions.h" +#include "gvars/gvars.h" +#include "library/library_09660.h" +#include "library/library_0d520.h" +#include "library/library_0e9d0.h" +#include "library/library_13130.h" +#include "library/library_159b0.h" +#include "library/library_16110.h" +#include "library/library_4b480.h" +#include "library/library_4fe20.h" +#include "types.h" const u32 var7f1adba0[] = {0x74786d75}; const u32 var7f1adba4[] = {0x6c000000}; diff --git a/src/game/game_0dcdb0.c b/src/game/game_0dcdb0.c index 420e67d83..d5ce5c211 100644 --- a/src/game/game_0dcdb0.c +++ b/src/game/game_0dcdb0.c @@ -1,11 +1,9 @@ #include #include "constants.h" -#include "gvars/gvars.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" -#include "types.h" #include "game/game_005fd0.h" #include "game/game_066310.h" #include "game/game_097a50.h" @@ -16,16 +14,27 @@ #include "game/game_0f09f0.h" #include "game/game_11ecf0.h" #include "game/game_129900.h" -#include "game/pdoptions.h" #include "game/game_152fa0.h" #include "game/game_1668e0.h" -#include "game/game_16cfa0.h" #include "game/game_176d70.h" #include "game/game_187770.h" #include "game/game_1999b0.h" #include "game/game_19c990.h" #include "game/lang.h" +#include "game/pdoptions.h" +#include "gvars/gvars.h" +#include "library/library_09660.h" +#include "library/library_0d520.h" +#include "library/library_0e9d0.h" +#include "library/library_121e0.h" #include "library/library_12dc0.h" +#include "library/library_13130.h" +#include "library/library_159b0.h" +#include "library/library_16110.h" +#include "library/library_4a360.h" +#include "library/library_4a5e0.h" +#include "library/library_4b480.h" +#include "types.h" const char var7f1ade80[] = "%s%s%4.2fX"; const char var7f1ade8c[] = ""; diff --git a/src/game/game_0f09f0.c b/src/game/game_0f09f0.c index 91c3b139a..38b827532 100644 --- a/src/game/game_0f09f0.c +++ b/src/game/game_0f09f0.c @@ -1,13 +1,11 @@ #include #include "constants.h" -#include "gvars/gvars.h" +#include "game/chr/chr.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" -#include "types.h" #include "game/game_005fd0.h" -#include "game/chr/chr.h" #include "game/game_066310.h" #include "game/game_096750.h" #include "game/game_097a50.h" @@ -19,12 +17,12 @@ #include "game/game_107fb0.h" #include "game/game_10ccd0.h" #include "game/game_111600.h" -#include "game/pad.h" +#include "game/game_1165d0.h" #include "game/game_129900.h" -#include "game/pdoptions.h" #include "game/game_152fa0.h" #include "game/game_1668e0.h" #include "game/game_16cfa0.h" +#include "game/game_16e810.h" #include "game/game_176d70.h" #include "game/game_187770.h" #include "game/game_197600.h" @@ -32,8 +30,23 @@ #include "game/game_19c990.h" #include "game/game_1a3340.h" #include "game/lang.h" +#include "game/pdoptions.h" +#include "gvars/gvars.h" +#include "library/library_09660.h" +#include "library/library_0d520.h" +#include "library/library_0e9d0.h" +#include "library/library_121e0.h" #include "library/library_12dc0.h" +#include "library/library_13130.h" +#include "library/library_13900.h" +#include "library/library_159b0.h" #include "library/library_16110.h" +#include "library/library_1a500.h" +#include "library/library_317f0.h" +#include "library/library_481e0.h" +#include "library/library_48830.h" +#include "library/library_4b480.h" +#include "types.h" const u32 var7f1b2120[] = {0xffffff00}; const u32 var7f1b2124[] = {0xffffff00}; diff --git a/src/game/game_102240.c b/src/game/game_102240.c index 3099f6f6e..6da5257ba 100644 --- a/src/game/game_102240.c +++ b/src/game/game_102240.c @@ -1,14 +1,9 @@ #include #include "constants.h" -#include "gvars/gvars.h" -#include "library/library_09660.h" -#include "library/library_0d520.h" -#include "library/library_0e9d0.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" -#include "types.h" #include "game/game_00c490.h" #include "game/game_015470.h" #include "game/game_066310.h" @@ -20,14 +15,20 @@ #include "game/game_107fb0.h" #include "game/game_10ccd0.h" #include "game/game_111600.h" -#include "game/pdoptions.h" #include "game/game_152fa0.h" #include "game/game_1668e0.h" -#include "game/game_16cfa0.h" #include "game/game_187770.h" #include "game/game_1999b0.h" #include "game/game_19c990.h" #include "game/lang.h" +#include "game/pdoptions.h" +#include "gvars/gvars.h" +#include "library/library_09660.h" +#include "library/library_0d520.h" +#include "library/library_0e9d0.h" +#include "library/library_13130.h" +#include "library/library_13900.h" +#include "types.h" const char var7f1b2cf0[] = "%s\n"; const char var7f1b2cf4[] = "%s: %s\n"; diff --git a/src/game/game_107fb0.c b/src/game/game_107fb0.c index b4abcb72e..b2c8c570c 100644 --- a/src/game/game_107fb0.c +++ b/src/game/game_107fb0.c @@ -1,23 +1,26 @@ #include #include "constants.h" -#include "gvars/gvars.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" -#include "types.h" #include "game/game_0b28d0.h" #include "game/game_0d4690.h" #include "game/game_0f09f0.h" #include "game/game_107fb0.h" #include "game/game_10ccd0.h" -#include "game/pad.h" +#include "game/game_1165d0.h" #include "game/game_152fa0.h" -#include "game/game_16cfa0.h" #include "game/game_176d70.h" #include "game/game_187770.h" #include "game/game_1999b0.h" #include "game/lang.h" +#include "gvars/gvars.h" +#include "library/library_09660.h" +#include "library/library_126b0.h" +#include "library/library_13130.h" +#include "library/library_13900.h" +#include "types.h" const char var7f1b2f00[] = "%s-"; const char var7f1b2f04[] = "==:=="; @@ -4453,9 +4456,9 @@ s32 menuhandlerOpenDeleteFile(u32 operation, struct menu_item *item, s32 *value) return 0; } -s32 menuhandlerAgentName(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerAgentName(u32 operation, struct menu_item *item, char **value) { - s32 val = *value; + char *ptr = *value; if (!g_SaveLocations[0]) { return 0; @@ -4463,10 +4466,10 @@ s32 menuhandlerAgentName(u32 operation, struct menu_item *item, s32 *value) switch (operation) { case MENUOP_GETTEXT: - strcpy(val, &g_SoloSaveFile.name); + strcpy(ptr, g_SoloSaveFile.name); break; case MENUOP_SETTEXT: - strcpy(&g_SoloSaveFile.name, val); + strcpy(g_SoloSaveFile.name, ptr); break; case MENUOP_SET: func0f10a51c(0, 0); diff --git a/src/game/game_10ccd0.c b/src/game/game_10ccd0.c index f81a2e379..2c9bb6500 100644 --- a/src/game/game_10ccd0.c +++ b/src/game/game_10ccd0.c @@ -1,11 +1,10 @@ #include #include "constants.h" -#include "gvars/gvars.h" +#include "game/cheats.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" -#include "types.h" #include "game/game_005fd0.h" #include "game/game_015470.h" #include "game/game_066310.h" @@ -16,20 +15,28 @@ #include "game/game_0dcdb0.h" #include "game/game_0f09f0.h" #include "game/game_102240.h" -#include "game/cheats.h" #include "game/game_107fb0.h" #include "game/game_10ccd0.h" -#include "game/pad.h" +#include "game/game_1165d0.h" #include "game/game_129900.h" -#include "game/pdoptions.h" #include "game/game_157db0.h" #include "game/game_1668e0.h" -#include "game/game_16cfa0.h" #include "game/game_176d70.h" #include "game/game_187770.h" #include "game/game_1999b0.h" #include "game/game_19c990.h" #include "game/lang.h" +#include "game/pdoptions.h" +#include "gvars/gvars.h" +#include "library/library_09660.h" +#include "library/library_0bfb0.h" +#include "library/library_0d520.h" +#include "library/library_0e9d0.h" +#include "library/library_126b0.h" +#include "library/library_13130.h" +#include "library/library_13900.h" +#include "library/library_4b170.h" +#include "types.h" const char var7f1b3860[] = "%s: %s\n"; const char var7f1b3868[] = "%s: %s\n"; diff --git a/src/game/game_111600.c b/src/game/game_111600.c index bb272c23a..a2cfed6b2 100644 --- a/src/game/game_111600.c +++ b/src/game/game_111600.c @@ -1,18 +1,18 @@ #include #include "constants.h" -#include "gvars/gvars.h" +#include "game/cheats.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" -#include "types.h" #include "game/game_097a50.h" #include "game/game_0b0420.h" -#include "game/cheats.h" #include "game/game_111600.h" -#include "game/game_16cfa0.h" #include "game/game_19c990.h" #include "game/lang.h" +#include "gvars/gvars.h" +#include "library/library_0d520.h" +#include "types.h" void currentPlayerClearInventory(void) { diff --git a/src/game/game_113220.c b/src/game/game_113220.c index a11ca7d4b..27c01a5c4 100644 --- a/src/game/game_113220.c +++ b/src/game/game_113220.c @@ -1,15 +1,18 @@ #include #include "constants.h" -#include "gvars/gvars.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" -#include "types.h" #include "game/game_096750.h" #include "game/game_0c79f0.h" #include "game/game_113220.h" +#include "gvars/gvars.h" #include "library/library_12dc0.h" +#include "library/library_159b0.h" +#include "library/library_1a500.h" +#include "library/library_233c0.h" +#include "types.h" const u32 var7f1b3a20[] = {0x3ca3d70a}; const u32 var7f1b3a24[] = {0x3ca3d70a}; diff --git a/src/game/game_114240.c b/src/game/game_114240.c index 5bd631ebf..f805cddc4 100644 --- a/src/game/game_114240.c +++ b/src/game/game_114240.c @@ -1,16 +1,19 @@ #include #include "constants.h" -#include "gvars/gvars.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" -#include "types.h" #include "game/game_0601b0.h" #include "game/game_114240.h" -#include "game/pad.h" #include "game/game_157db0.h" +#include "game/pad.h" +#include "gvars/gvars.h" #include "library/library_12dc0.h" +#include "library/library_233c0.h" +#include "library/library_4a360.h" +#include "library/library_4ae00.h" +#include "types.h" const char var7f1b3a80[] = "padhalllv.c"; diff --git a/src/game/game_1165d0.c b/src/game/game_1165d0.c index e4ba8fe28..d5e7d6f23 100644 --- a/src/game/game_1165d0.c +++ b/src/game/game_1165d0.c @@ -1,18 +1,38 @@ #include #include "constants.h" -#include "gvars/gvars.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" -#include "types.h" #include "game/game_0f09f0.h" #include "game/game_10ccd0.h" #include "game/game_1165d0.h" #include "game/game_128f30.h" #include "game/game_129900.h" #include "game/game_176d70.h" +#include "gvars/gvars.h" +#include "library/library_06100.h" +#include "library/library_06330.h" +#include "library/library_06440.h" +#include "library/library_06550.h" +#include "library/library_0d520.h" +#include "library/library_121e0.h" #include "library/library_12dc0.h" +#include "library/library_13130.h" +#include "library/library_13900.h" +#include "library/library_481e0.h" +#include "library/library_4a5e0.h" +#include "library/library_4cc10.h" +#include "library/library_4ce60.h" +#include "library/library_4d000.h" +#include "library/library_4d480.h" +#include "library/library_4d6f0.h" +#include "library/library_4f5e0.h" +#include "library/library_50130.h" +#include "library/library_50480.h" +#include "library/library_50a00.h" +#include "library/library_513b0.h" +#include "types.h" const u32 var7f1b3a90[] = {0x002a2a2a}; const u32 var7f1b3a94[] = {0x2a2a2a2a}; diff --git a/src/game/game_11ecf0.c b/src/game/game_11ecf0.c index f9cb76ec9..da648d544 100644 --- a/src/game/game_11ecf0.c +++ b/src/game/game_11ecf0.c @@ -1,22 +1,28 @@ #include #include "constants.h" -#include "gvars/gvars.h" +#include "game/cheats.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" -#include "types.h" #include "game/game_066310.h" #include "game/game_096750.h" #include "game/game_097a50.h" #include "game/game_0b2150.h" #include "game/game_0b28d0.h" -#include "game/cheats.h" -#include "game/pad.h" #include "game/game_11ecf0.h" #include "game/game_152fa0.h" #include "game/game_165670.h" +#include "game/pad.h" +#include "gvars/gvars.h" +#include "library/library_09660.h" +#include "library/library_121e0.h" #include "library/library_12dc0.h" +#include "library/library_159b0.h" +#include "library/library_16110.h" +#include "library/library_4a360.h" +#include "library/library_50090.h" +#include "types.h" const u32 var7f1b4fe0[] = {0x38d1b717}; const u32 var7f1b4fe4[] = {0x3c23d70a}; diff --git a/src/game/game_128f30.c b/src/game/game_128f30.c index eabb7ee06..3dcfae02c 100644 --- a/src/game/game_128f30.c +++ b/src/game/game_128f30.c @@ -1,15 +1,17 @@ #include #include "constants.h" -#include "gvars/gvars.h" +#include "game/chr/chr.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" -#include "types.h" -#include "game/chr/chr.h" #include "game/game_066310.h" #include "game/game_128f30.h" +#include "gvars/gvars.h" +#include "library/library_126b0.h" #include "library/library_12dc0.h" +#include "library/library_1a500.h" +#include "types.h" GLOBAL_ASM( glabel func0f128f30 diff --git a/src/game/game_129900.c b/src/game/game_129900.c index b79e82abf..2e4685e6b 100644 --- a/src/game/game_129900.c +++ b/src/game/game_129900.c @@ -1,15 +1,13 @@ #include #include "constants.h" -#include "gvars/gvars.h" +#include "game/chr/chr.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" -#include "types.h" #include "game/game_000920.h" #include "game/game_005fd0.h" #include "game/game_015470.h" -#include "game/chr/chr.h" #include "game/game_0601b0.h" #include "game/game_066310.h" #include "game/game_096750.h" @@ -19,10 +17,9 @@ #include "game/game_0d4690.h" #include "game/game_0dcdb0.h" #include "game/game_0f09f0.h" -#include "game/pad.h" +#include "game/game_1165d0.h" #include "game/game_11ecf0.h" #include "game/game_129900.h" -#include "game/pdoptions.h" #include "game/game_152fa0.h" #include "game/game_157db0.h" #include "game/game_165670.h" @@ -31,7 +28,29 @@ #include "game/game_176d70.h" #include "game/game_187770.h" #include "game/lang.h" +#include "game/pdoptions.h" +#include "gvars/gvars.h" +#include "library/library_04790.h" +#include "library/library_04a80.h" +#include "library/library_09660.h" +#include "library/library_0d520.h" +#include "library/library_0e9d0.h" +#include "library/library_121e0.h" +#include "library/library_126b0.h" #include "library/library_12dc0.h" +#include "library/library_13130.h" +#include "library/library_13900.h" +#include "library/library_159b0.h" +#include "library/library_16110.h" +#include "library/library_1a500.h" +#include "library/library_233c0.h" +#include "library/library_317f0.h" +#include "library/library_481e0.h" +#include "library/library_4a360.h" +#include "library/library_4a5e0.h" +#include "library/library_4ae00.h" +#include "library/library_4b480.h" +#include "types.h" const char var7f1b5570[] = "ecol"; diff --git a/src/game/game_150820.c b/src/game/game_150820.c index 3eb3e7bc2..3b122faf2 100644 --- a/src/game/game_150820.c +++ b/src/game/game_150820.c @@ -1,18 +1,22 @@ #include #include "constants.h" -#include "gvars/gvars.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" -#include "types.h" #include "game/game_000920.h" #include "game/game_066310.h" #include "game/game_096750.h" #include "game/game_0b28d0.h" #include "game/game_150820.h" #include "game/game_1668e0.h" +#include "gvars/gvars.h" #include "library/library_12dc0.h" +#include "library/library_159b0.h" +#include "library/library_16110.h" +#include "library/library_4a360.h" +#include "library/library_4b480.h" +#include "types.h" const u32 var7f1b7370[] = {0x3dcccccd}; const u32 var7f1b7374[] = {0x3f333333}; diff --git a/src/game/game_152fa0.c b/src/game/game_152fa0.c index 693dd6d90..58af75e3c 100644 --- a/src/game/game_152fa0.c +++ b/src/game/game_152fa0.c @@ -1,16 +1,22 @@ #include #include "constants.h" -#include "gvars/gvars.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" -#include "types.h" #include "game/game_005fd0.h" #include "game/game_0d4690.h" #include "game/game_152fa0.h" #include "game/game_1668e0.h" -#include "game/game_16cfa0.h" +#include "game/lang.h" +#include "gvars/gvars.h" +#include "library/library_09660.h" +#include "library/library_0d0a0.h" +#include "library/library_0d520.h" +#include "library/library_121e0.h" +#include "library/library_4a360.h" +#include "library/library_4b480.h" +#include "types.h" const u32 var7f1b73a0[] = {0x46ffffcd}; const u32 var7f1b73a4[] = {0xc6ffffcd}; diff --git a/src/game/game_157db0.c b/src/game/game_157db0.c index 2d0084ff9..76e0cbf23 100644 --- a/src/game/game_157db0.c +++ b/src/game/game_157db0.c @@ -1,14 +1,12 @@ #include #include "constants.h" -#include "gvars/gvars.h" +#include "game/chr/chr.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" -#include "types.h" #include "game/game_000920.h" #include "game/game_013540.h" -#include "game/chr/chr.h" #include "game/game_0601b0.h" #include "game/game_097970.h" #include "game/game_097a50.h" @@ -19,8 +17,23 @@ #include "game/game_157db0.h" #include "game/game_165670.h" #include "game/game_1668e0.h" -#include "game/game_16cfa0.h" +#include "game/game_16e810.h" +#include "gvars/gvars.h" +#include "library/library_074f0.h" +#include "library/library_09660.h" +#include "library/library_0d0a0.h" +#include "library/library_0d520.h" +#include "library/library_121e0.h" +#include "library/library_126b0.h" #include "library/library_12dc0.h" +#include "library/library_159b0.h" +#include "library/library_16110.h" +#include "library/library_2f490.h" +#include "library/library_4a360.h" +#include "library/library_4b170.h" +#include "library/library_4b480.h" +#include "library/library_4e530.h" +#include "types.h" const char var7f1b7420[] = "Checking Convex Room %d"; const char var7f1b7438[] = " Portal %d %s%s%.1f < %.1f"; diff --git a/src/game/game_165670.c b/src/game/game_165670.c index 91485b9b2..2efa0af6c 100644 --- a/src/game/game_165670.c +++ b/src/game/game_165670.c @@ -1,14 +1,15 @@ #include #include "constants.h" -#include "gvars/gvars.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" -#include "types.h" #include "game/game_0b28d0.h" #include "game/game_157db0.h" #include "game/game_165670.h" +#include "gvars/gvars.h" +#include "library/library_09660.h" +#include "types.h" const u32 var7f1b76e0[] = {0x3a83126f}; const u32 var7f1b76e4[] = {0x3a83126f}; diff --git a/src/game/game_1668e0.c b/src/game/game_1668e0.c index d6ab39bca..8449a541a 100644 --- a/src/game/game_1668e0.c +++ b/src/game/game_1668e0.c @@ -1,11 +1,11 @@ #include #include "constants.h" -#include "gvars/gvars.h" +#include "game/cheats.h" +#include "game/chr/chr.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" -#include "types.h" #include "game/game_000920.h" #include "game/game_005fd0.h" #include "game/game_00b200.h" @@ -14,6 +14,7 @@ #include "game/game_00c490.h" #include "game/game_0109d0.h" #include "game/game_011110.h" +#include "game/game_012450.h" #include "game/game_0125a0.h" #include "game/game_013260.h" #include "game/game_013540.h" @@ -21,13 +22,14 @@ #include "game/game_015010.h" #include "game/game_0150a0.h" #include "game/game_015260.h" +#include "game/game_015270.h" #include "game/game_015280.h" #include "game/game_015400.h" +#include "game/game_015410.h" #include "game/game_015420.h" #include "game/game_015470.h" #include "game/game_01d860.h" #include "game/game_01d9f0.h" -#include "game/chr/chr.h" #include "game/game_0601b0.h" #include "game/game_066310.h" #include "game/game_097a50.h" @@ -38,9 +40,8 @@ #include "game/game_0d4690.h" #include "game/game_0dcdb0.h" #include "game/game_0f09f0.h" -#include "game/cheats.h" #include "game/game_107fb0.h" -#include "game/pad.h" +#include "game/game_1165d0.h" #include "game/game_11ecf0.h" #include "game/game_128f30.h" #include "game/game_129900.h" @@ -50,6 +51,7 @@ #include "game/game_165670.h" #include "game/game_1668e0.h" #include "game/game_16cfa0.h" +#include "game/game_16e810.h" #include "game/game_175f50.h" #include "game/game_176080.h" #include "game/game_176d70.h" @@ -57,7 +59,26 @@ #include "game/game_1999b0.h" #include "game/game_19c990.h" #include "game/lang.h" +#include "gvars/gvars.h" +#include "library/library_06440.h" +#include "library/library_074f0.h" +#include "library/library_09660.h" +#include "library/library_0d0a0.h" +#include "library/library_0d520.h" +#include "library/library_0e9d0.h" +#include "library/library_11420.h" +#include "library/library_121e0.h" #include "library/library_12dc0.h" +#include "library/library_13130.h" +#include "library/library_13900.h" +#include "library/library_159b0.h" +#include "library/library_16110.h" +#include "library/library_233c0.h" +#include "library/library_317f0.h" +#include "library/library_481e0.h" +#include "library/library_4a360.h" +#include "library/library_4e530.h" +#include "types.h" const char var7f1b76f0[] = "-mgfx"; const char var7f1b76f8[] = "-mgfx"; diff --git a/src/game/game_16cfa0.c b/src/game/game_16cfa0.c index 54e3867f0..126502ad4 100644 --- a/src/game/game_16cfa0.c +++ b/src/game/game_16cfa0.c @@ -1,17 +1,17 @@ #include #include "constants.h" -#include "gvars/gvars.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" -#include "types.h" -#include "game/game_0b28d0.h" #include "game/game_0f09f0.h" -#include "game/game_129900.h" #include "game/game_1668e0.h" #include "game/game_16cfa0.h" #include "game/game_176080.h" +#include "gvars/gvars.h" +#include "library/library_0e9d0.h" +#include "library/library_11420.h" +#include "types.h" GLOBAL_ASM( glabel func0f16cfa0 diff --git a/src/game/game_16e810.c b/src/game/game_16e810.c index b4b5bf535..80c8ea40c 100644 --- a/src/game/game_16e810.c +++ b/src/game/game_16e810.c @@ -1,17 +1,22 @@ #include #include "constants.h" -#include "gvars/gvars.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" -#include "types.h" #include "game/game_0b28d0.h" -#include "game/game_0f09f0.h" #include "game/game_129900.h" -#include "game/game_1668e0.h" -#include "game/game_16cfa0.h" -#include "game/game_176080.h" +#include "game/game_16e810.h" +#include "gvars/gvars.h" +#include "library/library_074f0.h" +#include "library/library_0d0a0.h" +#include "library/library_0d520.h" +#include "library/library_121e0.h" +#include "library/library_48120.h" +#include "library/library_4b170.h" +#include "library/library_4b480.h" +#include "library/library_4e470.h" +#include "types.h" const u32 var7f1b7a50[] = {0x7f17004c}; const u32 var7f1b7a54[] = {0x7f17004c}; diff --git a/src/game/game_175f50.c b/src/game/game_175f50.c index ac0ed9c72..c02d5584d 100644 --- a/src/game/game_175f50.c +++ b/src/game/game_175f50.c @@ -1,4 +1,11 @@ #include +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "game/game_175f50.h" +#include "gvars/gvars.h" #include "types.h" void func0f175f50(void) diff --git a/src/game/game_175f90.c b/src/game/game_175f90.c index 53cb61f22..7df173caa 100644 --- a/src/game/game_175f90.c +++ b/src/game/game_175f90.c @@ -1,13 +1,14 @@ #include #include "constants.h" -#include "gvars/gvars.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" -#include "types.h" #include "game/game_1668e0.h" -#include "game/game_175f50.h" +#include "game/game_175f90.h" +#include "gvars/gvars.h" +#include "library/library_121e0.h" +#include "types.h" void func0f175f90(void) { diff --git a/src/game/game_176000.c b/src/game/game_176000.c index 0dc3d00ab..dfd60044c 100644 --- a/src/game/game_176000.c +++ b/src/game/game_176000.c @@ -1,13 +1,11 @@ #include #include "constants.h" -#include "gvars/gvars.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "types.h" -#include "game/game_1668e0.h" -#include "game/game_175f50.h" s32 func0f176000(s32 arg0) { diff --git a/src/game/game_176080.c b/src/game/game_176080.c index efa7d42cb..a595c7408 100644 --- a/src/game/game_176080.c +++ b/src/game/game_176080.c @@ -1,15 +1,17 @@ #include #include "constants.h" -#include "gvars/gvars.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" -#include "types.h" #include "game/game_0b28d0.h" -#include "game/pdoptions.h" #include "game/game_176080.h" #include "game/game_187770.h" +#include "game/pdoptions.h" +#include "gvars/gvars.h" +#include "library/library_09660.h" +#include "library/library_121e0.h" +#include "types.h" GLOBAL_ASM( glabel func0f176080 diff --git a/src/game/game_176d70.c b/src/game/game_176d70.c index 428411cd1..7ca33926a 100644 --- a/src/game/game_176d70.c +++ b/src/game/game_176d70.c @@ -1,16 +1,14 @@ #include #include "constants.h" -#include "gvars/gvars.h" +#include "game/chr/chr.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" -#include "types.h" #include "game/game_000920.h" #include "game/game_005fd0.h" #include "game/game_00c490.h" #include "game/game_015470.h" -#include "game/chr/chr.h" #include "game/game_0601b0.h" #include "game/game_066310.h" #include "game/game_096750.h" @@ -22,10 +20,8 @@ #include "game/game_0f09f0.h" #include "game/game_107fb0.h" #include "game/game_111600.h" -#include "game/pad.h" #include "game/game_11ecf0.h" #include "game/game_129900.h" -#include "game/pdoptions.h" #include "game/game_152fa0.h" #include "game/game_1668e0.h" #include "game/game_16cfa0.h" @@ -34,9 +30,20 @@ #include "game/game_197600.h" #include "game/game_1999b0.h" #include "game/lang.h" +#include "game/pad.h" +#include "game/pdoptions.h" +#include "gvars/gvars.h" +#include "library/library_09660.h" +#include "library/library_0d520.h" #include "library/library_0e9d0.h" +#include "library/library_121e0.h" #include "library/library_12dc0.h" +#include "library/library_13130.h" +#include "library/library_159b0.h" +#include "library/library_16110.h" #include "library/library_233c0.h" +#include "library/library_4a360.h" +#include "types.h" const char var7f1b7cb0[] = "UM_Make : In\n"; const char var7f1b7cc0[] = "UM_Make : Out\n"; @@ -3411,10 +3418,10 @@ s32 menuhandlerMpPlayerName(u32 operation, struct menu_item *item, char **value) switch (operation) { case MENUOP_GETTEXT: - strcpy(ptr, &g_MpSetup.namebuffer); + strcpy(ptr, g_MpSetup.namebuffer); break; case MENUOP_SETTEXT: - strcpy(&g_MpSetup.namebuffer, ptr); + strcpy(g_MpSetup.namebuffer, ptr); break; case MENUOP_SET: func0f10a51c(7, 1); diff --git a/src/game/game_187770.c b/src/game/game_187770.c index 7225216f7..d82d46a2d 100644 --- a/src/game/game_187770.c +++ b/src/game/game_187770.c @@ -1,13 +1,12 @@ #include #include "constants.h" -#include "gvars/gvars.h" +#include "game/cheats.h" +#include "game/chr/chr.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" -#include "types.h" #include "game/game_015470.h" -#include "game/chr/chr.h" #include "game/game_0601b0.h" #include "game/game_066310.h" #include "game/game_096750.h" @@ -17,12 +16,10 @@ #include "game/game_0b28d0.h" #include "game/game_0d4690.h" #include "game/game_0f09f0.h" -#include "game/cheats.h" #include "game/game_114240.h" -#include "game/pad.h" +#include "game/game_1165d0.h" #include "game/game_11ecf0.h" #include "game/game_129900.h" -#include "game/pdoptions.h" #include "game/game_152fa0.h" #include "game/game_157db0.h" #include "game/game_1668e0.h" @@ -32,7 +29,19 @@ #include "game/game_197600.h" #include "game/game_1999b0.h" #include "game/lang.h" +#include "game/pad.h" +#include "game/pdoptions.h" +#include "gvars/gvars.h" +#include "library/library_09660.h" +#include "library/library_0d520.h" #include "library/library_12dc0.h" +#include "library/library_13130.h" +#include "library/library_16110.h" +#include "library/library_1a500.h" +#include "library/library_233c0.h" +#include "library/library_317f0.h" +#include "library/library_4a360.h" +#include "types.h" const char var7f1b8a00[] = "||||||||||||| Starting game... players %d\n"; const char var7f1b8a2c[] = "%s %d\n"; diff --git a/src/game/game_197600.c b/src/game/game_197600.c index 8c536c283..3aba49324 100644 --- a/src/game/game_197600.c +++ b/src/game/game_197600.c @@ -1,12 +1,10 @@ #include #include "constants.h" -#include "gvars/gvars.h" +#include "game/chr/chr.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" -#include "types.h" -#include "game/chr/chr.h" #include "game/game_066310.h" #include "game/game_097970.h" #include "game/game_0b0420.h" @@ -16,7 +14,9 @@ #include "game/game_187770.h" #include "game/game_197600.h" #include "game/game_1999b0.h" +#include "gvars/gvars.h" #include "library/library_12dc0.h" +#include "types.h" const u32 var7f1b8fd0[] = {0x48742400}; const u32 var7f1b8fd4[] = {0x3eb33333}; diff --git a/src/game/game_1999b0.c b/src/game/game_1999b0.c index 6f442538a..74b14e0c2 100644 --- a/src/game/game_1999b0.c +++ b/src/game/game_1999b0.c @@ -1,27 +1,32 @@ #include #include "constants.h" -#include "gvars/gvars.h" +#include "game/chr/chr.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_0160b0.h" #include "game/data/data_020df0.h" -#include "types.h" -#include "game/chr/chr.h" #include "game/game_0601b0.h" #include "game/game_066310.h" #include "game/game_096750.h" #include "game/game_097a50.h" #include "game/game_0b0420.h" #include "game/game_114240.h" -#include "game/pad.h" #include "game/game_11ecf0.h" -#include "game/game_16cfa0.h" #include "game/game_176d70.h" #include "game/game_187770.h" #include "game/game_1999b0.h" #include "game/game_19c990.h" #include "game/lang.h" +#include "game/pad.h" +#include "gvars/gvars.h" +#include "library/library_0d0a0.h" #include "library/library_12dc0.h" +#include "library/library_159b0.h" +#include "library/library_16110.h" +#include "library/library_233c0.h" +#include "types.h" const u32 var7f1b90a0[] = {0x3d4ccccd}; const u32 var7f1b90a4[] = {0x7f19a2c0}; diff --git a/src/game/game_19c990.c b/src/game/game_19c990.c index 86c62905a..6f94cd8ba 100644 --- a/src/game/game_19c990.c +++ b/src/game/game_19c990.c @@ -1,13 +1,11 @@ #include #include "constants.h" -#include "gvars/gvars.h" +#include "game/chr/chr.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" -#include "types.h" #include "game/game_000920.h" -#include "game/chr/chr.h" #include "game/game_0601b0.h" #include "game/game_066310.h" #include "game/game_096750.h" @@ -20,16 +18,26 @@ #include "game/game_10ccd0.h" #include "game/game_111600.h" #include "game/game_114240.h" -#include "game/pad.h" #include "game/game_129900.h" #include "game/game_150820.h" #include "game/game_152fa0.h" #include "game/game_157db0.h" -#include "game/game_16cfa0.h" #include "game/game_19c990.h" #include "game/game_1a3340.h" #include "game/lang.h" +#include "game/pad.h" +#include "gvars/gvars.h" +#include "library/library_09660.h" +#include "library/library_0d0a0.h" +#include "library/library_0d520.h" +#include "library/library_0e9d0.h" +#include "library/library_121e0.h" #include "library/library_12dc0.h" +#include "library/library_13130.h" +#include "library/library_159b0.h" +#include "library/library_16110.h" +#include "library/library_4a360.h" +#include "types.h" const u32 var7f1b9210[] = {0x7f19caa8}; const u32 var7f1b9214[] = {0x7f19caa8}; diff --git a/src/game/game_1a3340.c b/src/game/game_1a3340.c index cf35e1e97..ad0d18d86 100644 --- a/src/game/game_1a3340.c +++ b/src/game/game_1a3340.c @@ -1,12 +1,10 @@ #include #include "constants.h" -#include "gvars/gvars.h" +#include "game/chr/chr.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" -#include "types.h" -#include "game/chr/chr.h" #include "game/game_097970.h" #include "game/game_097a50.h" #include "game/game_0b0420.h" @@ -15,14 +13,20 @@ #include "game/game_0f09f0.h" #include "game/game_102240.h" #include "game/game_111600.h" -#include "game/pdoptions.h" #include "game/game_152fa0.h" #include "game/game_1668e0.h" -#include "game/game_16cfa0.h" +#include "game/game_16e810.h" #include "game/game_187770.h" #include "game/game_19c990.h" #include "game/game_1a3340.h" #include "game/lang.h" +#include "game/pdoptions.h" +#include "gvars/gvars.h" +#include "library/library_09660.h" +#include "library/library_0d520.h" +#include "library/library_13130.h" +#include "library/library_1a500.h" +#include "types.h" const char var7f1b97d0[] = "\n"; const char var7f1b97d4[] = "\n"; diff --git a/src/game/game_1a78b0.c b/src/game/game_1a78b0.c index 1604e68f2..d71e4d44c 100644 --- a/src/game/game_1a78b0.c +++ b/src/game/game_1a78b0.c @@ -1,5 +1,10 @@ #include #include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "game/game_1a78b0.h" #include "gvars/gvars.h" #include "types.h" diff --git a/src/game/lang.c b/src/game/lang.c index 96fc0589e..a34b166b6 100644 --- a/src/game/lang.c +++ b/src/game/lang.c @@ -1,17 +1,14 @@ #include #include "constants.h" -#include "gvars/gvars.h" #include "game/data/data_000000.h" #include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" -#include "types.h" -#include "game/game_0b28d0.h" -#include "game/game_0f09f0.h" -#include "game/game_129900.h" #include "game/game_1668e0.h" -#include "game/game_176080.h" #include "game/lang.h" +#include "gvars/gvars.h" +#include "library/library_0d0a0.h" +#include "types.h" u32 langGetLangBankIndexFromStagenum(s32 stagenum) { diff --git a/src/game/pad.c b/src/game/pad.c index ab7957d0b..5ef966b5b 100644 --- a/src/game/pad.c +++ b/src/game/pad.c @@ -1,17 +1,13 @@ #include #include "constants.h" -#include "gvars/gvars.h" #include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" -#include "types.h" -#include "game/game_0f09f0.h" -#include "game/game_10ccd0.h" #include "game/pad.h" -#include "game/game_128f30.h" -#include "game/game_129900.h" -#include "game/game_176d70.h" -#include "library/library_12dc0.h" +#include "gvars/gvars.h" +#include "library/library_4a360.h" +#include "types.h" GLOBAL_ASM( glabel padUnpack diff --git a/src/game/pdoptions.c b/src/game/pdoptions.c index 6c3318599..c73cf1532 100644 --- a/src/game/pdoptions.c +++ b/src/game/pdoptions.c @@ -1,11 +1,13 @@ #include #include "constants.h" -#include "gvars/gvars.h" #include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" -#include "types.h" #include "game/game_16cfa0.h" +#include "game/pdoptions.h" +#include "gvars/gvars.h" +#include "types.h" s32 optionsGetControlMode(s32 mpchrnum) { diff --git a/src/include/boot/boot.h b/src/include/boot/boot.h index 89cf60666..f87d07a5a 100644 --- a/src/include/boot/boot.h +++ b/src/include/boot/boot.h @@ -7,7 +7,7 @@ s32 func0000113c(void); s32 func00001180(void); s32 func000016c0(void); s32 func000018ac(void); -s32 func00001b28(void); +void func00001b28(u32 arg0); s32 func00001e30(void); s32 func00001fa8(void); s32 func00002148(void); diff --git a/src/include/game/game_000090.h b/src/include/game/game_000090.h index 772a20f34..0746b6cd7 100644 --- a/src/include/game/game_000090.h +++ b/src/include/game/game_000090.h @@ -3,7 +3,7 @@ #include #include "types.h" -u32 func0f000090(void); -u32 func0f000100(void); +void func0f000090(void); +void func0f000100(void); #endif diff --git a/src/include/game/game_000850.h b/src/include/game/game_000850.h index 79a0c2722..a38d1bf5e 100644 --- a/src/include/game/game_000850.h +++ b/src/include/game/game_000850.h @@ -3,6 +3,6 @@ #include #include "types.h" -u32 func0f000850(void); +void func0f000850(void); #endif diff --git a/src/include/game/game_000860.h b/src/include/game/game_000860.h index e588fc6d9..0f9f9a631 100644 --- a/src/include/game/game_000860.h +++ b/src/include/game/game_000860.h @@ -3,6 +3,6 @@ #include #include "types.h" -u32 func0f000860(void); +void func0f000860(void); #endif diff --git a/src/include/game/game_014f10.h b/src/include/game/game_014f10.h index ec04d37b4..345881d8e 100644 --- a/src/include/game/game_014f10.h +++ b/src/include/game/game_014f10.h @@ -4,6 +4,6 @@ #include "types.h" u32 func0f014f10(void); -u32 func0f014fe0(void); +void func0f014fe0(void); #endif diff --git a/src/include/game/game_015260.h b/src/include/game/game_015260.h index a8261e547..342f167c0 100644 --- a/src/include/game/game_015260.h +++ b/src/include/game/game_015260.h @@ -3,6 +3,6 @@ #include #include "types.h" -u32 func0f015260(void); +void func0f015260(void); #endif diff --git a/src/include/game/game_015270.h b/src/include/game/game_015270.h index eaa2ea36a..220d18e9e 100644 --- a/src/include/game/game_015270.h +++ b/src/include/game/game_015270.h @@ -3,6 +3,6 @@ #include #include "types.h" -u32 func0f015270(void); +void func0f015270(void); #endif diff --git a/src/include/game/game_097a50.h b/src/include/game/game_097a50.h index fbc98b6d9..1bf6a2317 100644 --- a/src/include/game/game_097a50.h +++ b/src/include/game/game_097a50.h @@ -160,7 +160,7 @@ u32 func0f0a94d0(void); void func0f0a95ec(u32 arg0, u32 arg1); void currentPlayerGiveAmmo(s32 ammotype, s32 quantity); u32 func0f0a9770(void); -u32 currentPlayerGetAmmoCount(s8 arg0); +s32 currentPlayerGetAmmoCount(s8 arg0); u32 func0f0a98f4(void); u32 func0f0a9910(void); u32 func0f0a9980(void); diff --git a/src/include/game/game_0b28d0.h b/src/include/game/game_0b28d0.h index acae3aaed..00301bdcf 100644 --- a/src/include/game/game_0b28d0.h +++ b/src/include/game/game_0b28d0.h @@ -43,7 +43,7 @@ u32 func0f0b5008(void); u32 func0f0b5018(void); u32 func0f0b5050(void); u32 func0f0b53a4(void); -u32 func0f0b56f8(void); +struct coord *func0f0b56f8(void); u32 func0f0b5708(void); u32 func0f0b5718(void); u32 func0f0b5758(void); diff --git a/src/include/game/game_107fb0.h b/src/include/game/game_107fb0.h index bcbf80385..cb214e72f 100644 --- a/src/include/game/game_107fb0.h +++ b/src/include/game/game_107fb0.h @@ -73,7 +73,7 @@ s32 menuhandlerDeleteFiles(u32 operation, struct menu_item *item, s32 *value); s32 menuhandlerPakConfirmDelete(u32 operation, struct menu_item *item, s32 *value); s32 menuhandler0010b14c(u32, u32, u32 *); s32 menuhandlerPakSelection(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandlerAgentName(u32 operation, struct menu_item *item, s32 *value); +s32 menuhandlerAgentName(u32 operation, struct menu_item *item, char **value); s32 menuhandler0010ca1c(u32 operation, struct menu_item *item, s32 *value); s32 menuhandler0010cabc(u32 operation, struct menu_item *item, s32 *value); s32 menuhandler4MbAdvancedSetup(u32 operation, struct menu_item *item, s32 *value); diff --git a/src/include/game/game_11ecf0.h b/src/include/game/game_11ecf0.h index 59b8638b8..09e89609c 100644 --- a/src/include/game/game_11ecf0.h +++ b/src/include/game/game_11ecf0.h @@ -59,7 +59,7 @@ u32 func0f128a9c(void); u32 func0f128ab8(void); u32 func0f128ad4(void); u32 func0f128ae4(void); -u32 func0f128af4(void); +s32 func0f128af4(s32 arg0); u32 func0f128cf0(void); u32 func0f128d20(void); u32 func0f128dbc(void); diff --git a/src/include/game/game_129900.h b/src/include/game/game_129900.h index 992012d8c..b55125dde 100644 --- a/src/include/game/game_129900.h +++ b/src/include/game/game_129900.h @@ -3,7 +3,7 @@ #include #include "types.h" -void func0f129900(struct prop *prop, struct coord *pos, s16 room, s32 arg3, s32 arg4); +u32 func0f129900(struct prop *prop, struct coord *pos, s16 *room, s32 arg3, s32 arg4); u32 func0f129940(void); u32 func0f129b08(void); u32 func0f129ba4(void); diff --git a/src/include/game/game_175f90.h b/src/include/game/game_175f90.h index bdb80d1fd..5c7f6eb71 100644 --- a/src/include/game/game_175f90.h +++ b/src/include/game/game_175f90.h @@ -4,7 +4,7 @@ #include "types.h" void func0f175f90(void); -u32 func0f175f98(void); -u32 func0f175fc8(void); +void func0f175f98(void); +void func0f175fc8(void); #endif diff --git a/src/include/library/library_04790.h b/src/include/library/library_04790.h index 94474accc..3c49b01b1 100644 --- a/src/include/library/library_04790.h +++ b/src/include/library/library_04790.h @@ -3,6 +3,6 @@ #include #include "types.h" -f32 scaleTo1(f32 *x, f32 *y, f32 *z); +void scaleTo1(f32 *x, f32 *y, f32 *z); #endif diff --git a/src/include/library/library_0c000.h b/src/include/library/library_0c000.h index 68ec2fe7f..60b696da6 100644 --- a/src/include/library/library_0c000.h +++ b/src/include/library/library_0c000.h @@ -18,6 +18,6 @@ u32 func0000cc34(void); u32 func0000cd4c(void); u32 func0000cdc8(void); u32 func0000cef8(void); -void func0000cf54(void); +void func0000cf54(u32 arg0); #endif diff --git a/src/include/library/library_11420.h b/src/include/library/library_11420.h index 64d0bff2e..ea97953bc 100644 --- a/src/include/library/library_11420.h +++ b/src/include/library/library_11420.h @@ -8,7 +8,7 @@ u32 func00011700(void); u32 func00011780(void); u32 func00011884(void); u32 func000118f4(void); -u32 func0001190c(void); +void func0001190c(s32 arg0); u32 func00011d84(void); #endif diff --git a/src/include/library/library_13130.h b/src/include/library/library_13130.h index 2e0afdab1..c24f1dbe9 100644 --- a/src/include/library/library_13130.h +++ b/src/include/library/library_13130.h @@ -3,9 +3,9 @@ #include #include "types.h" -char *strcpy(char *dest, const char *src); +char *strcpy(char *dest, char *src); u32 func000131c8(void); -u32 func00013224(void); +u32 func00013224(char *dst, char *src); u32 func00013274(void); u32 func00013274(void); u32 func000132c0(void); diff --git a/src/include/library/library_159b0.h b/src/include/library/library_159b0.h index b1a6d66ea..a72955903 100644 --- a/src/include/library/library_159b0.h +++ b/src/include/library/library_159b0.h @@ -5,7 +5,7 @@ void func000159b0(u32 *obj48_20); u32 func000159fc(void); -void func00015b10(struct coord *globaldrawcameraoffset); +void func00015b10(struct coord *globaldrawcameraoffset, struct coord *coord); u32 func00015b64(void); u32 func00015be0(void); u32 func00015be4(void); diff --git a/src/include/library/library_481e0.h b/src/include/library/library_481e0.h index 0868d1f6f..a0100e974 100644 --- a/src/include/library/library_481e0.h +++ b/src/include/library/library_481e0.h @@ -6,8 +6,8 @@ u32 func000481e0(void); u32 func000481f0(void); void func00048340(u32 *arg0, u32 *arg1, s32 arg2); -u32 func00048370(void); +void func00048370(s32 arg0); void func00048430(s32 arg0, s32 arg1); -void func00048510(void); +u32 func00048510(void); #endif diff --git a/src/inflate/inflate.c b/src/inflate/inflate.c index 6da9bf114..87159bd45 100644 --- a/src/inflate/inflate.c +++ b/src/inflate/inflate.c @@ -1,4 +1,11 @@ #include +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" +#include "types.h" // 702012d0 u8 *g_pSrc = 0; diff --git a/src/library/library_03050.c b/src/library/library_03050.c index 0a3310cf9..db8049bac 100644 --- a/src/library/library_03050.c +++ b/src/library/library_03050.c @@ -1,5 +1,10 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_03050.h" #include "library/library_03ee0.h" #include "library/library_481e0.h" @@ -11,6 +16,7 @@ #include "library/library_49640.h" #include "library/library_49780.h" #include "library/library_49a90.h" +#include "types.h" const u32 var70052430[] = {0x70002d68}; const u32 var70052434[] = {0x70002d14}; diff --git a/src/library/library_034f0.c b/src/library/library_034f0.c index dbe82de8f..0e6dcb8ba 100644 --- a/src/library/library_034f0.c +++ b/src/library/library_034f0.c @@ -1,8 +1,14 @@ #include -#include "types.h" #include "boot/boot.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_034f0.h" #include "library/library_49c20.h" +#include "types.h" const u32 var70052450[] = {0x00141818}; const u32 var70052454[] = {0x1c1c1c1c}; diff --git a/src/library/library_03ee0.c b/src/library/library_03ee0.c index b4812fb55..ec24d554b 100644 --- a/src/library/library_03ee0.c +++ b/src/library/library_03ee0.c @@ -1,6 +1,12 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_491b0.h" +#include "types.h" GLOBAL_ASM( glabel func00003ee0 diff --git a/src/library/library_03fb0.c b/src/library/library_03fb0.c index 4564813f1..9228b1466 100644 --- a/src/library/library_03fb0.c +++ b/src/library/library_03fb0.c @@ -1,7 +1,13 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_03fb0.h" #include "library/library_4a360.h" +#include "types.h" GLOBAL_ASM( glabel func00003fb0 diff --git a/src/library/library_04320.c b/src/library/library_04320.c index c91d9f5ca..b3ce1f901 100644 --- a/src/library/library_04320.c +++ b/src/library/library_04320.c @@ -1,7 +1,13 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_04320.h" #include "library/library_4a360.h" +#include "types.h" GLOBAL_ASM( glabel func00004320 diff --git a/src/library/library_04790.c b/src/library/library_04790.c index a1404c77a..95cf40b3e 100644 --- a/src/library/library_04790.c +++ b/src/library/library_04790.c @@ -1,6 +1,13 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" +#include "library/library_04790.h" #include "library/library_4a360.h" +#include "types.h" void scaleTo1(f32 *x, f32 *y, f32 *z) { diff --git a/src/library/library_04840.c b/src/library/library_04840.c index 9bc41877b..78205aea6 100644 --- a/src/library/library_04840.c +++ b/src/library/library_04840.c @@ -1,8 +1,14 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_04840.h" #include "library/library_16110.h" #include "library/library_4a360.h" +#include "types.h" const u32 var700524b0[] = {0x3c8efa35}; const u32 var700524b4[] = {0x00000000}; diff --git a/src/library/library_04a80.c b/src/library/library_04a80.c index 758157820..fac93575b 100644 --- a/src/library/library_04a80.c +++ b/src/library/library_04a80.c @@ -1,6 +1,11 @@ #include -#include "types.h" #include "boot/boot.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_04790.h" #include "library/library_04a80.h" #include "library/library_16110.h" @@ -17,6 +22,7 @@ #include "library/library_4ad80.h" #include "library/library_4ae00.h" #include "library/library_4b160.h" +#include "types.h" const u32 var700524c0[] = {0x3c8efa35}; const u32 var700524c4[] = {0x00000000}; diff --git a/src/library/library_05e40.c b/src/library/library_05e40.c index 32109f98c..9f38ec67e 100644 --- a/src/library/library_05e40.c +++ b/src/library/library_05e40.c @@ -1,5 +1,10 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_05e40.h" #include "library/library_4ad80.h" #include "library/library_4b170.h" @@ -7,6 +12,7 @@ #include "library/library_4b500.h" #include "library/library_4b550.h" #include "library/library_4b5e0.h" +#include "types.h" GLOBAL_ASM( glabel func00005e40 diff --git a/src/library/library_06100.c b/src/library/library_06100.c index 0920b331e..0adb4a77a 100644 --- a/src/library/library_06100.c +++ b/src/library/library_06100.c @@ -1,10 +1,16 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_481e0.h" #include "library/library_48650.h" #include "library/library_48b20.h" #include "library/library_4b5e0.h" #include "library/library_4ba90.h" +#include "types.h" GLOBAL_ASM( glabel func00006100 diff --git a/src/library/library_06330.c b/src/library/library_06330.c index 8ea3a92e5..5da117837 100644 --- a/src/library/library_06330.c +++ b/src/library/library_06330.c @@ -1,9 +1,15 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_06100.h" #include "library/library_48650.h" #include "library/library_48b20.h" #include "library/library_4b5e0.h" +#include "types.h" GLOBAL_ASM( glabel func00006330 diff --git a/src/library/library_06440.c b/src/library/library_06440.c index 32f77a471..f08513880 100644 --- a/src/library/library_06440.c +++ b/src/library/library_06440.c @@ -1,8 +1,14 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_48650.h" #include "library/library_48b20.h" #include "library/library_4ba90.h" +#include "types.h" GLOBAL_ASM( glabel func00006440 diff --git a/src/library/library_06550.c b/src/library/library_06550.c index b32bbae3d..07ed9a681 100644 --- a/src/library/library_06550.c +++ b/src/library/library_06550.c @@ -1,5 +1,10 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_06550.h" #include "library/library_4a810.h" #include "library/library_4b170.h" @@ -12,6 +17,7 @@ #include "library/library_4d000.h" #include "library/library_4d480.h" #include "library/library_4d6f0.h" +#include "types.h" GLOBAL_ASM( glabel func00006550 diff --git a/src/library/library_070d0.c b/src/library/library_070d0.c index 26952d24e..d970ef1cc 100644 --- a/src/library/library_070d0.c +++ b/src/library/library_070d0.c @@ -1,11 +1,17 @@ #include -#include "types.h" #include "boot/boot.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_074f0.h" #include "library/library_0d0a0.h" #include "library/library_48150.h" #include "library/library_4b480.h" #include "library/library_4d6f0.h" +#include "types.h" GLOBAL_ASM( glabel func000070d0 diff --git a/src/library/library_074f0.c b/src/library/library_074f0.c index eb877c1a5..e016c43b5 100644 --- a/src/library/library_074f0.c +++ b/src/library/library_074f0.c @@ -1,7 +1,13 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_074f0.h" #include "library/library_2fa00.h" +#include "types.h" const u32 var70052530[] = {0x00000001}; const u32 var70052534[] = {0x00030007}; diff --git a/src/library/library_08a20.c b/src/library/library_08a20.c index f75cabc67..985c6f779 100644 --- a/src/library/library_08a20.c +++ b/src/library/library_08a20.c @@ -1,6 +1,11 @@ #include -#include "types.h" #include "boot/boot.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_03ee0.h" #include "library/library_08a20.h" #include "library/library_09660.h" @@ -16,6 +21,7 @@ #include "library/library_4e270.h" #include "library/library_4e3c0.h" #include "library/library_4e470.h" +#include "types.h" GLOBAL_ASM( glabel func00008a20 diff --git a/src/library/library_09660.c b/src/library/library_09660.c index a6145d7f0..65ab1ca7d 100644 --- a/src/library/library_09660.c +++ b/src/library/library_09660.c @@ -1,9 +1,14 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "game/game_0b28d0.h" -#include "game/pdoptions.h" #include "game/game_1668e0.h" #include "game/game_176080.h" +#include "game/pdoptions.h" +#include "gvars/gvars.h" #include "library/library_04840.h" #include "library/library_09660.h" #include "library/library_121e0.h" @@ -21,6 +26,7 @@ #include "library/library_4b480.h" #include "library/library_4e470.h" #include "library/library_4e530.h" +#include "types.h" const u32 var700526d0[] = {0x01400140}; const u32 var700526d4[] = {0x02800000}; diff --git a/src/library/library_0bfb0.c b/src/library/library_0bfb0.c index 8a91d5d59..7820bd8e9 100644 --- a/src/library/library_0bfb0.c +++ b/src/library/library_0bfb0.c @@ -1,7 +1,13 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_0c000.h" #include "library/library_2fa00.h" +#include "types.h" const char var700526e0[] = "ASSERTION : %s, %d: (\"%s\")\n"; const char var700526fc[] = ""; diff --git a/src/library/library_0c000.c b/src/library/library_0c000.c index 061470c50..f721d9f89 100644 --- a/src/library/library_0c000.c +++ b/src/library/library_0c000.c @@ -1,5 +1,10 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_03ee0.h" #include "library/library_09660.h" #include "library/library_0c000.h" @@ -8,6 +13,7 @@ #include "library/library_48520.h" #include "library/library_48650.h" #include "library/library_4e530.h" +#include "types.h" const char var700529b0[] = "Bad tid\n"; const char var700529bc[] = "Bad tid\n"; diff --git a/src/library/library_0d0a0.c b/src/library/library_0d0a0.c index 424c8bdc9..886c9f564 100644 --- a/src/library/library_0d0a0.c +++ b/src/library/library_0d0a0.c @@ -1,10 +1,16 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_0d0a0.h" #include "library/library_481e0.h" #include "library/library_48650.h" #include "library/library_4e470.h" #include "library/library_4e530.h" +#include "types.h" GLOBAL_ASM( glabel func0000d0a0 diff --git a/src/library/library_0d520.c b/src/library/library_0d520.c index b16cf5f2e..1c5f3f35f 100644 --- a/src/library/library_0d520.c +++ b/src/library/library_0d520.c @@ -1,6 +1,11 @@ #include -#include "types.h" #include "boot/boot.h" +#include "constants.h" +#include "game/cheats.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "game/game_000000.h" #include "game/game_000090.h" #include "game/game_000130.h" @@ -17,9 +22,8 @@ #include "game/game_00b200.h" #include "game/game_015470.h" #include "game/game_066310.h" -#include "game/cheats.h" #include "game/game_10ccd0.h" -#include "game/pad.h" +#include "game/game_1165d0.h" #include "game/game_11ecf0.h" #include "game/game_129900.h" #include "game/game_152fa0.h" @@ -31,6 +35,7 @@ #include "game/game_176d70.h" #include "game/game_187770.h" #include "game/game_1a78b0.h" +#include "gvars/gvars.h" #include "library/library_03050.h" #include "library/library_070d0.h" #include "library/library_074f0.h" @@ -56,7 +61,7 @@ #include "library/library_48650.h" #include "library/library_48b20.h" #include "library/library_4b480.h" -#include "game/data/data_000000.h" +#include "types.h" const char var70052ca0[] = "-ml0 -me0 -mgfx120 -mvtx98 -ma400"; const char var70052cc4[] = "-ml0 -me0 -mgfx110 -mgfxtra80 -mvtx100 -ma700"; diff --git a/src/library/library_0e9d0.c b/src/library/library_0e9d0.c index b91c34b51..2b38f2cd2 100644 --- a/src/library/library_0e9d0.c +++ b/src/library/library_0e9d0.c @@ -1,7 +1,12 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "game/game_1668e0.h" #include "game/game_16cfa0.h" +#include "gvars/gvars.h" #include "library/library_074f0.h" #include "library/library_08a20.h" #include "library/library_0d0a0.h" @@ -19,6 +24,7 @@ #include "library/library_39c80.h" #include "library/library_481e0.h" #include "library/library_48830.h" +#include "types.h" const char var70053b20[] = "RUSSES SOUND GUARD STRING"; const char var70053b3c[] = "Snd: SoundHeaderCacheInit\n"; diff --git a/src/library/library_11420.c b/src/library/library_11420.c index 10d5b4469..f31efbc7a 100644 --- a/src/library/library_11420.c +++ b/src/library/library_11420.c @@ -1,12 +1,18 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "game/game_16cfa0.h" #include "game/game_176080.h" +#include "gvars/gvars.h" #include "library/library_0e9d0.h" #include "library/library_11420.h" #include "library/library_38d10.h" #include "library/library_39c80.h" #include "library/library_39f70.h" +#include "types.h" const u32 var70053ca0[] = {0x00000000}; const u32 var70053ca4[] = {0x00050000}; diff --git a/src/library/library_121e0.c b/src/library/library_121e0.c index bda772d00..76f3c7c50 100644 --- a/src/library/library_121e0.c +++ b/src/library/library_121e0.c @@ -1,8 +1,13 @@ #include -#include "types.h" #include "boot/boot.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "gvars/gvars.h" #include "library/library_121e0.h" +#include "types.h" void func000121e0(void) { diff --git a/src/library/library_126b0.c b/src/library/library_126b0.c index 3bc02ab02..e39931707 100644 --- a/src/library/library_126b0.c +++ b/src/library/library_126b0.c @@ -1,7 +1,12 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_126b0.h" -#include "library/library_12dc0.h" +#include "types.h" GLOBAL_ASM( glabel func000126b0 diff --git a/src/library/library_12dc0.c b/src/library/library_12dc0.c index 20534e2bf..4a22f5a8e 100644 --- a/src/library/library_12dc0.c +++ b/src/library/library_12dc0.c @@ -1,11 +1,16 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_12dc0.h" #include "library/library_13130.h" #include "library/library_2fa00.h" #include "library/library_4a5e0.h" #include "library/library_4e530.h" -#include "game/data/data_000000.h" +#include "types.h" const u32 var70053ff0[] = {0x00000000}; const char var70053ff4[] = "-d"; diff --git a/src/library/library_13130.c b/src/library/library_13130.c index f2f08cb83..044b9e66c 100644 --- a/src/library/library_13130.c +++ b/src/library/library_13130.c @@ -1,9 +1,15 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_0bfb0.h" #include "library/library_13130.h" #include "library/library_4a5e0.h" #include "library/library_4e690.h" +#include "types.h" const char var70054010[] = "s1"; const char var70054014[] = "str.c"; diff --git a/src/library/library_13710.c b/src/library/library_13710.c index 03ac53e5c..b48059f4e 100644 --- a/src/library/library_13710.c +++ b/src/library/library_13710.c @@ -1,6 +1,12 @@ #include +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "gvars/gvars.h" #include "library/library_03050.h" +#include "library/library_13710.h" #include "types.h" void func00013710(void) diff --git a/src/library/library_13750.c b/src/library/library_13750.c index d085b8861..870795a57 100644 --- a/src/library/library_13750.c +++ b/src/library/library_13750.c @@ -1,4 +1,9 @@ #include +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "gvars/gvars.h" #include "library/library_13750.h" #include "library/library_481e0.h" diff --git a/src/library/library_13790.c b/src/library/library_13790.c index ba1204952..e44b2b8c9 100644 --- a/src/library/library_13790.c +++ b/src/library/library_13790.c @@ -1,4 +1,11 @@ #include +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" +#include "library/library_13790.h" #include "types.h" void func00013790(void) diff --git a/src/library/library_13820.c b/src/library/library_13820.c index f2477e814..e7aa1b35f 100644 --- a/src/library/library_13820.c +++ b/src/library/library_13820.c @@ -1,6 +1,12 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_4ae00.h" +#include "types.h" const char var70054030[] = "0123456789abcdefghijklmnopqrstuvwxyz"; const char var70054058[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"; diff --git a/src/library/library_13900.c b/src/library/library_13900.c index 9fb9c0925..a272dfde6 100644 --- a/src/library/library_13900.c +++ b/src/library/library_13900.c @@ -1,6 +1,11 @@ #include -#include "types.h" -#include "game/pad.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "game/game_1165d0.h" +#include "gvars/gvars.h" #include "library/library_04a80.h" #include "library/library_0d520.h" #include "library/library_13900.h" @@ -12,6 +17,7 @@ #include "library/library_4f350.h" #include "library/library_4f400.h" #include "library/library_4f5e0.h" +#include "types.h" const char var70054080[] = "joyReset\n"; const char var7005408c[] = "joyReset: doing nothing\n"; diff --git a/src/library/library_15860.c b/src/library/library_15860.c index c4cde136e..7df5b4d86 100644 --- a/src/library/library_15860.c +++ b/src/library/library_15860.c @@ -1,5 +1,11 @@ #include +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "gvars/gvars.h" +#include "library/library_15860.h" #include "types.h" void initGlobalVariables(void) diff --git a/src/library/library_159b0.c b/src/library/library_159b0.c index 6854ddf0c..2a238573a 100644 --- a/src/library/library_159b0.c +++ b/src/library/library_159b0.c @@ -1,7 +1,13 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_48650.h" #include "library/library_488e0.h" +#include "types.h" GLOBAL_ASM( glabel func000159b0 diff --git a/src/library/library_16110.c b/src/library/library_16110.c index 9280466bd..3abf08a26 100644 --- a/src/library/library_16110.c +++ b/src/library/library_16110.c @@ -1,5 +1,10 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/ailists.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "game/game_096750.h" #include "game/game_114240.h" #include "gvars/gvars.h" @@ -8,8 +13,7 @@ #include "library/library_16110.h" #include "library/library_4a360.h" #include "library/library_4f5e0.h" -#include "game/data/ailists.h" -#include "game/data/data_000000.h" +#include "types.h" const u32 var70054200[] = {0x42652ee0}; const u32 var70054204[] = {0x00000000}; diff --git a/src/library/library_1a500.c b/src/library/library_1a500.c index a0ea3fea3..67338b431 100644 --- a/src/library/library_1a500.c +++ b/src/library/library_1a500.c @@ -1,5 +1,9 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "game/game_066310.h" #include "game/game_096750.h" #include "game/game_097890.h" @@ -7,6 +11,7 @@ #include "game/game_0b28d0.h" #include "game/game_157db0.h" #include "game/game_1668e0.h" +#include "gvars/gvars.h" #include "library/library_12dc0.h" #include "library/library_159b0.h" #include "library/library_16110.h" @@ -15,6 +20,7 @@ #include "library/library_4a360.h" #include "library/library_4b480.h" #include "library/library_4f5e0.h" +#include "types.h" const u32 var70054280[] = {0x7001aa58}; const u32 var70054284[] = {0x7001aab4}; diff --git a/src/library/library_233c0.c b/src/library/library_233c0.c index 3881e4ebe..9a6ebf3f7 100644 --- a/src/library/library_233c0.c +++ b/src/library/library_233c0.c @@ -1,8 +1,13 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "game/game_0601b0.h" #include "game/game_152fa0.h" #include "game/game_157db0.h" +#include "gvars/gvars.h" #include "library/library_04790.h" #include "library/library_04a80.h" #include "library/library_0d0a0.h" @@ -13,6 +18,7 @@ #include "library/library_4a360.h" #include "library/library_4ae00.h" #include "library/library_4b170.h" +#include "types.h" const u32 var70054690[] = {0x3a83126f}; const u32 var70054694[] = {0x3a83126f}; diff --git a/src/library/library_2f490.c b/src/library/library_2f490.c index 915894d3b..92cb44414 100644 --- a/src/library/library_2f490.c +++ b/src/library/library_2f490.c @@ -1,8 +1,14 @@ #include -#include "types.h" #include "boot/boot.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_121e0.h" #include "library/library_48120.h" +#include "types.h" GLOBAL_ASM( glabel func0002f490 diff --git a/src/library/library_2fa00.c b/src/library/library_2fa00.c index 368f6a722..985b81ae2 100644 --- a/src/library/library_2fa00.c +++ b/src/library/library_2fa00.c @@ -1,7 +1,13 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_0c000.h" #include "library/library_4e690.h" +#include "types.h" GLOBAL_ASM( glabel func0002fa00 diff --git a/src/library/library_2faf0.c b/src/library/library_2faf0.c index b6a448ea2..4125b2b6c 100644 --- a/src/library/library_2faf0.c +++ b/src/library/library_2faf0.c @@ -1,4 +1,10 @@ #include +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_2fba0.c b/src/library/library_2fba0.c index ffabe3320..faaadcf52 100644 --- a/src/library/library_2fba0.c +++ b/src/library/library_2fba0.c @@ -1,7 +1,13 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_30ce0.h" #include "library/library_39fc0.h" +#include "types.h" GLOBAL_ASM( glabel func0002fba0 diff --git a/src/library/library_2fc60.c b/src/library/library_2fc60.c index a743a64e0..f6a6758c0 100644 --- a/src/library/library_2fc60.c +++ b/src/library/library_2fc60.c @@ -1,8 +1,14 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_16110.h" #include "library/library_2fc60.h" #include "library/library_39fe0.h" +#include "types.h" const u32 var700546b0[] = {0x3f83f794}; const u32 var700546b4[] = {0x40c90fdb}; diff --git a/src/library/library_30ce0.c b/src/library/library_30ce0.c index 5848766a9..fa7a9feb9 100644 --- a/src/library/library_30ce0.c +++ b/src/library/library_30ce0.c @@ -1,10 +1,16 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_2faf0.h" #include "library/library_30ce0.h" #include "library/library_39fe0.h" #include "library/library_3a100.h" #include "library/library_3c430.h" +#include "types.h" const u32 var70054730[] = {0x49742400}; const u32 var70054734[] = {0x00000000}; diff --git a/src/library/library_317f0.c b/src/library/library_317f0.c index 6c9e41efa..45ece92c5 100644 --- a/src/library/library_317f0.c +++ b/src/library/library_317f0.c @@ -1,5 +1,10 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_0e9d0.h" #include "library/library_2faf0.h" #include "library/library_2fc60.h" @@ -18,6 +23,7 @@ #include "library/library_3e730.h" #include "library/library_48650.h" #include "library/library_488e0.h" +#include "types.h" const u32 var70054740[] = {0x70031ce0}; const u32 var70054744[] = {0x700325ac}; diff --git a/src/library/library_37650.c b/src/library/library_37650.c index f7186e09a..99ccfbd75 100644 --- a/src/library/library_37650.c +++ b/src/library/library_37650.c @@ -1,7 +1,13 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_37650.h" #include "library/library_3c4d0.h" +#include "types.h" GLOBAL_ASM( glabel func00037650 diff --git a/src/library/library_37b00.c b/src/library/library_37b00.c index e818a251c..1430116b5 100644 --- a/src/library/library_37b00.c +++ b/src/library/library_37b00.c @@ -1,5 +1,10 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_2faf0.h" #include "library/library_37b00.h" #include "library/library_3e730.h" @@ -7,6 +12,7 @@ #include "library/library_4ae00.h" #include "library/library_4b170.h" #include "library/library_4b480.h" +#include "types.h" GLOBAL_ASM( glabel func00037b00 diff --git a/src/library/library_38d10.c b/src/library/library_38d10.c index 299499447..439ab74fc 100644 --- a/src/library/library_38d10.c +++ b/src/library/library_38d10.c @@ -1,4 +1,10 @@ #include +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_38d30.c b/src/library/library_38d30.c index 43b5e59b8..e70aaf6a2 100644 --- a/src/library/library_38d30.c +++ b/src/library/library_38d30.c @@ -1,7 +1,13 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_38d30.h" #include "library/library_3c4d0.h" +#include "types.h" GLOBAL_ASM( glabel func00038d30 diff --git a/src/library/library_39c80.c b/src/library/library_39c80.c index 0538f6591..2c7a2a1a2 100644 --- a/src/library/library_39c80.c +++ b/src/library/library_39c80.c @@ -1,7 +1,13 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_3c4d0.h" #include "library/library_43dd0.h" +#include "types.h" GLOBAL_ASM( glabel func00039c80 diff --git a/src/library/library_39f70.c b/src/library/library_39f70.c index d32e31526..8584f6c1e 100644 --- a/src/library/library_39f70.c +++ b/src/library/library_39f70.c @@ -1,6 +1,12 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_3c4d0.h" +#include "types.h" GLOBAL_ASM( glabel func00039f70 diff --git a/src/library/library_39fc0.c b/src/library/library_39fc0.c index f4e9de010..689b58fa4 100644 --- a/src/library/library_39fc0.c +++ b/src/library/library_39fc0.c @@ -1,4 +1,10 @@ #include +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_39fe0.c b/src/library/library_39fe0.c index 4e2894c91..f681506a3 100644 --- a/src/library/library_39fe0.c +++ b/src/library/library_39fe0.c @@ -1,6 +1,12 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_3a100.h" +#include "types.h" const u32 var70054a80[] = {0x3f8012ef}; const u32 var70054a84[] = {0x3f7fda28}; diff --git a/src/library/library_3a100.c b/src/library/library_3a100.c index fda8ef850..5829dca56 100644 --- a/src/library/library_3a100.c +++ b/src/library/library_3a100.c @@ -1,10 +1,16 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "game/game_096750.h" +#include "gvars/gvars.h" #include "library/library_2faf0.h" #include "library/library_3a100.h" #include "library/library_446d0.h" #include "library/library_4b480.h" +#include "types.h" const u32 var70054a90[] = {0x3fb50481}; const u32 var70054a94[] = {0x7003a9c8}; diff --git a/src/library/library_3c430.c b/src/library/library_3c430.c index 499aeb3f2..3e7e13b4e 100644 --- a/src/library/library_3c430.c +++ b/src/library/library_3c430.c @@ -1,6 +1,12 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_44bc0.h" +#include "types.h" GLOBAL_ASM( glabel func0003c430 diff --git a/src/library/library_3c4d0.c b/src/library/library_3c4d0.c index 156859fb8..a6531bbe4 100644 --- a/src/library/library_3c4d0.c +++ b/src/library/library_3c4d0.c @@ -1,10 +1,16 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_30ce0.h" #include "library/library_3c4d0.h" #include "library/library_3e730.h" #include "library/library_48650.h" #include "library/library_4b170.h" +#include "types.h" GLOBAL_ASM( glabel func0003c4d0 diff --git a/src/library/library_3ccf0.c b/src/library/library_3ccf0.c index 68f6eaa8a..ca1b546fc 100644 --- a/src/library/library_3ccf0.c +++ b/src/library/library_3ccf0.c @@ -1,7 +1,13 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_30ce0.h" #include "library/library_3e730.h" +#include "types.h" GLOBAL_ASM( glabel func0003ccf0 diff --git a/src/library/library_3cdc0.c b/src/library/library_3cdc0.c index f2bf9fa46..37aa4a838 100644 --- a/src/library/library_3cdc0.c +++ b/src/library/library_3cdc0.c @@ -1,7 +1,13 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_30ce0.h" #include "library/library_3e730.h" +#include "types.h" GLOBAL_ASM( glabel func0003cdc0 diff --git a/src/library/library_3cef0.c b/src/library/library_3cef0.c index e147e58c6..6235a5a70 100644 --- a/src/library/library_3cef0.c +++ b/src/library/library_3cef0.c @@ -1,7 +1,13 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_30ce0.h" #include "library/library_3e730.h" +#include "types.h" GLOBAL_ASM( glabel func0003cef0 diff --git a/src/library/library_3d280.c b/src/library/library_3d280.c index 953aac130..0b6167d30 100644 --- a/src/library/library_3d280.c +++ b/src/library/library_3d280.c @@ -1,10 +1,16 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_30ce0.h" #include "library/library_3c4d0.h" #include "library/library_3ccf0.h" #include "library/library_3d280.h" #include "library/library_44bc0.h" +#include "types.h" GLOBAL_ASM( glabel func0003d280 diff --git a/src/library/library_3e3e0.c b/src/library/library_3e3e0.c index afdc55319..428cf43c0 100644 --- a/src/library/library_3e3e0.c +++ b/src/library/library_3e3e0.c @@ -1,8 +1,14 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_30ce0.h" #include "library/library_3a100.h" #include "library/library_3e730.h" +#include "types.h" const u32 var70054ae0[] = {0x3dcccccd}; const u32 var70054ae4[] = {0x00000000}; diff --git a/src/library/library_3e730.c b/src/library/library_3e730.c index a75efcfca..4243a64b7 100644 --- a/src/library/library_3e730.c +++ b/src/library/library_3e730.c @@ -1,5 +1,10 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_16110.h" #include "library/library_30ce0.h" #include "library/library_3e730.h" @@ -12,6 +17,7 @@ #include "library/library_4ae00.h" #include "library/library_4b170.h" #include "library/library_4b480.h" +#include "types.h" const u32 var70054af0[] = {0x7003eff8}; const u32 var70054af4[] = {0x7003f0d0}; diff --git a/src/library/library_43dd0.c b/src/library/library_43dd0.c index 94041ea19..17878454e 100644 --- a/src/library/library_43dd0.c +++ b/src/library/library_43dd0.c @@ -1,11 +1,17 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_3c4d0.h" #include "library/library_3e730.h" #include "library/library_43dd0.h" #include "library/library_461c0.h" #include "library/library_4ae00.h" #include "library/library_4b170.h" +#include "types.h" GLOBAL_ASM( glabel func00043dd0 diff --git a/src/library/library_446d0.c b/src/library/library_446d0.c index 2bd149286..2cdc1c3b0 100644 --- a/src/library/library_446d0.c +++ b/src/library/library_446d0.c @@ -1,7 +1,13 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_3e730.h" #include "library/library_4a360.h" +#include "types.h" GLOBAL_ASM( glabel func000446d0 diff --git a/src/library/library_44bc0.c b/src/library/library_44bc0.c index 06d92b4a9..77bfcb349 100644 --- a/src/library/library_44bc0.c +++ b/src/library/library_44bc0.c @@ -1,8 +1,14 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_37b00.h" #include "library/library_3a100.h" #include "library/library_4b480.h" +#include "types.h" GLOBAL_ASM( glabel func00044bc0 diff --git a/src/library/library_44f60.c b/src/library/library_44f60.c index 560a04e4a..9dc4176a9 100644 --- a/src/library/library_44f60.c +++ b/src/library/library_44f60.c @@ -1,11 +1,17 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_3a100.h" #include "library/library_44f60.h" #include "library/library_47a90.h" #include "library/library_4a360.h" #include "library/library_4b170.h" #include "library/library_4b480.h" +#include "types.h" GLOBAL_ASM( glabel func00044f60 diff --git a/src/library/library_45ed0.c b/src/library/library_45ed0.c index d6eda6f47..dd368d3be 100644 --- a/src/library/library_45ed0.c +++ b/src/library/library_45ed0.c @@ -1,6 +1,12 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_47d20.h" +#include "types.h" GLOBAL_ASM( glabel func00045ed0 diff --git a/src/library/library_461c0.c b/src/library/library_461c0.c index d7ae13419..2b4f8bcb2 100644 --- a/src/library/library_461c0.c +++ b/src/library/library_461c0.c @@ -1,6 +1,12 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_461c0.h" +#include "types.h" GLOBAL_ASM( glabel func000461c0 diff --git a/src/library/library_46650.c b/src/library/library_46650.c index 6c94616e0..0675250b1 100644 --- a/src/library/library_46650.c +++ b/src/library/library_46650.c @@ -1,4 +1,10 @@ #include +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_47550.c b/src/library/library_47550.c index b51cce32b..026bee558 100644 --- a/src/library/library_47550.c +++ b/src/library/library_47550.c @@ -1,4 +1,10 @@ #include +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_47a90.c b/src/library/library_47a90.c index cf3fce361..fe26ff0fb 100644 --- a/src/library/library_47a90.c +++ b/src/library/library_47a90.c @@ -1,7 +1,13 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_44f60.h" #include "library/library_4b480.h" +#include "types.h" GLOBAL_ASM( glabel func00047a90 diff --git a/src/library/library_47d20.c b/src/library/library_47d20.c index 8dd1f01fc..d0ca0c6d8 100644 --- a/src/library/library_47d20.c +++ b/src/library/library_47d20.c @@ -1,4 +1,10 @@ #include +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_48120.c b/src/library/library_48120.c index 32e9344a9..f1f129b37 100644 --- a/src/library/library_48120.c +++ b/src/library/library_48120.c @@ -1,4 +1,10 @@ #include +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_48150.c b/src/library/library_48150.c index 4412aedd9..ace2e483d 100644 --- a/src/library/library_48150.c +++ b/src/library/library_48150.c @@ -1,4 +1,10 @@ #include +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_481d0.c b/src/library/library_481d0.c index ac70d43c4..8cb4919d3 100644 --- a/src/library/library_481d0.c +++ b/src/library/library_481d0.c @@ -1,4 +1,10 @@ #include +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_481e0.c b/src/library/library_481e0.c index 7899f59f1..6e9e36094 100644 --- a/src/library/library_481e0.c +++ b/src/library/library_481e0.c @@ -1,8 +1,14 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_034f0.h" #include "library/library_491b0.h" #include "library/library_49c20.h" +#include "types.h" GLOBAL_ASM( glabel func000481e0 diff --git a/src/library/library_48520.c b/src/library/library_48520.c index 1e4508d2e..60a081ba5 100644 --- a/src/library/library_48520.c +++ b/src/library/library_48520.c @@ -1,7 +1,13 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_488e0.h" #include "library/library_491b0.h" +#include "types.h" GLOBAL_ASM( glabel func00048520 diff --git a/src/library/library_485e0.c b/src/library/library_485e0.c index 5406c542c..6112bc833 100644 --- a/src/library/library_485e0.c +++ b/src/library/library_485e0.c @@ -1,6 +1,12 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_491b0.h" +#include "types.h" GLOBAL_ASM( glabel func000485e0 diff --git a/src/library/library_48650.c b/src/library/library_48650.c index 42e175eec..eecc5376a 100644 --- a/src/library/library_48650.c +++ b/src/library/library_48650.c @@ -1,8 +1,14 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_034f0.h" #include "library/library_481e0.h" #include "library/library_491b0.h" +#include "types.h" GLOBAL_ASM( glabel func00048650 diff --git a/src/library/library_48830.c b/src/library/library_48830.c index 5b9628296..07946e0eb 100644 --- a/src/library/library_48830.c +++ b/src/library/library_48830.c @@ -1,6 +1,12 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_491b0.h" +#include "types.h" GLOBAL_ASM( glabel func00048830 diff --git a/src/library/library_488e0.c b/src/library/library_488e0.c index d5c5f9614..810803259 100644 --- a/src/library/library_488e0.c +++ b/src/library/library_488e0.c @@ -1,9 +1,15 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_034f0.h" #include "library/library_481e0.h" #include "library/library_491b0.h" #include "library/library_51880.h" +#include "types.h" GLOBAL_ASM( glabel func000488e0 diff --git a/src/library/library_48b20.c b/src/library/library_48b20.c index 2aba13587..48d856701 100644 --- a/src/library/library_48b20.c +++ b/src/library/library_48b20.c @@ -1,6 +1,12 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_491b0.h" +#include "types.h" GLOBAL_ASM( glabel func00048b20 diff --git a/src/library/library_48c00.c b/src/library/library_48c00.c index 809a7f727..b5c863fa9 100644 --- a/src/library/library_48c00.c +++ b/src/library/library_48c00.c @@ -1,6 +1,12 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_51890.h" +#include "types.h" GLOBAL_ASM( glabel func00048c00 diff --git a/src/library/library_48cd0.c b/src/library/library_48cd0.c index c9690ef95..2da45e462 100644 --- a/src/library/library_48cd0.c +++ b/src/library/library_48cd0.c @@ -1,6 +1,12 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_491b0.h" +#include "types.h" GLOBAL_ASM( glabel func00048cd0 diff --git a/src/library/library_48dc0.c b/src/library/library_48dc0.c index 4717ce99f..9eb96b37b 100644 --- a/src/library/library_48dc0.c +++ b/src/library/library_48dc0.c @@ -1,6 +1,12 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_491b0.h" +#include "types.h" GLOBAL_ASM( glabel func00048dc0 diff --git a/src/library/library_48ef0.c b/src/library/library_48ef0.c index 60873ce26..6975065e5 100644 --- a/src/library/library_48ef0.c +++ b/src/library/library_48ef0.c @@ -1,6 +1,12 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_491b0.h" +#include "types.h" GLOBAL_ASM( glabel func00048ef0 diff --git a/src/library/library_48f50.c b/src/library/library_48f50.c index 8384bdcae..245816c7a 100644 --- a/src/library/library_48f50.c +++ b/src/library/library_48f50.c @@ -1,6 +1,12 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_491b0.h" +#include "types.h" GLOBAL_ASM( glabel func00048f50 diff --git a/src/library/library_490b0.c b/src/library/library_490b0.c index 0b7759a22..9c3321d25 100644 --- a/src/library/library_490b0.c +++ b/src/library/library_490b0.c @@ -1,8 +1,14 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_481e0.h" #include "library/library_491b0.h" #include "library/library_4b500.h" +#include "types.h" GLOBAL_ASM( glabel func000490b0 diff --git a/src/library/library_491b0.c b/src/library/library_491b0.c index fd83fc6b6..b0b0a690c 100644 --- a/src/library/library_491b0.c +++ b/src/library/library_491b0.c @@ -1,9 +1,15 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_481e0.h" #include "library/library_488e0.h" #include "library/library_491b0.h" #include "library/library_51880.h" +#include "types.h" GLOBAL_ASM( glabel func000491b0 diff --git a/src/library/library_49640.c b/src/library/library_49640.c index 372441645..cdd68824b 100644 --- a/src/library/library_49640.c +++ b/src/library/library_49640.c @@ -1,7 +1,13 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_49780.h" #include "library/library_4ae00.h" +#include "types.h" GLOBAL_ASM( glabel func00049640 diff --git a/src/library/library_49780.c b/src/library/library_49780.c index 1aaf43494..41e3544de 100644 --- a/src/library/library_49780.c +++ b/src/library/library_49780.c @@ -1,6 +1,12 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_4b480.h" +#include "types.h" GLOBAL_ASM( glabel func00049780 diff --git a/src/library/library_49a90.c b/src/library/library_49a90.c index 39254d83c..72e578125 100644 --- a/src/library/library_49a90.c +++ b/src/library/library_49a90.c @@ -1,10 +1,16 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_481e0.h" #include "library/library_48650.h" #include "library/library_488e0.h" #include "library/library_49a90.h" #include "library/library_4b480.h" +#include "types.h" GLOBAL_ASM( glabel func00049a90 diff --git a/src/library/library_49c20.c b/src/library/library_49c20.c index e56831253..f68205c94 100644 --- a/src/library/library_49c20.c +++ b/src/library/library_49c20.c @@ -1,5 +1,10 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_034f0.h" #include "library/library_48650.h" #include "library/library_488e0.h" @@ -10,6 +15,7 @@ #include "library/library_51900.h" #include "library/library_51a60.h" #include "library/library_51c10.h" +#include "types.h" GLOBAL_ASM( glabel func00049c20 diff --git a/src/library/library_4a360.c b/src/library/library_4a360.c index 09d031ac7..23be87ad4 100644 --- a/src/library/library_4a360.c +++ b/src/library/library_4a360.c @@ -1,6 +1,12 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_4a360.h" +#include "types.h" GLOBAL_ASM( glabel func0004a360 diff --git a/src/library/library_4a5e0.c b/src/library/library_4a5e0.c index 72f46682e..2e58edd60 100644 --- a/src/library/library_4a5e0.c +++ b/src/library/library_4a5e0.c @@ -1,4 +1,10 @@ #include +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_4a680.c b/src/library/library_4a680.c index 6fef6c2c7..a3d11dace 100644 --- a/src/library/library_4a680.c +++ b/src/library/library_4a680.c @@ -1,6 +1,12 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_4ae00.h" +#include "types.h" GLOBAL_ASM( glabel func0004a680 diff --git a/src/library/library_4a810.c b/src/library/library_4a810.c index 21ab4de70..efb2c8c2c 100644 --- a/src/library/library_4a810.c +++ b/src/library/library_4a810.c @@ -1,5 +1,10 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_481e0.h" #include "library/library_48650.h" #include "library/library_488e0.h" @@ -7,6 +12,7 @@ #include "library/library_4ad80.h" #include "library/library_4b480.h" #include "library/library_4e470.h" +#include "types.h" GLOBAL_ASM( glabel func0004a810 diff --git a/src/library/library_4a980.c b/src/library/library_4a980.c index 674af910d..289901203 100644 --- a/src/library/library_4a980.c +++ b/src/library/library_4a980.c @@ -1,11 +1,17 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_481e0.h" #include "library/library_48650.h" #include "library/library_48b20.h" #include "library/library_490b0.h" #include "library/library_4a810.h" #include "library/library_4a980.h" +#include "types.h" GLOBAL_ASM( glabel func0004a980 diff --git a/src/library/library_4acc0.c b/src/library/library_4acc0.c index 0b1df0701..7cef53a56 100644 --- a/src/library/library_4acc0.c +++ b/src/library/library_4acc0.c @@ -1,4 +1,10 @@ #include +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_4ace0.c b/src/library/library_4ace0.c index 2bb6efecc..76997546e 100644 --- a/src/library/library_4ace0.c +++ b/src/library/library_4ace0.c @@ -1,6 +1,12 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_51c60.h" +#include "types.h" GLOBAL_ASM( glabel func0004ace0 diff --git a/src/library/library_4ad30.c b/src/library/library_4ad30.c index dd5d1145c..c1f716092 100644 --- a/src/library/library_4ad30.c +++ b/src/library/library_4ad30.c @@ -1,6 +1,12 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_51c60.h" +#include "types.h" GLOBAL_ASM( glabel func0004ad30 diff --git a/src/library/library_4ad80.c b/src/library/library_4ad80.c index bf77b795d..9ba8628e1 100644 --- a/src/library/library_4ad80.c +++ b/src/library/library_4ad80.c @@ -1,4 +1,10 @@ #include +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_4ae00.c b/src/library/library_4ae00.c index e55a78c3b..e62036bc0 100644 --- a/src/library/library_4ae00.c +++ b/src/library/library_4ae00.c @@ -1,4 +1,10 @@ #include +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_4b160.c b/src/library/library_4b160.c index 4789a81c5..d1d6f043b 100644 --- a/src/library/library_4b160.c +++ b/src/library/library_4b160.c @@ -1,4 +1,10 @@ #include +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_4b170.c b/src/library/library_4b170.c index b7f21b710..df4df5215 100644 --- a/src/library/library_4b170.c +++ b/src/library/library_4b170.c @@ -1,4 +1,10 @@ #include +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_4b480.c b/src/library/library_4b480.c index 001314f98..cf51f4675 100644 --- a/src/library/library_4b480.c +++ b/src/library/library_4b480.c @@ -1,6 +1,12 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_51c60.h" +#include "types.h" GLOBAL_ASM( glabel func0004b480 diff --git a/src/library/library_4b500.c b/src/library/library_4b500.c index 291b55930..3822bff78 100644 --- a/src/library/library_4b500.c +++ b/src/library/library_4b500.c @@ -1,4 +1,10 @@ #include +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_4b550.c b/src/library/library_4b550.c index 121ee0c2b..717c2adf2 100644 --- a/src/library/library_4b550.c +++ b/src/library/library_4b550.c @@ -1,7 +1,13 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_4b480.h" #include "library/library_4b5e0.h" +#include "types.h" GLOBAL_ASM( glabel func0004b550 diff --git a/src/library/library_4b5e0.c b/src/library/library_4b5e0.c index 567d58e0f..e3680ff6e 100644 --- a/src/library/library_4b5e0.c +++ b/src/library/library_4b5e0.c @@ -1,10 +1,16 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_48650.h" #include "library/library_4a810.h" #include "library/library_4b170.h" #include "library/library_4ba90.h" #include "library/library_51d50.h" +#include "types.h" GLOBAL_ASM( glabel func0004b5e0 diff --git a/src/library/library_4ba90.c b/src/library/library_4ba90.c index e41c6edf8..35a9fa8fb 100644 --- a/src/library/library_4ba90.c +++ b/src/library/library_4ba90.c @@ -1,8 +1,14 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_48650.h" #include "library/library_4a810.h" #include "library/library_4ba90.h" +#include "types.h" GLOBAL_ASM( glabel func0004ba90 diff --git a/src/library/library_4c090.c b/src/library/library_4c090.c index be49611c3..b2f582aa1 100644 --- a/src/library/library_4c090.c +++ b/src/library/library_4c090.c @@ -1,11 +1,17 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_481e0.h" #include "library/library_4b170.h" #include "library/library_4b5e0.h" #include "library/library_4c090.h" #include "library/library_4cde0.h" #include "library/library_4d6f0.h" +#include "types.h" GLOBAL_ASM( glabel func0004c090 diff --git a/src/library/library_4cc10.c b/src/library/library_4cc10.c index 5ec9e92a8..1aaa6f627 100644 --- a/src/library/library_4cc10.c +++ b/src/library/library_4cc10.c @@ -1,8 +1,14 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_4b5e0.h" #include "library/library_4ba90.h" #include "library/library_4c090.h" +#include "types.h" GLOBAL_ASM( glabel func0004cc10 diff --git a/src/library/library_4cde0.c b/src/library/library_4cde0.c index 6558347dd..36888fcb3 100644 --- a/src/library/library_4cde0.c +++ b/src/library/library_4cde0.c @@ -1,6 +1,12 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_4b5e0.h" +#include "types.h" GLOBAL_ASM( glabel func0004cde0 diff --git a/src/library/library_4ce60.c b/src/library/library_4ce60.c index 0b8b5e2a3..f3d790acc 100644 --- a/src/library/library_4ce60.c +++ b/src/library/library_4ce60.c @@ -1,6 +1,12 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_4c090.h" +#include "types.h" GLOBAL_ASM( glabel func0004ce60 diff --git a/src/library/library_4d000.c b/src/library/library_4d000.c index 0be19cc4e..02020d74a 100644 --- a/src/library/library_4d000.c +++ b/src/library/library_4d000.c @@ -1,11 +1,17 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_4b170.h" #include "library/library_4b5e0.h" #include "library/library_4c090.h" #include "library/library_4cc10.h" #include "library/library_4ce60.h" #include "library/library_4d000.h" +#include "types.h" GLOBAL_ASM( glabel func0004d000 diff --git a/src/library/library_4d480.c b/src/library/library_4d480.c index a7848f1de..0014246ef 100644 --- a/src/library/library_4d480.c +++ b/src/library/library_4d480.c @@ -1,11 +1,17 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_4ae00.h" #include "library/library_4b5e0.h" #include "library/library_4c090.h" #include "library/library_4cc10.h" #include "library/library_4cde0.h" #include "library/library_4d480.h" +#include "types.h" GLOBAL_ASM( glabel func0004d480 diff --git a/src/library/library_4d6f0.c b/src/library/library_4d6f0.c index f586619a8..f457beb9f 100644 --- a/src/library/library_4d6f0.c +++ b/src/library/library_4d6f0.c @@ -1,10 +1,16 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_4ae00.h" #include "library/library_4b5e0.h" #include "library/library_4c090.h" #include "library/library_4cde0.h" #include "library/library_4d6f0.h" +#include "types.h" GLOBAL_ASM( glabel func0004d6f0 diff --git a/src/library/library_4e270.c b/src/library/library_4e270.c index 1a70c2f3a..24b6ac21f 100644 --- a/src/library/library_4e270.c +++ b/src/library/library_4e270.c @@ -1,4 +1,10 @@ #include +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_4e3c0.c b/src/library/library_4e3c0.c index a8ceac15d..df659fc3f 100644 --- a/src/library/library_4e3c0.c +++ b/src/library/library_4e3c0.c @@ -1,7 +1,13 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_4b480.h" #include "library/library_51ec0.h" +#include "types.h" GLOBAL_ASM( glabel func0004e3c0 diff --git a/src/library/library_4e470.c b/src/library/library_4e470.c index ce99f47ce..0f7ddf3ee 100644 --- a/src/library/library_4e470.c +++ b/src/library/library_4e470.c @@ -1,4 +1,10 @@ #include +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_4e530.c b/src/library/library_4e530.c index 54d1e547f..97eadbdac 100644 --- a/src/library/library_4e530.c +++ b/src/library/library_4e530.c @@ -1,9 +1,15 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_488e0.h" #include "library/library_49a90.h" #include "library/library_51ec0.h" #include "library/library_52070.h" +#include "types.h" GLOBAL_ASM( glabel func0004e530 diff --git a/src/library/library_4e690.c b/src/library/library_4e690.c index 16f55521d..6f027506a 100644 --- a/src/library/library_4e690.c +++ b/src/library/library_4e690.c @@ -1,9 +1,15 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_04a80.h" #include "library/library_4a5e0.h" #include "library/library_4e690.h" #include "library/library_52070.h" +#include "types.h" GLOBAL_ASM( glabel func0004e690 diff --git a/src/library/library_4f350.c b/src/library/library_4f350.c index dda357383..aa12e7493 100644 --- a/src/library/library_4f350.c +++ b/src/library/library_4f350.c @@ -1,8 +1,14 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_48650.h" #include "library/library_4a810.h" #include "library/library_4a980.h" +#include "types.h" GLOBAL_ASM( glabel func0004f350 diff --git a/src/library/library_4f400.c b/src/library/library_4f400.c index 1fbdf5b7e..3fd3a3b6b 100644 --- a/src/library/library_4f400.c +++ b/src/library/library_4f400.c @@ -1,8 +1,14 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_48650.h" #include "library/library_4a810.h" #include "library/library_4f400.h" +#include "types.h" GLOBAL_ASM( glabel func0004f400 diff --git a/src/library/library_4f5e0.c b/src/library/library_4f5e0.c index f7c61d83e..08cf2231b 100644 --- a/src/library/library_4f5e0.c +++ b/src/library/library_4f5e0.c @@ -1,5 +1,10 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_04790.h" #include "library/library_16110.h" #include "library/library_48650.h" @@ -9,6 +14,7 @@ #include "library/library_4cde0.h" #include "library/library_4f5e0.h" #include "library/library_51d50.h" +#include "types.h" GLOBAL_ASM( glabel func0004f5e0 diff --git a/src/library/library_4fe20.c b/src/library/library_4fe20.c index 0c01abb5c..6711fcb39 100644 --- a/src/library/library_4fe20.c +++ b/src/library/library_4fe20.c @@ -1,7 +1,13 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_4a360.h" #include "library/library_4fe20.h" +#include "types.h" GLOBAL_ASM( glabel func0004fe20 diff --git a/src/library/library_4fff0.c b/src/library/library_4fff0.c index 2c165c52f..e552c3d9a 100644 --- a/src/library/library_4fff0.c +++ b/src/library/library_4fff0.c @@ -1,6 +1,12 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_4a360.h" +#include "types.h" GLOBAL_ASM( glabel func0004fff0 diff --git a/src/library/library_50090.c b/src/library/library_50090.c index a050335c1..58a3cb2da 100644 --- a/src/library/library_50090.c +++ b/src/library/library_50090.c @@ -1,7 +1,13 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_4a360.h" #include "library/library_50090.h" +#include "types.h" GLOBAL_ASM( glabel func00050090 diff --git a/src/library/library_50130.c b/src/library/library_50130.c index 779e23a04..50a85a5f1 100644 --- a/src/library/library_50130.c +++ b/src/library/library_50130.c @@ -1,9 +1,15 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_48650.h" #include "library/library_4a810.h" #include "library/library_4ba90.h" #include "library/library_50130.h" +#include "types.h" GLOBAL_ASM( glabel func00050130 @@ -248,4 +254,4 @@ glabel func000503f0 /* 50474: 03e00008 */ jr $ra /* 50478: 00000000 */ sll $zero,$zero,0x0 /* 5047c: 00000000 */ sll $zero,$zero,0x0 -); \ No newline at end of file +); diff --git a/src/library/library_50480.c b/src/library/library_50480.c index c1edfb6da..c0c902179 100644 --- a/src/library/library_50480.c +++ b/src/library/library_50480.c @@ -1,10 +1,16 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_4b5e0.h" #include "library/library_4ba90.h" #include "library/library_4c090.h" #include "library/library_4cde0.h" #include "library/library_50480.h" +#include "types.h" GLOBAL_ASM( glabel func00050480 diff --git a/src/library/library_50a00.c b/src/library/library_50a00.c index 4d60086a3..173f381d7 100644 --- a/src/library/library_50a00.c +++ b/src/library/library_50a00.c @@ -1,5 +1,10 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_06100.h" #include "library/library_06330.h" #include "library/library_4b170.h" @@ -10,6 +15,7 @@ #include "library/library_4d6f0.h" #include "library/library_50a00.h" #include "library/library_513b0.h" +#include "types.h" GLOBAL_ASM( glabel func00050a00 diff --git a/src/library/library_50f20.c b/src/library/library_50f20.c index ca7809045..d8a42121b 100644 --- a/src/library/library_50f20.c +++ b/src/library/library_50f20.c @@ -1,10 +1,16 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_06330.h" #include "library/library_4ae00.h" #include "library/library_4d6f0.h" #include "library/library_50a00.h" #include "library/library_513b0.h" +#include "types.h" GLOBAL_ASM( glabel func50f20 diff --git a/src/library/library_513b0.c b/src/library/library_513b0.c index 216a13a1f..5bb7d6bd2 100644 --- a/src/library/library_513b0.c +++ b/src/library/library_513b0.c @@ -1,5 +1,10 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_4a810.h" #include "library/library_4b170.h" #include "library/library_4b5e0.h" @@ -9,6 +14,7 @@ #include "library/library_4d6f0.h" #include "library/library_513b0.h" #include "library/library_52360.h" +#include "types.h" GLOBAL_ASM( glabel func000513b0 diff --git a/src/library/library_51880.c b/src/library/library_51880.c index 5241e2b9a..5165bd050 100644 --- a/src/library/library_51880.c +++ b/src/library/library_51880.c @@ -1,4 +1,10 @@ #include +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_51890.c b/src/library/library_51890.c index 80d2980df..5392cbace 100644 --- a/src/library/library_51890.c +++ b/src/library/library_51890.c @@ -1,6 +1,12 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_491b0.h" +#include "types.h" GLOBAL_ASM( glabel func00051890 diff --git a/src/library/library_51900.c b/src/library/library_51900.c index 1775536d0..154f3c39a 100644 --- a/src/library/library_51900.c +++ b/src/library/library_51900.c @@ -1,4 +1,10 @@ #include +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_51a60.c b/src/library/library_51a60.c index 1c187943f..194d6f324 100644 --- a/src/library/library_51a60.c +++ b/src/library/library_51a60.c @@ -1,6 +1,12 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_491b0.h" +#include "types.h" GLOBAL_ASM( glabel func00051a60 diff --git a/src/library/library_51c10.c b/src/library/library_51c10.c index cdbb0b942..fa3f16023 100644 --- a/src/library/library_51c10.c +++ b/src/library/library_51c10.c @@ -1,7 +1,13 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_034f0.h" #include "library/library_491b0.h" +#include "types.h" GLOBAL_ASM( glabel func00051c10 diff --git a/src/library/library_51c60.c b/src/library/library_51c60.c index 13905ba89..bd2159a6d 100644 --- a/src/library/library_51c60.c +++ b/src/library/library_51c60.c @@ -1,4 +1,10 @@ #include +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_51d50.c b/src/library/library_51d50.c index fde70c492..5347392ec 100644 --- a/src/library/library_51d50.c +++ b/src/library/library_51d50.c @@ -1,4 +1,10 @@ #include +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_51ec0.c b/src/library/library_51ec0.c index 48ced6031..27c58b65c 100644 --- a/src/library/library_51ec0.c +++ b/src/library/library_51ec0.c @@ -1,8 +1,14 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_034f0.h" #include "library/library_481e0.h" #include "library/library_491b0.h" +#include "types.h" GLOBAL_ASM( glabel func00051ec0 diff --git a/src/library/library_52070.c b/src/library/library_52070.c index b175b95df..e019c6c69 100644 --- a/src/library/library_52070.c +++ b/src/library/library_52070.c @@ -1,8 +1,14 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_4a5e0.h" #include "library/library_4a680.h" #include "library/library_4ae00.h" +#include "types.h" GLOBAL_ASM( glabel func00052070 diff --git a/src/library/library_52360.c b/src/library/library_52360.c index f6d5f5113..2bfad8276 100644 --- a/src/library/library_52360.c +++ b/src/library/library_52360.c @@ -1,7 +1,13 @@ #include -#include "types.h" +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "library/library_06100.h" #include "library/library_4b5e0.h" +#include "types.h" GLOBAL_ASM( glabel func00052360