diff --git a/ld/gamefiles.inc b/ld/gamefiles.inc index eacdf6f0a..c36ae93bb 100644 --- a/ld/gamefiles.inc +++ b/ld/gamefiles.inc @@ -122,7 +122,8 @@ src/game/padhalllv.o (section); \ src/game/pad.o (section); \ src/game/pak/pak.o (section); \ - src/game/game_11ecf0.o (section); \ + src/game/debug.o (section); \ + src/game/game_11eff0.o (section); \ src/game/data/ailists.o (section); \ src/game/data/data_020df0.o (section); \ src/game/game_11f000.o (section); \ diff --git a/src/game/bondgrab.c b/src/game/bondgrab.c index 02900787e..0a6d37a4a 100644 --- a/src/game/bondgrab.c +++ b/src/game/bondgrab.c @@ -15,7 +15,7 @@ #include "game/game_097ba0.h" #include "game/game_0b63b0.h" #include "game/game_113220.h" -#include "game/game_11ecf0.h" +#include "game/debug.h" #include "game/propobj.h" #include "gvars/gvars.h" #include "lib/lib_04790.h" diff --git a/src/game/bondwalk.c b/src/game/bondwalk.c index 50b4e7afc..1436360ef 100644 --- a/src/game/bondwalk.c +++ b/src/game/bondwalk.c @@ -19,7 +19,7 @@ #include "game/game_0b63b0.h" #include "game/game_111600.h" #include "game/game_113220.h" -#include "game/game_11ecf0.h" +#include "game/debug.h" #include "game/game_127910.h" #include "game/propobj.h" #include "gvars/gvars.h" diff --git a/src/game/chr/chraction.c b/src/game/chr/chraction.c index 939aaf279..30242505c 100644 --- a/src/game/chr/chraction.c +++ b/src/game/chr/chraction.c @@ -25,7 +25,7 @@ #include "game/game_0b3350.h" #include "game/game_0b63b0.h" #include "game/game_111600.h" -#include "game/game_11ecf0.h" +#include "game/debug.h" #include "game/game_127910.h" #include "game/game_129900.h" #include "game/game_12f6c0.h" diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c index dd182fc1b..b72c8dac5 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -29,7 +29,7 @@ #include "game/game_0dcdb0.h" #include "game/game_10ccd0.h" #include "game/game_111600.h" -#include "game/game_11ecf0.h" +#include "game/debug.h" #include "game/game_127910.h" #include "game/game_129900.h" #include "game/game_12d3f0.h" diff --git a/src/game/game_11ecf0.c b/src/game/debug.c similarity index 92% rename from src/game/game_11ecf0.c rename to src/game/debug.c index e63cc9ba0..5bf0174c4 100644 --- a/src/game/game_11ecf0.c +++ b/src/game/debug.c @@ -6,7 +6,7 @@ #include "game/data/data_0160b0.h" #include "game/data/data_01a3a0.h" #include "game/data/data_020df0.h" -#include "game/game_11ecf0.h" +#include "game/debug.h" #include "gvars/gvars.h" #include "types.h" @@ -478,15 +478,7 @@ void debug0f11efd4(void) // empty } -GLOBAL_ASM( -glabel func0f11efdc -/* f11efdc: 03e00008 */ jr $ra -/* f11efe0: afa40000 */ sw $a0,0x0($sp) -/* f11efe4: 00000000 */ sll $zero,$zero,0x0 -/* f11efe8: 00000000 */ sll $zero,$zero,0x0 -/* f11efec: 00000000 */ sll $zero,$zero,0x0 -/* f11eff0: 03e00008 */ jr $ra -/* f11eff4: 00801025 */ or $v0,$a0,$zero -/* f11eff8: 00000000 */ sll $zero,$zero,0x0 -/* f11effc: 00000000 */ sll $zero,$zero,0x0 -); +void debug0f11efdc(s32 arg0) +{ + // empty +} diff --git a/src/game/game_005fd0.c b/src/game/game_005fd0.c index 2ae78abdd..aa0632360 100644 --- a/src/game/game_005fd0.c +++ b/src/game/game_005fd0.c @@ -8,7 +8,7 @@ #include "game/data/data_020df0.h" #include "game/game_005fd0.h" #include "game/game_092610.h" -#include "game/game_11ecf0.h" +#include "game/debug.h" #include "gvars/gvars.h" #include "lib/lib_12dc0.h" #include "lib/lib_16110.h" diff --git a/src/game/game_01e250.c b/src/game/game_01e250.c index 0157ff515..303b682b4 100644 --- a/src/game/game_01e250.c +++ b/src/game/game_01e250.c @@ -21,7 +21,7 @@ #include "game/game_0b3350.h" #include "game/game_0b63b0.h" #include "game/game_0c33f0.h" -#include "game/game_11ecf0.h" +#include "game/debug.h" #include "game/game_127910.h" #include "game/game_128f30.h" #include "game/game_129210.h" diff --git a/src/game/game_095320.c b/src/game/game_095320.c index 46c8f869e..87d4f3255 100644 --- a/src/game/game_095320.c +++ b/src/game/game_095320.c @@ -13,7 +13,7 @@ #include "game/game_0b3350.h" #include "game/game_0dcdb0.h" #include "game/game_111600.h" -#include "game/game_11ecf0.h" +#include "game/debug.h" #include "game/game_127910.h" #include "game/game_167ae0.h" #include "game/game_19c990.h" diff --git a/src/game/game_11eff0.c b/src/game/game_11eff0.c new file mode 100644 index 000000000..eb97dd23c --- /dev/null +++ b/src/game/game_11eff0.c @@ -0,0 +1,15 @@ +#include +#include "constants.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_00e460.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_01a3a0.h" +#include "game/data/data_020df0.h" +#include "gvars/gvars.h" +#include "types.h" + +bool func0f11eff0(s32 arg0) +{ + return arg0; +} diff --git a/src/game/game_157db0.c b/src/game/game_157db0.c index 50c6bec82..129f25c4b 100644 --- a/src/game/game_157db0.c +++ b/src/game/game_157db0.c @@ -15,7 +15,7 @@ #include "game/game_097ba0.h" #include "game/game_0b3350.h" #include "game/game_0b63b0.h" -#include "game/game_11ecf0.h" +#include "game/debug.h" #include "game/game_11f000.h" #include "game/game_135c70.h" #include "game/game_13b670.h" diff --git a/src/game/game_167ae0.c b/src/game/game_167ae0.c index eba0a17b0..30bdd6b5c 100644 --- a/src/game/game_167ae0.c +++ b/src/game/game_167ae0.c @@ -67,7 +67,7 @@ #include "game/game_0fd660.h" #include "game/game_107fb0.h" #include "game/game_10c9c0.h" -#include "game/game_11ecf0.h" +#include "game/debug.h" #include "game/game_11f000.h" #include "game/game_127910.h" #include "game/game_129210.h" diff --git a/src/game/game_190260.c b/src/game/game_190260.c index 7fb68ba74..86c23ff9a 100644 --- a/src/game/game_190260.c +++ b/src/game/game_190260.c @@ -14,7 +14,7 @@ #include "game/game_097ba0.h" #include "game/game_0b0420.h" #include "game/game_0b63b0.h" -#include "game/game_11ecf0.h" +#include "game/debug.h" #include "game/game_127910.h" #include "game/game_157db0.h" #include "game/game_179060.h" diff --git a/src/game/game_197600.c b/src/game/game_197600.c index 16eede710..d21b0b2e5 100644 --- a/src/game/game_197600.c +++ b/src/game/game_197600.c @@ -11,7 +11,7 @@ #include "game/game_097970.h" #include "game/game_0b0420.h" #include "game/game_0fd660.h" -#include "game/game_11ecf0.h" +#include "game/debug.h" #include "game/game_127910.h" #include "game/game_179060.h" #include "game/game_190260.h" diff --git a/src/game/game_1999b0.c b/src/game/game_1999b0.c index 3dde6e1bc..ee333d513 100644 --- a/src/game/game_1999b0.c +++ b/src/game/game_1999b0.c @@ -11,7 +11,7 @@ #include "game/game_092610.h" #include "game/game_097ba0.h" #include "game/game_0b0420.h" -#include "game/game_11ecf0.h" +#include "game/debug.h" #include "game/game_127910.h" #include "game/game_1999b0.h" #include "game/pad.h" diff --git a/src/game/propobj.c b/src/game/propobj.c index 7097a8056..2ed79b260 100644 --- a/src/game/propobj.c +++ b/src/game/propobj.c @@ -35,7 +35,7 @@ #include "game/game_0dcdb0.h" #include "game/game_0f09f0.h" #include "game/game_111600.h" -#include "game/game_11ecf0.h" +#include "game/debug.h" #include "game/game_127910.h" #include "game/game_128f30.h" #include "game/game_129210.h" diff --git a/src/include/game/game_11ecf0.h b/src/include/game/debug.h similarity index 90% rename from src/include/game/game_11ecf0.h rename to src/include/game/debug.h index 82993b4ba..9c9bd53ea 100644 --- a/src/include/game/game_11ecf0.h +++ b/src/include/game/debug.h @@ -1,5 +1,5 @@ -#ifndef IN_GAME_GAME_11ECF0_H -#define IN_GAME_GAME_11ECF0_H +#ifndef IN_GAME_DEBUG_H +#define IN_GAME_DEBUG_H #include #include "types.h" diff --git a/src/lib/lib_0d520.c b/src/lib/lib_0d520.c index 759249479..db8f262f5 100644 --- a/src/lib/lib_0d520.c +++ b/src/lib/lib_0d520.c @@ -30,7 +30,7 @@ #include "game/game_01b0a0.h" #include "game/game_095320.h" #include "game/game_10ccd0.h" -#include "game/game_11ecf0.h" +#include "game/debug.h" #include "game/game_127910.h" #include "game/game_1531a0.h" #include "game/game_166e40.h"