mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-04 06:54:33 +00:00
Code Issues Projects Releases Wiki Activity

[headers 8] Add main.h, segmented_address.h, and changes for main.c symbols (#2151)

Browse source 
* [headers 8] Add main.h and changes for main.c symbols

* fix gSystemHeapSize is size_t only in MM

* segmented_address.h

* rm now useless include

* actually commit segmented_address.h, oops

* rm gGraphThread (faulty copypaste from MM)

* bss
This commit is contained in:
Dragorn421 2024-09-07 22:55:06 +02:00 • committed by GitHub
parent 27533a1507
commit 277ce1c0d3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 46 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/code/fault_gc.c
View file

@ -42,7 +42,7 @@
*/
#if PLATFORM_GC
#pragma increment_block_number "gc-eu:224 gc-eu-mq:224 gc-eu-mq-dbg:208 gc-jp:224 gc-jp-ce:224 gc-jp-mq:224 gc-us:224" \
#pragma increment_block_number "gc-eu:208 gc-eu-mq:208 gc-eu-mq-dbg:208 gc-jp:224 gc-jp-ce:224 gc-jp-mq:224 gc-us:224" \
"gc-us-mq:224"
#include "global.h"

20
src/code/main.c
View file

@ -1,3 +1,16 @@
#include "ultra64.h"
#pragma increment_block_number "gc-eu:80 gc-eu-mq:80 gc-jp:80 gc-jp-ce:80 gc-jp-mq:80 gc-us:80 gc-us-mq:80"
struct PreNmiBuff* gAppNmiBufferPtr;
#include "segmented_address.h"
struct Scheduler gScheduler;
struct PadMgr gPadMgr;
struct IrqMgr gIrqMgr;
uintptr_t gSegments[NUM_SEGMENTS];
#include "global.h"
#include "fault.h"
#include "stack.h"
@ -14,13 +27,6 @@ s32 gScreenWidth = SCREEN_WIDTH;
s32 gScreenHeight = SCREEN_HEIGHT;
u32 gSystemHeapSize = 0;
#pragma increment_block_number "gc-eu:208 gc-eu-mq:208 gc-jp:208 gc-jp-ce:208 gc-jp-mq:208 gc-us:208 gc-us-mq:208"
PreNmiBuff* gAppNmiBufferPtr;
Scheduler gScheduler;
PadMgr gPadMgr;
IrqMgr gIrqMgr;
uintptr_t gSegments[NUM_SEGMENTS];
OSThread sGraphThread;
STACK(sGraphStack, 0x1800);
STACK(sSchedStack, 0x600);

2
src/code/sys_math3d.c
View file

@ -5,7 +5,7 @@
#include "macros.h"
#include "sys_math3d.h"
#pragma increment_block_number "gc-eu:106 gc-eu-mq:106 gc-jp:106 gc-jp-ce:106 gc-jp-mq:106 gc-us:106 gc-us-mq:106"
#pragma increment_block_number "gc-eu:105 gc-eu-mq:105 gc-jp:105 gc-jp-ce:105 gc-jp-mq:105 gc-us:105 gc-us-mq:105"
s32 Math3D_LineVsLineClosestTwoPoints(Vec3f* lineAPointA, Vec3f* lineAPointB, Vec3f* lineBPointA, Vec3f* lineBPointB,
Vec3f* lineAClosestToB, Vec3f* lineBClosestToA);