diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-06-13 20:58:11 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-06-13 20:58:11 -0400 |
| commit | 12b9fcb31fcc990155030fe51b56be7117946a79 (patch) | |
| tree | 7c09c1ddb8ed2b9dcf68df8c06c9da1b0eb30e6e | |
| parent | 791eb4d6148b611c2818a5a80824f2930c82848e (diff) | |
Fix modern debug builds
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | src/battle_main.c | 10 | ||||
| -rw-r--r-- | src/cable_club.c | 4 | ||||
| -rw-r--r-- | src/debug/start_menu_debug.c | 12 |
4 files changed, 20 insertions, 10 deletions
@@ -82,9 +82,7 @@ GCC_VER = $(shell $(CC) -dumpversion) ifeq ($(MODERN),0) LIBDIRS := ../../tools/agbcc/lib else -LIBDIRS := \ - $(TOOLCHAIN)/lib/gcc/arm-none-eabi/$(GCC_VER)/thumb \ - $(TOOLCHAIN)/arm-none-eabi/lib/thumb +LIBDIRS := -L $(shell dirname $(shell $(CC) --print-file-name=libgcc.a)) -L $(shell dirname $(shell $(CC) --print-file-name=libc.a)) endif LDFLAGS := $(LIBDIRS:%=-L %) -lgcc -lc diff --git a/src/battle_main.c b/src/battle_main.c index 040d42ef9..e41b2a114 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -1393,11 +1393,11 @@ void debug_sub_80132C8(u8, void *, u32); extern s16 gUnknown_Debug_2023A76[][35]; extern s16 gUnknown_Debug_2023B02[][6][4]; -extern u8 gUnknown_Debug_03004360; -extern struct Window gUnknown_Debug_03004370; -extern u8 gUnknown_Debug_030043A0; -extern u8 gUnknown_Debug_030043A4; -extern u8 gUnknown_Debug_030043A8; +u8 gUnknown_Debug_03004360; +struct Window gUnknown_Debug_03004370; +u8 gUnknown_Debug_030043A0; +u8 gUnknown_Debug_030043A4; +u8 gUnknown_Debug_030043A8; extern u8 gBattleBuffersTransferData[]; extern const u16 gUnknown_Debug_821F424[][5]; diff --git a/src/cable_club.c b/src/cable_club.c index 115f02d81..aeae50f50 100644 --- a/src/cable_club.c +++ b/src/cable_club.c @@ -975,8 +975,8 @@ void sub_8083C50(u8 taskId) } #if DEBUG -extern u16 unk_3004E94; -extern u32 unk_3004E98; +u16 unk_3004E94; +u32 unk_3004E98; static void debug_sub_808B7A8(u8); diff --git a/src/debug/start_menu_debug.c b/src/debug/start_menu_debug.c index 2f100069d..1501fdd49 100644 --- a/src/debug/start_menu_debug.c +++ b/src/debug/start_menu_debug.c @@ -50,6 +50,18 @@ extern void Debug_SetUpFieldMove_Cut(void); extern void Debug_SetUpFieldMove_SecretPower(void); +#if (ENGLISH && REVISION == 0) +#define TYPE u8 +#else +#define TYPE u32 +#endif + +TYPE gUnknown_Debug_03004BD0; +#if (ENGLISH && REVISION == 0) +TYPE gUnknown_Debug_Murakawa2; +#endif +#undef TYPE + void debug_sub_8076BB4(u8); void DebugMenu_DisplayBuildDate(u8 x, u8 y); void DebugMenu_DisplayContinuousDate(u8 x, u8 y); |