From ecf65e797ea688c2b25af6993b8e0791ffb8d5e0 Mon Sep 17 00:00:00 2001 From: fig02 Date: Wed, 26 Mar 2025 16:08:10 -0400 Subject: Some functions.h and variables.h work (#2491) * sort fuctions and variables * bss --- src/boot/idle.c | 1 + src/boot/z_locale.c | 1 + src/boot/z_std_dma.c | 4 ++-- src/code/graph.c | 1 + src/code/main.c | 3 ++- src/code/sched.c | 1 + src/code/title_setup.c | 2 ++ src/code/z_camera.c | 2 +- src/code/z_kaleido_scope_call.c | 4 ++-- src/code/z_map_exp.c | 1 + src/code/z_play.c | 2 +- src/code/z_prenmi.c | 1 + 12 files changed, 16 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/boot/idle.c b/src/boot/idle.c index be4c9f7cb..e24ab4ede 100644 --- a/src/boot/idle.c +++ b/src/boot/idle.c @@ -5,6 +5,7 @@ #include "stackcheck.h" #include "terminal.h" #include "versions.h" +#include "vi_mode.h" #include "z64thread.h" #include "global.h" diff --git a/src/boot/z_locale.c b/src/boot/z_locale.c index f54be014b..46d65042d 100644 --- a/src/boot/z_locale.c +++ b/src/boot/z_locale.c @@ -5,6 +5,7 @@ #include "region.h" #include "terminal.h" #include "versions.h" +#include "vi_mode.h" #include "z_locale.h" #include "macros.h" diff --git a/src/boot/z_std_dma.c b/src/boot/z_std_dma.c index 7cbf00994..e8581b6a5 100644 --- a/src/boot/z_std_dma.c +++ b/src/boot/z_std_dma.c @@ -35,8 +35,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" \ - "ntsc-1.2:12 pal-1.0:10 pal-1.1:10" +#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:20" \ + "pal-1.0:18 pal-1.1:18" StackEntry sDmaMgrStackInfo; OSMesgQueue sDmaMgrMsgQueue; diff --git a/src/code/graph.c b/src/code/graph.c index 4fc7a56ac..a20c64e1f 100644 --- a/src/code/graph.c +++ b/src/code/graph.c @@ -21,6 +21,7 @@ #include "title_setup_state.h" #include "ucode_disas.h" #include "versions.h" +#include "vi_mode.h" #include "z_game_dlftbls.h" #include "z64audio.h" #include "z64save.h" diff --git a/src/code/main.c b/src/code/main.c index 8a52882d0..fffc72194 100644 --- a/src/code/main.c +++ b/src/code/main.c @@ -16,6 +16,7 @@ extern struct IrqMgr gIrqMgr; #include "audiomgr.h" #include "debug_arena.h" #include "fault.h" +#include "gfx.h" #include "padmgr.h" #include "prenmi_buff.h" #include "regs.h" @@ -34,7 +35,7 @@ extern struct IrqMgr gIrqMgr; #include "global.h" #pragma increment_block_number "gc-eu:32 gc-eu-mq:32 gc-jp:32 gc-jp-ce:32 gc-jp-mq:32 gc-us:32 gc-us-mq:32 ique-cn:32" \ - "ntsc-1.0:13 ntsc-1.1:13 ntsc-1.2:13 pal-1.0:11 pal-1.1:11" + "ntsc-1.0:6 ntsc-1.1:6 ntsc-1.2:6 pal-1.0:4 pal-1.1:4" extern u8 _buffersSegmentEnd[]; diff --git a/src/code/sched.c b/src/code/sched.c index 4fb5a3376..561a28370 100644 --- a/src/code/sched.c +++ b/src/code/sched.c @@ -47,6 +47,7 @@ #include "sched.h" #include "speed_meter.h" #include "versions.h" +#include "vi_mode.h" #include "z64thread.h" #include "macros.h" diff --git a/src/code/title_setup.c b/src/code/title_setup.c index ba259e72a..cf736cf8e 100644 --- a/src/code/title_setup.c +++ b/src/code/title_setup.c @@ -1,6 +1,8 @@ #include "console_logo_state.h" #include "setup_state.h" +#include "z64save.h" + #include "global.h" void Setup_InitImpl(SetupState* this) { diff --git a/src/code/z_camera.c b/src/code/z_camera.c index 79516f017..8582519cd 100644 --- a/src/code/z_camera.c +++ b/src/code/z_camera.c @@ -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:95 ntsc-1.1:95 ntsc-1.2:95 pal-1.0:93 pal-1.1:93" + "ique-cn:128 ntsc-1.0:102 ntsc-1.1:102 ntsc-1.2:102 pal-1.0:100 pal-1.1:100" s32 Camera_KeepOn4(Camera* camera) { static Vec3f D_8015BD50; diff --git a/src/code/z_kaleido_scope_call.c b/src/code/z_kaleido_scope_call.c index cacd46abe..2803e5299 100644 --- a/src/code/z_kaleido_scope_call.c +++ b/src/code/z_kaleido_scope_call.c @@ -1,5 +1,5 @@ -#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:144 ntsc-1.1:144 ntsc-1.2:144 pal-1.0:144 pal-1.1:144" +#pragma increment_block_number "gc-eu:144 gc-eu-mq:144 gc-jp:144 gc-jp-ce:144 gc-jp-mq:144 gc-us:144 gc-us-mq:144" \ + "ique-cn:144 ntsc-1.0:144 ntsc-1.1:144 ntsc-1.2:144 pal-1.0:144 pal-1.1:144" #include "libu64/debug.h" #include "kaleido_manager.h" diff --git a/src/code/z_map_exp.c b/src/code/z_map_exp.c index 78371084b..3283cd62f 100644 --- a/src/code/z_map_exp.c +++ b/src/code/z_map_exp.c @@ -9,6 +9,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "terminal.h" +#include "z64map_mark.h" #include "z64play.h" #include "z64player.h" #include "z64save.h" diff --git a/src/code/z_play.c b/src/code/z_play.c index 13ce98451..cc041ecaf 100644 --- a/src/code/z_play.c +++ b/src/code/z_play.c @@ -40,7 +40,7 @@ #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 ique-cn:0" \ - "ntsc-1.0:224 ntsc-1.1:224 ntsc-1.2:224 pal-1.0:224 pal-1.1: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; diff --git a/src/code/z_prenmi.c b/src/code/z_prenmi.c index bda115d46..f232fca10 100644 --- a/src/code/z_prenmi.c +++ b/src/code/z_prenmi.c @@ -4,6 +4,7 @@ #include "regs.h" #include "terminal.h" #include "versions.h" +#include "vi_mode.h" #include "macros.h" #include "global.h" -- cgit v1.2.3