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

variables.h: migrate all remaining varaibles, remove other dependencies except z64.h (#2505)

Browse source 
* move remaining variables from variables.h

* fix other dependencies

* extra newline

* fix and adjust comment

* is this the problem

* fix bss
This commit is contained in:
fig02 2025-04-16 08:22:42 -04:00 • committed by GitHub
parent 0c5282ba66
commit 655ec77138
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
35 changed files with 92 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/boot/boot_main.c
View file

@ -1,7 +1,9 @@
#include "boot.h"
#include "carthandle.h"
#include "idle.h"
#include "is_debug.h"
#include "segment_symbols.h"
#include "stack.h"
#include "stackcheck.h"
#if PLATFORM_N64

2
src/boot/build.c
View file

@ -1,3 +1,5 @@
#include "build.h"
#include "versions.h"
const char gBuildCreator[] = BUILD_CREATOR;

2
src/boot/carthandle.c
View file

@ -1,3 +1,3 @@
#include "ultra64.h"
#include "carthandle.h"
OSPiHandle* gCartHandle = NULL;

9
src/boot/cic6105.c
View file

@ -1,10 +1,13 @@
#pragma increment_block_number "ntsc-1.2:0"
#include "global.h"
#pragma increment_block_number "ntsc-1.0:132 ntsc-1.1:132 ntsc-1.2:132 pal-1.0:132 pal-1.1:132"
#include "audiomgr.h"
#include "build.h"
#include "cic6105.h"
#include "fault.h"
#include "regs.h"
#include "sched.h"
#include "fault.h"
#include "global.h"
s32 func_80001714(void);

1
src/boot/idle.c
View file

@ -1,4 +1,5 @@
#include "buffers.h"
#include "build.h"
#include "idle.h"
#include "main.h"
#include "segment_symbols.h"

4
src/boot/viconfig.c
View file

@ -1,5 +1,7 @@
#include "global.h"
#include "terminal.h"
#include "idle.h"
#include "global.h"
s8 D_80009430 = 1;
vu8 gViConfigBlack = true;

1
src/boot/z_locale.c
View file

@ -1,5 +1,6 @@
#include "libu64/debug.h"
#include "alignment.h"
#include "carthandle.h"
#include "line_numbers.h"
#include "padmgr.h"
#include "region.h"

6
src/boot/z_std_dma.c
View file

@ -22,7 +22,9 @@
#include "libc64/sprintf.h"
#include "libu64/debug.h"
#include "attributes.h"
#include "carthandle.h"
#include "fault.h"
#include "idle.h"
#if PLATFORM_IQUE
#include "inflate.h"
#endif
@ -41,8 +43,8 @@
#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:22" \
"pal-1.0:20 pal-1.1:20"
#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"
StackEntry sDmaMgrStackInfo;
OSMesgQueue sDmaMgrMsgQueue;