From 6d56b1b8e0410da164f3e5d0d62f4a9d472a1445 Mon Sep 17 00:00:00 2001
From: Dragorn421 <Dragorn421@users.noreply.github.com>
Date: Sat, 24 May 2025 22:20:51 +0200
Subject: Cleanup includes in header files (#2540)

* Cleanup includes in header files

* include libc headers without libc/ prefix

* fix

* fix2

* fix3

* fix4

* some bss lol

* bss

* fix
---
 src/code/TwoHeadArena.c  | 1 +
 src/code/gfxalloc.c      | 3 ++-
 src/code/main.c          | 2 +-
 src/code/z_common_data.c | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/code')

diff --git a/src/code/TwoHeadArena.c b/src/code/TwoHeadArena.c
index 490304a47..23ef69a91 100644
--- a/src/code/TwoHeadArena.c
+++ b/src/code/TwoHeadArena.c
@@ -10,6 +10,7 @@
  * with identical lifetime.
  */
 #include "tha.h"
+#include "alignment.h"
 
 void* THA_GetHead(TwoHeadArena* tha) {
     return tha->head;
diff --git a/src/code/gfxalloc.c b/src/code/gfxalloc.c
index 9e2fe9bb9..3b4d72f05 100644
--- a/src/code/gfxalloc.c
+++ b/src/code/gfxalloc.c
@@ -1,4 +1,5 @@
-#include "gfx.h"
+#include "gfxalloc.h"
+#include "alignment.h"
 
 Gfx* Gfx_Open(Gfx* gfx) {
     return gfx + 1;
diff --git a/src/code/main.c b/src/code/main.c
index cb936b217..9bd722f9c 100644
--- a/src/code/main.c
+++ b/src/code/main.c
@@ -44,7 +44,7 @@ extern struct IrqMgr gIrqMgr;
 #include "z64thread.h"
 
 #pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \
-                               "ique-cn:0 ntsc-1.0:34 ntsc-1.1:34 ntsc-1.2:34 pal-1.0:32 pal-1.1:32"
+                               "ique-cn:0 ntsc-1.0:54 ntsc-1.1:54 ntsc-1.2:54 pal-1.0:52 pal-1.1:52"
 
 extern u8 _buffersSegmentEnd[];
 
diff --git a/src/code/z_common_data.c b/src/code/z_common_data.c
index 97cb44a4f..18bfafbc3 100644
--- a/src/code/z_common_data.c
+++ b/src/code/z_common_data.c
@@ -7,7 +7,7 @@
 #include "z64save.h"
 #include "z64transition.h"
 
-#pragma increment_block_number "gc-eu:192 gc-eu-mq:192 gc-jp:192 gc-jp-ce:192 gc-jp-mq:192 gc-us:192 gc-us-mq:192" \
+#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \
                                "ntsc-1.0:0 ntsc-1.1:0 ntsc-1.2:0 pal-1.0:0 pal-1.1:0"
 
 ALIGNED(16) SaveContext gSaveContext;
-- 
cgit v1.2.3