mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-12 01:40:47 +00:00
Code Issues Projects Releases Wiki Activity

Reduce dependencies on global.h (10) (#2490)

Browse source 
* reduce z64.h size

* fix z_cheap_proc.inc.c

* ,bss

* remove temp delcaration
This commit is contained in:
mzxrules 2025-02-26 17:18:30 -05:00 • committed by GitHub
parent 2b30c61a26
commit cf1a39c26f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
116 changed files with 663 additions and 308 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c
View file

@ -32,8 +32,8 @@
#include "assets/objects/object_sst/object_sst.h"
#include "assets/objects/gameplay_keep/gameplay_keep.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 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 ique-cn:128" \
"pal-1.0:128 pal-1.1:128"
#define FLAGS \
(ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \

1
src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c
View file

@ -11,6 +11,7 @@
#include "gfx_setupdl.h"
#include "ichain.h"
#include "regs.h"
#include "sys_matrix.h"
#include "terminal.h"
#include "z64play.h"
#include "z64player.h"

3
src/overlays/actors/ovl_En_Bili/z_en_bili.c
View file

@ -7,8 +7,11 @@
#include "z_en_bili.h"
#include "libc64/qrand.h"
#include "gfx.h"
#include "gfx_setupdl.h"
#include "ichain.h"
#include "rand.h"
#include "segmented_address.h"
#include "sfx.h"
#include "sys_matrix.h"
#include "versions.h"

3
src/overlays/gamestates/ovl_file_choose/z_file_choose.c
View file

@ -7,6 +7,7 @@
#include "gfx_setupdl.h"
#include "letterbox.h"
#include "macros.h"
#include "main.h"
#include "map_select_state.h"
#if PLATFORM_N64
#include "n64dd.h"
@ -20,8 +21,10 @@
#include "sys_matrix.h"
#include "terminal.h"
#include "versions.h"
#include "z_lib.h"
#include "z64audio.h"
#include "z64environment.h"
#include "z64play.h"
#include "z64save.h"
#include "z64skybox.h"
#include "z64sram.h"

2
src/overlays/gamestates/ovl_file_choose/z_file_copy_erase.c
View file

@ -3,12 +3,12 @@
#include "controller.h"
#include "regs.h"
#include "rumble.h"
#include "sfx.h"
#include "z64save.h"
#include "z64sram.h"
#include "macros.h"
#include "global.h"
// In iQue versions, this file contains many workarounds for EGCS internal
// compiler errors (see docs/compilers.md)

1
src/overlays/gamestates/ovl_file_choose/z_file_nameset.c
View file

@ -4,6 +4,7 @@
#include "controller.h"
#include "gfx.h"
#include "gfx_setupdl.h"
#include "regs.h"
#include "rumble.h"
#include "sfx.h"
#include "sys_matrix.h"

3
src/overlays/gamestates/ovl_title/z_title.c
View file

@ -14,10 +14,13 @@
#include "console_logo_state.h"
#include "gfx.h"
#include "gfx_setupdl.h"
#include "padmgr.h"
#include "regs.h"
#include "segment_symbols.h"
#include "sequence.h"
#include "sys_matrix.h"
#include "sys_debug_controller.h"
#include "sys_freeze.h"
#include "title_setup_state.h"
#include "versions.h"
#include "z64actor.h"

8
src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c
View file

@ -1,7 +1,15 @@
#include "z_kaleido_scope.h"
#include "controller.h"
#include "gfx.h"
#include "regs.h"
#include "sfx.h"
#include "z64ocarina.h"
#include "z64play.h"
#include "z64save.h"
#include "global.h"
#include "assets/textures/parameter_static/parameter_static.h"
#include "assets/textures/icon_item_static/icon_item_static.h"

6
src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c
View file

@ -1,5 +1,11 @@
#include "z_kaleido_scope.h"
#include "libu64/gfxprint.h"
#include "controller.h"
#include "gfx.h"
#include "gfx_setupdl.h"
#include "gfxalloc.h"
#include "z64play.h"
#include "z64save.h"
#include "assets/textures/parameter_static/parameter_static.h"

7
src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c
View file

@ -1,5 +1,12 @@
#include "z_kaleido_scope.h"
#include "controller.h"
#include "gfx.h"
#include "gfx_setupdl.h"
#include "regs.h"
#include "sfx.h"
#include "z64play.h"
#include "z64player.h"
#include "z64save.h"
#include "assets/textures/icon_item_static/icon_item_static.h"

7
src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c
View file

@ -1,5 +1,12 @@
#include "z_kaleido_scope.h"
#include "libu64/pad.h"
#include "controller.h"
#include "gfx.h"
#include "gfx_setupdl.h"
#include "regs.h"
#include "sfx.h"
#include "z64play.h"
#include "z64save.h"
#include "assets/textures/parameter_static/parameter_static.h"

8
src/overlays/misc/ovl_kaleido_scope/z_kaleido_map.c
View file

@ -1,9 +1,17 @@
#include "z_kaleido_scope.h"
#include "gfx.h"
#include "gfx_setupdl.h"
#include "map.h"
#include "regs.h"
#include "sfx.h"
#include "sys_ucode.h"
#include "versions.h"
#include "z64play.h"
#include "z64save.h"
#include "global.h"
#include "assets/textures/icon_item_24_static/icon_item_24_static.h"
#if OOT_NTSC
#include "assets/textures/icon_item_jpn_static/icon_item_jpn_static.h"

5
src/overlays/misc/ovl_kaleido_scope/z_kaleido_prompt.c
View file

@ -1,5 +1,10 @@
#include "z_kaleido_scope.h"
#include "libu64/pad.h"
#include "regs.h"
#include "sfx.h"
#include "z64play.h"
static s16 sKaleidoPromptCursorAlphaVals[] = { 100, 255 };
void KaleidoScope_UpdatePrompt(PlayState* play) {

19
src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c
View file

@ -1,13 +1,30 @@
#include "z_kaleido_scope.h"
#include "libc64/sleep.h"
#include "controller.h"
#include "gfx.h"
#include "gfx_setupdl.h"
#include "gfxalloc.h"
#include "map.h"
#if PLATFORM_N64
#include "n64dd.h"
#endif
#include "regs.h"
#include "segment_symbols.h"
#include "segmented_address.h"
#include "seqcmd.h"
#include "sfx.h"
#include "sys_matrix.h"
#include "terminal.h"
#include "title_setup_state.h"
#include "versions.h"
#include "z64audio.h"
#include "z64ocarina.h"
#include "z64play.h"
#include "z64player.h"
#include "z64save.h"
#include "global.h"
#include "assets/textures/icon_item_static/icon_item_static.h"
#include "assets/textures/icon_item_24_static/icon_item_24_static.h"
#if OOT_NTSC
@ -20,7 +37,7 @@
#endif
#include "assets/textures/icon_item_gameover_static/icon_item_gameover_static.h"
#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 ntsc-1.0:128 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:128 pal-1.1:128"
#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 ntsc-1.0:0 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:0 pal-1.1:0"
#if !PLATFORM_GC
#define KALEIDO_PROMPT_CURSOR_R 100

33
src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h
View file

@ -2,8 +2,11 @@
#define Z_KALEIDO_SCOPE_H
#include "ultra64.h"
#include "global.h"
#include "gfx.h"
#include "z64inventory.h"
#include "z64pause.h"
struct PlayState;
extern u8 gAmmoItems[];
extern s16 gVtxPageMapWorldQuadsWidth[];
@ -166,26 +169,26 @@ typedef enum ItemQuad {
/* 41 */ ITEM_QUAD_MAX
} ItemQuad;
void KaleidoScope_DrawQuestStatus(PlayState* play, GraphicsContext* gfxCtx);
void KaleidoScope_DrawQuestStatus(struct PlayState* play, GraphicsContext* gfxCtx);
s32 KaleidoScope_UpdateQuestStatusPoint(PauseContext* pauseCtx, s32 point);
void KaleidoScope_DrawDebugEditor(PlayState* play);
void KaleidoScope_DrawPlayerWork(PlayState* play);
void KaleidoScope_DrawEquipment(PlayState* play);
void KaleidoScope_DrawDebugEditor(struct PlayState* play);
void KaleidoScope_DrawPlayerWork(struct PlayState* play);
void KaleidoScope_DrawEquipment(struct PlayState* play);
void KaleidoScope_SetCursorPos(PauseContext* pauseCtx, u16 index, Vtx* vtx);
void KaleidoScope_DrawItemSelect(PlayState* play);
void KaleidoScope_UpdateItemEquip(PlayState* play);
void KaleidoScope_DrawDungeonMap(PlayState* play, GraphicsContext* gfxCtx);
void KaleidoScope_DrawWorldMap(PlayState* play, GraphicsContext* gfxCtx);
void KaleidoScope_UpdatePrompt(PlayState* play);
void KaleidoScope_DrawItemSelect(struct PlayState* play);
void KaleidoScope_UpdateItemEquip(struct PlayState* play);
void KaleidoScope_DrawDungeonMap(struct PlayState* play, GraphicsContext* gfxCtx);
void KaleidoScope_DrawWorldMap(struct PlayState* play, GraphicsContext* gfxCtx);
void KaleidoScope_UpdatePrompt(struct PlayState* play);
Gfx* KaleidoScope_QuadTextureIA4(Gfx* gfx, void* texture, s16 width, s16 height, u16 point);
Gfx* KaleidoScope_QuadTextureIA8(Gfx* gfx, void* texture, s16 width, s16 height, u16 point);
void KaleidoScope_MoveCursorToSpecialPos(PlayState* play, u16 specialPos);
void KaleidoScope_MoveCursorToSpecialPos(struct PlayState* play, u16 specialPos);
void KaleidoScope_DrawQuadTextureRGBA32(GraphicsContext* gfxCtx, void* texture, u16 width, u16 height, u16 point);
void KaleidoScope_ProcessPlayerPreRender();
void KaleidoScope_SetupPlayerPreRender(PlayState* play);
void KaleidoScope_DrawCursor(PlayState* play, u16 pageIndex);
void KaleidoScope_UpdateDungeonMap(PlayState* play);
void KaleidoScope_SetupPlayerPreRender(struct PlayState* play);
void KaleidoScope_DrawCursor(struct PlayState* play, u16 pageIndex);
void KaleidoScope_UpdateDungeonMap(struct PlayState* play);
void PauseMapMark_Draw(PlayState* play);
void PauseMapMark_Draw(struct PlayState* play);
#endif

7
src/overlays/misc/ovl_kaleido_scope/z_lmap_mark.c
View file

@ -1,7 +1,14 @@
#if PLATFORM_N64
#include "n64dd.h"
#endif
#include "regs.h"
#include "sys_matrix.h"
#include "z_kaleido_scope.h"
#include "z_lib.h"
#include "z64play.h"
#include "global.h"
#include "assets/textures/parameter_static/parameter_static.h"
typedef struct PauseMapMarkInfo {