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

Reduce dependencies on global.h (9) (#2488)

Browse source 
* split game states

* split all GameState headers

* match fig names

* deduplicate headers from bad merge

* split z64actor.h into z64actor_profile.h, z_actor_dlftbls.h

* fix compile error

* .bss
This commit is contained in:
mzxrules 2025-02-24 20:55:55 -05:00 • committed by GitHub
parent 70fde8ac3b
commit 2e4c42719b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
48 changed files with 310 additions and 221 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c
View file

@ -24,6 +24,8 @@
#include "assets/objects/object_ddan_objects/object_ddan_objects.h"
#pragma increment_block_number "ntsc-1.0:128 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:128 pal-1.1:128"
#define FLAGS 0
void BgDodoago_Init(Actor* thisx, PlayState* play);

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

@ -1,7 +1,8 @@
#include "file_select_state.h"
#include "file_select.h"
#include "file_select_state.h"
#include "attributes.h"
#include "controller.h"
#include "gfx.h"
#include "gfx_setupdl.h"
#include "letterbox.h"
@ -11,6 +12,8 @@
#include "n64dd.h"
#endif
#include "regs.h"
#include "rumble.h"
#include "segment_symbols.h"
#include "seqcmd.h"
#include "sequence.h"
#include "sfx.h"

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

@ -1,5 +1,5 @@
#include "file_select_state.h"
#include "file_select.h"
#include "file_select_state.h"
#include "controller.h"
#include "regs.h"

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

@ -1,5 +1,5 @@
#include "file_select_state.h"
#include "file_select.h"
#include "file_select_state.h"
#include "controller.h"
#include "gfx.h"

8
src/overlays/gamestates/ovl_opening/z_opening.c
View file

@ -4,11 +4,15 @@
* Description: Initializes the game into the title screen
*/
#include "gfx.h"
#include "regs.h"
#include "sys_matrix.h"
#include "title_setup_state.h"
#include "global.h"
#include "z64game.h"
#include "z64play.h"
#include "z64save.h"
#include "z64sram.h"
#include "z64view.h"
void TitleSetup_SetupTitleScreen(TitleSetupState* this) {
gSaveContext.gameMode = GAMEMODE_TITLE_SCREEN;

14
src/overlays/gamestates/ovl_select/z_select.c
View file

@ -4,21 +4,29 @@
* Description: Debug Scene Select Menu
*/
#include "map_select_state.h"
#include "libc64/qrand.h"
#include "libu64/gfxprint.h"
#include "ultra64.h"
#include "alloca.h"
#include "console_logo_state.h"
#include "controller.h"
#include "gfx.h"
#include "gfx_setupdl.h"
#include "map_select_state.h"
#if PLATFORM_N64
#include "n64dd.h"
#endif
#include "regs.h"
#include "segment_symbols.h"
#include "seqcmd.h"
#include "sequence.h"
#include "sfx.h"
#include "terminal.h"
#include "z64play.h"
#include "z64save.h"
#include "z64sram.h"
#include "global.h"
#include "macros.h"
void MapSelect_LoadTitle(MapSelectState* this) {
this->state.running = false;

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

@ -4,19 +4,28 @@
* Description: Displays the Nintendo Logo
*/
#include "console_logo_state.h"
#include "global.h"
#include "alloca.h"
#include "title_setup_state.h"
#include "versions.h"
#include "libu64/gfxprint.h"
#if PLATFORM_N64
#include "cic6105.h"
#include "n64dd.h"
#endif
#include "alloca.h"
#include "console_logo_state.h"
#include "gfx.h"
#include "gfx_setupdl.h"
#include "regs.h"
#include "segment_symbols.h"
#include "sequence.h"
#include "sys_matrix.h"
#include "title_setup_state.h"
#include "versions.h"
#include "z64actor.h"
#include "z64environment.h"
#include "z64save.h"
#include "global.h"
#include "assets/textures/nintendo_rogo_static/nintendo_rogo_static.h"
#if DEBUG_FEATURES