diff options
| author | Dragorn421 <Dragorn421@users.noreply.github.com> | 2025-05-24 22:20:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-05-24 16:20:51 -0400 |
| commit | 6d56b1b8e0410da164f3e5d0d62f4a9d472a1445 (patch) | |
| tree | 5bdc14b4d98989cfbdb72c4ccb313a2f3337d587 /src/code | |
| parent | f7073a7837de95ac72a0189c74ffa96335280f12 (diff) | |
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
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/TwoHeadArena.c | 1 | ||||
| -rw-r--r-- | src/code/gfxalloc.c | 3 | ||||
| -rw-r--r-- | src/code/main.c | 2 | ||||
| -rw-r--r-- | src/code/z_common_data.c | 2 |
4 files changed, 5 insertions, 3 deletions
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; |