mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-06-05 19:28:09 -04:00
Code Issues Packages 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
35 changed files with 92 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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:96 gc-eu-mq:96 gc-eu-mq-dbg:96 gc-jp:96 gc-jp-ce:96 gc-jp-mq:96 gc-us:96" \
"gc-us-mq:96 ique-cn:96"
#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"
#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:88 ntsc-1.1:88 ntsc-1.2:88 pal-1.0:86 pal-1.1:86"
#pragma increment_block_number "ntsc-1.0:108 ntsc-1.1:108 ntsc-1.2:108 pal-1.0:108 pal-1.1:108"
typedef struct FaultMgr {
OSThread thread;
src/code/game.c
+2 -1
View File
@@ -1,4 +1,5 @@
#include "libc64/malloc.h"
#include "libc64/os_malloc.h"
#include "libu64/debug.h"
#include "libu64/gfxprint.h"
#include "audiomgr.h"
@@ -8,7 +9,7 @@
#include "gfx.h"
#include "gfxalloc.h"
#include "fault.h"
#include "libc64/os_malloc.h"
#include "idle.h"
#include "line_numbers.h"
#if PLATFORM_N64
#include "n64dd.h"
src/code/main.c
+3 -1
View File
@@ -23,9 +23,11 @@ extern struct IrqMgr gIrqMgr;
#include "debug_arena.h"
#include "fault.h"
#include "gfx.h"
#include "idle.h"
#include "padmgr.h"
#include "prenmi_buff.h"
#include "regs.h"
#include "segment_symbols.h"
#include "segmented_address.h"
#include "stack.h"
#include "stackcheck.h"
@@ -41,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:51 ntsc-1.1:51 ntsc-1.2:51 pal-1.0:49 pal-1.1:49"
"ique-cn:0 ntsc-1.0:56 ntsc-1.1:56 ntsc-1.2:56 pal-1.0:54 pal-1.1:54"
extern u8 _buffersSegmentEnd[];
src/code/object_table.c
+6 -1
View File
@@ -1,4 +1,9 @@
#include "global.h"
#include "segment_symbols.h"
#include "romfile.h"
#include "ultra64.h"
#include "z64object.h"
#include "macros.h"
s16 gLinkObjectIds[] = { OBJECT_LINK_BOY, OBJECT_LINK_CHILD };
src/code/z_bgcheck.c
+1 -1
View File
@@ -11,7 +11,7 @@
#include "z64player.h"
#include "z64skin_matrix.h"
#pragma increment_block_number "ntsc-1.0:160 ntsc-1.1:160 ntsc-1.2:160"
#pragma increment_block_number "ntsc-1.0:152 ntsc-1.1:152 ntsc-1.2:152"
u16 DynaSSNodeList_GetNextNodeIdx(DynaSSNodeList* nodeList);
void BgCheck_GetStaticLookupIndicesFromPos(CollisionContext* colCtx, Vec3f* pos, Vec3i* sector);
src/code/z_camera.c
+2 -2
View File
@@ -24,7 +24,7 @@
#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:192 ntsc-1.1:192 ntsc-1.2:192 pal-1.0:192 pal-1.1:192"
"ique-cn:192 ntsc-1.0:0 ntsc-1.1:0 ntsc-1.2:0 pal-1.0:0 pal-1.1:0"
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:106 ntsc-1.1:106 ntsc-1.2:106 pal-1.0:104 pal-1.1:104"
"ique-cn:128 ntsc-1.0:70 ntsc-1.1:70 ntsc-1.2:70 pal-1.0:70 pal-1.1:70"
s32 Camera_KeepOn4(Camera* camera) {
static Vec3f D_8015BD50;
src/code/z_collision_check.c
+1 -1
View File
@@ -16,7 +16,7 @@
#include "z_lib.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:176 ntsc-1.1:176 ntsc-1.2:176 pal-1.0:176 pal-1.1:176"
"ique-cn:192 ntsc-1.0:168 ntsc-1.1:168 ntsc-1.2:168 pal-1.0:168 pal-1.1:168"
typedef s32 (*ColChkResetFunc)(PlayState*, Collider*);
typedef void (*ColChkApplyFunc)(PlayState*, CollisionCheckContext*, Collider*);
src/code/z_effect_soft_sprite_dlftbls.c
+2 -1
View File
@@ -1,4 +1,5 @@
#include "global.h"
#include "segment_symbols.h"
#include "z64effect.h"
// Linker symbol declarations (used in the table below)
#define DEFINE_EFFECT_SS(name, _1) DECLARE_OVERLAY_SEGMENT(name)
src/code/z_kaleido_scope_call.c
+2 -2
View File
@@ -1,5 +1,5 @@
#pragma increment_block_number "gc-eu:133 gc-eu-mq:133 gc-jp:135 gc-jp-ce:135 gc-jp-mq:135 gc-us:135 gc-us-mq:135" \
"ique-cn:125 ntsc-1.0:144 ntsc-1.1:144 ntsc-1.2:144 pal-1.0:142 pal-1.1:142"
#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"
#include "libu64/debug.h"
#include "kaleido_manager.h"
src/code/z_kankyo.c
+1 -1
View File
@@ -236,7 +236,7 @@ s16 sSunDepthTestX;
s16 sSunDepthTestY;
#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:192 ntsc-1.1:192 ntsc-1.2:192 pal-1.0:192 pal-1.1:192"
"ique-cn:160 ntsc-1.0:192 ntsc-1.1:192 ntsc-1.2:192 pal-1.0:192 pal-1.1:192"
LightNode* sNGameOverLightNode;
LightInfo sNGameOverLightInfo;
src/code/z_map_exp.c
+1
View File
@@ -6,6 +6,7 @@
#include "n64dd.h"
#endif
#include "regs.h"
#include "segment_symbols.h"
#include "sfx.h"
#include "sys_matrix.h"
#include "terminal.h"
src/code/z_message.c
+1 -1
View File
@@ -25,7 +25,7 @@
#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:96 ntsc-1.1:96 ntsc-1.2:96 pal-1.0:128 pal-1.1:128"
"ntsc-1.0:112 ntsc-1.1:112 ntsc-1.2:112 pal-1.0:128 pal-1.1:128"
#if !PLATFORM_IQUE
#define MSG_BUF_DECODED (msgCtx->msgBufDecoded)
src/code/z_play.c
+2 -2
View File
@@ -44,8 +44,8 @@
#include "global.h"
#pragma increment_block_number "gc-eu:64 gc-eu-mq:64 gc-jp:64 gc-jp-ce:64 gc-jp-mq:64 gc-us:64 gc-us-mq:64 ique-cn:64" \
"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: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"
TransitionTile gTransitionTile;
s32 gTransitionTileState;
src/code/z_vr_box.c
+3 -1
View File
@@ -1,8 +1,10 @@
#include "global.h"
#include "segment_symbols.h"
#include "terminal.h"
#include "z64environment.h"
#include "z64save.h"
#include "global.h"
typedef struct SkyboxFaceParams {
/* 0x000 */ s32 xStart;
/* 0x004 */ s32 yStart;