mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-05-31 01:15:53 -04:00
Code Issues Packages 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
196 changed files with 273 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/TwoHeadArena.c
+1 -1
View File
@@ -9,7 +9,7 @@
* is to reset the entire arena, deallocating everything. This scheme is most applicable to allocating similar data
* with identical lifetime.
*/
#include "global.h"
#include "tha.h"
void* THA_GetHead(TwoHeadArena* tha) {
return tha->head;
src/code/audio_stop_all_sfx.c
+4 -1
View File
@@ -1,4 +1,7 @@
#include "global.h"
#include "sfx.h"
#include "ultra64.h"
#include "macros.h"
u8 sSfxBankIds[] = {
BANK_PLAYER, BANK_ITEM, BANK_ENV, BANK_ENEMY, BANK_SYSTEM, BANK_OCARINA, BANK_VOICE,
src/code/fault_gc.c
+2 -2
View File
@@ -41,8 +41,8 @@
* DPad-Down disables sending fault pages over osSyncPrintf.
*/
#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-eu-mq-dbg:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128" \
"gc-us-mq:128 ique-cn:128"
#pragma increment_block_number "gc-eu:192 gc-eu-mq:192 gc-eu-mq-dbg:192 gc-jp:192 gc-jp-ce:192 gc-jp-mq:192 gc-us:192" \
"gc-us-mq:192 ique-cn:192"
#include "libc64/sleep.h"
#include "libc64/sprintf.h"
src/code/fault_n64.c
+1 -1
View File
@@ -12,7 +12,7 @@
#include "global.h"
#pragma increment_block_number "ntsc-1.0:108 ntsc-1.1:108 ntsc-1.2:108 pal-1.0:108 pal-1.1:108"
#pragma increment_block_number "ntsc-1.0:176 ntsc-1.1:176 ntsc-1.2:176 pal-1.0:176 pal-1.1:176"
typedef struct FaultMgr {
OSThread thread;
src/code/game.c
+1
View File
@@ -26,6 +26,7 @@
#include "z64debug.h"
#include "z64dma.h"
#include "z64game.h"
#include "z64play.h"
#include "z64vis.h"
#include "macros.h"
src/code/gfxalloc.c
+1 -1
View File
@@ -1,4 +1,4 @@
#include "global.h"
#include "gfx.h"
Gfx* Gfx_Open(Gfx* gfx) {
return gfx + 1;
src/code/graph.c
+1 -1
View File
@@ -35,7 +35,7 @@
#define GFXPOOL_TAIL_MAGIC 0x5678
#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 ique-cn:128" \
"ntsc-1.0:96 ntsc-1.1:96 ntsc-1.2:96 pal-1.0:96 pal-1.1:96"
"ntsc-1.0:0 ntsc-1.1:0 ntsc-1.2:0 pal-1.0:0 pal-1.1:0"
/**
* The time at which the previous `Graph_Update` ended.
src/code/main.c
+1 -1
View File
@@ -43,7 +43,7 @@ extern struct IrqMgr gIrqMgr;
#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" \
"ique-cn:0 ntsc-1.0:56 ntsc-1.1:56 ntsc-1.2:56 pal-1.0:54 pal-1.1:54"
"ique-cn:0 ntsc-1.0:35 ntsc-1.1:35 ntsc-1.2:35 pal-1.0:33 pal-1.1:33"
extern u8 _buffersSegmentEnd[];
src/code/z_actor.c
+1
View File
@@ -17,6 +17,7 @@
#include "z_lib.h"
#include "zelda_arena.h"
#include "z64actor.h"
#include "z64audio.h"
#include "z64effect.h"
#include "z64light.h"
#include "z64horse.h"
src/code/z_bg_collect.c
+5 -1
View File
@@ -1,5 +1,9 @@
#include "global.h"
#include "terminal.h"
#include "ultra64.h"
#include "z64actor.h"
#include "z64bgcheck.h"
#include "z64player.h"
#include "z64skin_matrix.h"
/**
* Update the `carriedActor`'s position based on the dynapoly actor identified by `bgId`.
src/code/z_camera.c
+3 -3
View File
@@ -23,8 +23,8 @@
#include "z64save.h"
#include "overlays/actors/ovl_En_Horse/z_en_horse.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" \
"ique-cn:192 ntsc-1.0:0 ntsc-1.1:0 ntsc-1.2:0 pal-1.0:0 pal-1.1:0"
#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:128 ntsc-1.0:128 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:128 pal-1.1:128"
s16 Camera_RequestSettingImpl(Camera* camera, s16 requestedSetting, s16 flags);
s32 Camera_RequestModeImpl(Camera* camera, s16 requestedMode, u8 forceModeChange);
@@ -3658,7 +3658,7 @@ s32 Camera_KeepOn3(Camera* camera) {
}
#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:128 ntsc-1.0:70 ntsc-1.1:70 ntsc-1.2:70 pal-1.0:70 pal-1.1:70"
"ique-cn:128 ntsc-1.0:128 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:128 pal-1.1:128"
s32 Camera_KeepOn4(Camera* camera) {
static Vec3f D_8015BD50;
src/code/z_collision_btltbls.c
+2 -1
View File
@@ -1,4 +1,5 @@
#include "global.h"
#include "z64collision_check.h"
#include "macros.h"
static DamageTable sDamageTablePresets[] = {
{ {
src/code/z_demo.c
+4 -3
View File
@@ -1,5 +1,5 @@
#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 ique-cn:0" \
"ntsc-1.0:0 ntsc-1.1:0 ntsc-1.2:0 pal-1.0:0 pal-1.1:0"
#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:128 ntsc-1.0:0 ntsc-1.1:0 ntsc-1.2:0 pal-1.0:0 pal-1.1:0"
#include "global.h"
#include "libu64/gfxprint.h"
#include "controller.h"
@@ -22,6 +22,7 @@
#include "z64camera.h"
#include "z64cutscene.h"
#include "z64cutscene_flags.h"
#include "z64ocarina.h"
#include "z64play.h"
#include "z64player.h"
#include "z64save.h"
@@ -146,7 +147,7 @@ u16 gCamEyePointAppliedFrame;
u16 gCamAtPointAppliedFrame;
#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:128 ntsc-1.0:0 ntsc-1.1:0 ntsc-1.2:0 pal-1.0:0 pal-1.1:0"
"ique-cn:128 ntsc-1.0:128 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:128 pal-1.1:128"
// Cam ID to return to when a scripted cutscene is finished
s16 sReturnToCamId;
src/code/z_eff_blure.c
+1
View File
@@ -10,6 +10,7 @@
#include "macros.h"
#include "global.h"
#include "z64.h" // required for gameplay keep, the header doesnt include any external dependencies
#include "assets/objects/gameplay_keep/gameplay_keep.h"
void EffectBlure_AddVertex(EffectBlure* this, Vec3f* p1, Vec3f* p2) {
src/code/z_kaleido_scope_call.c
+2 -2
View File
@@ -1,5 +1,5 @@
#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 ique-cn:0" \
"ntsc-1.0:0 ntsc-1.1:0 ntsc-1.2:0 pal-1.0:0 pal-1.1:0"
#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 ique-cn:80" \
"ntsc-1.0:96 ntsc-1.1:96 ntsc-1.2:96 pal-1.0:96 pal-1.1:96"
#include "libu64/debug.h"
#include "kaleido_manager.h"
src/code/z_message.c
+2 -2
View File
@@ -24,8 +24,8 @@
#include "assets/textures/parameter_static/parameter_static.h"
#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \
"ntsc-1.0:112 ntsc-1.1:112 ntsc-1.2:112 pal-1.0:128 pal-1.1:128"
#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.0:32" \
"ntsc-1.1:32 ntsc-1.2:32 pal-1.0:128 pal-1.1:128"
#if !PLATFORM_IQUE
#define MSG_BUF_DECODED (msgCtx->msgBufDecoded)
src/code/z_play.c
+3 -2
View File
@@ -32,6 +32,7 @@
#include "versions.h"
#include "z_actor_dlftbls.h"
#include "zelda_arena.h"
#include "z64audio.h"
#include "z64cutscene_flags.h"
#include "z64debug_display.h"
#include "z64effect.h"
@@ -44,8 +45,8 @@
#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" \
"ique-cn:96 ntsc-1.0:240 ntsc-1.1:240 ntsc-1.2:240 pal-1.0:240 pal-1.1:240"
#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 ique-cn:224" \
"ntsc-1.0:240 ntsc-1.1:240 ntsc-1.2:240 pal-1.0:240 pal-1.1:240"
TransitionTile gTransitionTile;
s32 gTransitionTileState;
src/code/z_sfx_source.c
+4
View File
@@ -1,5 +1,9 @@
#include "z64sfx_source.h"
#include "sfx.h"
#include "z64play.h"
#include "z64skin_matrix.h"
#include "global.h"
void SfxSource_InitAll(PlayState* play) {
src/code/z_sram.c
+3
View File
@@ -3,8 +3,11 @@
#include "memory_utils.h"
#include "terminal.h"
#include "versions.h"
#include "z64audio.h"
#include "z64game.h"
#include "z64interface.h"
#include "z64message.h"
#include "z64ocarina.h"
#include "z64save.h"
#include "z64scene.h"
#include "z64sram.h"
src/code/z_vr_box.c
+5
View File
@@ -1,6 +1,11 @@
#include "z64skybox.h"
#include "segment_symbols.h"
#include "terminal.h"
#include "ultra64.h"
#include "z64environment.h"
#include "z64game.h"
#include "z64play.h"
#include "z64save.h"
#include "global.h"