From d702f188c6f3c9efd6a7ce1c1225864dfeb9c27e Mon Sep 17 00:00:00 2001 From: Gregory Heskett Date: Tue, 24 Jan 2023 09:19:53 -0500 Subject: [PATCH] Bugfix: Stack sizes moved to main.h (#573) Crash screen does not enjoy importing buffers/buffers.h --- src/buffers/buffers.h | 8 +------- src/game/crash_screen.c | 1 - src/game/main.h | 7 +++++++ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/buffers/buffers.h b/src/buffers/buffers.h index 82b54b4e..064dac6b 100644 --- a/src/buffers/buffers.h +++ b/src/buffers/buffers.h @@ -6,15 +6,9 @@ #include "game/save_file.h" #include "game/game_init.h" +#include "game/main.h" #include "config.h" -#define THREAD1_STACK 0x100 -#define THREAD2_STACK 0x800 -#define THREAD3_STACK 0x200 -#define THREAD4_STACK 0x2000 -#define THREAD5_STACK 0x2000 -#define THREAD6_STACK 0x400 - extern u8 gDecompressionHeap[]; extern u8 gAudioHeap[]; diff --git a/src/game/crash_screen.c b/src/game/crash_screen.c index 3690b32f..b7fccab4 100644 --- a/src/game/crash_screen.c +++ b/src/game/crash_screen.c @@ -11,7 +11,6 @@ #include "main.h" #include "debug.h" #include "rumble_init.h" -#include "buffers/buffers.h" #include "sm64.h" diff --git a/src/game/main.h b/src/game/main.h index 6811047f..ccd41796 100644 --- a/src/game/main.h +++ b/src/game/main.h @@ -3,6 +3,13 @@ #include "config.h" +#define THREAD1_STACK 0x100 +#define THREAD2_STACK 0x800 +#define THREAD3_STACK 0x200 +#define THREAD4_STACK 0x2000 +#define THREAD5_STACK 0x2000 +#define THREAD6_STACK 0x400 + enum ThreadID { THREAD_0, THREAD_1_IDLE,