mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-13 02:10:57 +00:00
Code Issues Projects Releases Wiki Activity

Remove Variables.h; Decouple z64.h from global.h (#2507)

Browse source 
* progress

* z64.h issues sorted

* remove variables.h

* format

* n64 fix

* another fix

* did the wrong fix

* fix libleo

* fix bss

* review

* remove instead of comment
This commit is contained in:
fig02 2025-04-19 22:04:08 -04:00 • committed by GitHub
parent 655ec77138
commit 2278bcb2c3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
196 changed files with 273 additions and 218 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/boot/driverominit.c
View file

@ -1,4 +1,4 @@
#include "global.h"
#include "ultra64.h"
OSPiHandle __DriveRomHandle;

5
src/boot/idle.c
View file

@ -9,11 +9,12 @@
#include "versions.h"
#include "vi_mode.h"
#include "z64thread.h"
#include "z64dma.h"
#include "global.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" \
"ntsc-1.0:138 ntsc-1.1:138 ntsc-1.2:138 pal-1.0:136 pal-1.1:136"
#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" \
"ntsc-1.0:192 ntsc-1.1:192 ntsc-1.2:192 pal-1.0:192 pal-1.1:192"
OSThread sMainThread;
#if OOT_VERSION < PAL_1_0

2
src/boot/is_debug.c
View file

@ -1,6 +1,6 @@
#include "is_debug.h"
#include "global.h"
#include "ultra64.h"
typedef struct ISVDbg {
/* 0x00 */ u32 magic; // "IS64"

6
src/boot/yaz0.c
View file

@ -1,4 +1,8 @@
#include "global.h"
#include "yaz0.h"
#include "alignment.h"
#include "ultra64.h"
#include "z64dma.h"
#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:0 gc-jp-ce:0 gc-jp-mq:0 gc-us:0 gc-us-mq:0 ntsc-1.2:128" \
"pal-1.1:128"

5
src/boot/z_std_dma.c
View file

@ -39,12 +39,13 @@
#if !PLATFORM_IQUE
#include "yaz0.h"
#endif
#include "z64dma.h"
#include "z64thread.h"
#include "global.h"
#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:0 gc-jp-ce:0 gc-jp-mq:0 gc-us:0 gc-us-mq:0 ntsc-1.2:36" \
"pal-1.0:34 pal-1.1:34"
#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:0 gc-jp-ce:0 gc-jp-mq:0 gc-us:0 gc-us-mq:0 ntsc-1.2:66" \
"pal-1.0:64 pal-1.1:64"
StackEntry sDmaMgrStackInfo;
OSMesgQueue sDmaMgrMsgQueue;