From 46399145833eb2367946c72c1ed2088897658f4d Mon Sep 17 00:00:00 2001 From: mzxrules Date: Thu, 13 Feb 2025 18:15:14 -0500 Subject: [PATCH] Reduce overlay dependencies on global.h (6) (#2468) * add some headers, split some of z64.h * MtxClear -> IdentityMtx * more misc cleanups * move D_80116280 to header, fix build issue * remove z64.h * Revert "MtxClear -> IdentityMtx" This reverts commit 8fc74c0672f72b91ae4068e73228fc46fe9465d4. * split z64path.h and z64skin.h functions * z64face_reaction.h * cleanup overlay global references * trim padding * bss --- include/fault.h | 2 +- include/functions.h | 38 ---------- include/libu64/mtxuty-cvt.h | 9 +++ include/macros.h | 5 +- include/sys_ucode.h | 11 +++ include/variables.h | 1 - include/z64.h | 30 -------- include/z64face_reaction.h | 74 +++++++++++++++++++ include/z64game.h | 15 ++++ include/z64inventory.h | 1 - include/z64message.h | 64 ---------------- include/z64path.h | 19 +++++ include/z64play.h | 2 +- include/z64scene.h | 6 +- include/z64skin.h | 19 +++++ include/z64thread.h | 33 +++++++++ src/boot/boot_main.c | 1 + src/boot/idle.c | 1 + src/boot/z_std_dma.c | 3 +- src/code/fault_gc.c | 3 +- src/code/fault_n64.c | 1 + src/code/graph.c | 1 + src/code/irqmgr.c | 1 + src/code/main.c | 3 +- src/code/padmgr.c | 1 + src/code/sched.c | 1 + src/code/sys_matrix.c | 12 ++- src/code/sys_ucode.c | 2 +- src/code/ucode_disas.c | 7 +- src/code/z_actor.c | 19 ++++- src/code/z_camera.c | 2 +- src/code/z_face_reaction.c | 6 +- src/code/z_frame_advance.c | 2 +- src/code/z_jpeg.c | 6 ++ src/code/z_kankyo.c | 4 +- src/code/z_nulltask.c | 3 +- src/code/z_path.c | 2 + src/code/z_room.c | 1 + src/code/z_skin.c | 8 +- src/code/z_skin_awb.c | 7 +- src/libu64/mtxuty-cvt.c | 6 +- src/n64dd/z_n64dd.c | 1 + .../actors/ovl_Arrow_Fire/z_arrow_fire.c | 2 - .../actors/ovl_Arrow_Ice/z_arrow_ice.c | 2 - .../actors/ovl_Arrow_Light/z_arrow_light.c | 2 - src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c | 2 - src/overlays/actors/ovl_Demo_6K/z_demo_6k.c | 2 - src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c | 10 ++- src/overlays/actors/ovl_En_Ani/z_en_ani.c | 3 +- src/overlays/actors/ovl_En_Arrow/z_en_arrow.c | 16 +++- .../ovl_En_Attack_Niw/z_en_attack_niw.c | 2 - .../actors/ovl_En_Bigokuta/z_en_bigokuta.c | 2 - src/overlays/actors/ovl_En_Boom/z_en_boom.c | 11 ++- src/overlays/actors/ovl_En_Box/z_en_box.c | 19 ++++- src/overlays/actors/ovl_En_Bw/z_en_bw.c | 2 - src/overlays/actors/ovl_En_Cs/z_en_cs.c | 5 +- src/overlays/actors/ovl_En_Daiku/z_en_daiku.c | 2 - .../z_en_daiku_kakariko.c | 3 +- src/overlays/actors/ovl_En_Dh/z_en_dh.c | 2 - .../ovl_En_Diving_Game/z_en_diving_game.c | 3 +- src/overlays/actors/ovl_En_Dog/z_en_dog.c | 2 - src/overlays/actors/ovl_En_Door/z_en_door.c | 12 ++- src/overlays/actors/ovl_En_Du/z_en_du.c | 3 +- src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c | 2 - src/overlays/actors/ovl_En_Fish/z_en_fish.c | 13 +++- src/overlays/actors/ovl_En_Fu/z_en_fu.c | 3 +- src/overlays/actors/ovl_En_Ge1/z_en_ge1.c | 3 +- src/overlays/actors/ovl_En_Go2/z_en_go2.c | 3 +- src/overlays/actors/ovl_En_Gs/z_en_gs.c | 2 - .../actors/ovl_En_Heishi2/z_en_heishi2.c | 3 +- .../actors/ovl_En_Heishi4/z_en_heishi4.c | 3 +- src/overlays/actors/ovl_En_Horse/z_en_horse.c | 2 - .../ovl_En_Horse_Ganon/z_en_horse_ganon.c | 2 - .../z_en_horse_link_child.c | 9 ++- .../ovl_En_Horse_Normal/z_en_horse_normal.c | 2 - .../ovl_En_Horse_Zelda/z_en_horse_zelda.c | 2 - src/overlays/actors/ovl_En_Hs2/z_en_hs2.c | 3 +- src/overlays/actors/ovl_En_Hy/z_en_hy.c | 3 +- src/overlays/actors/ovl_En_In/z_en_in.c | 3 +- .../actors/ovl_En_Kanban/z_en_kanban.c | 19 ++++- .../ovl_En_Kanban/z_en_kanban_gfx.inc.c | 2 +- src/overlays/actors/ovl_En_Ko/z_en_ko.c | 1 + src/overlays/actors/ovl_En_Kz/z_en_kz.c | 4 +- src/overlays/actors/ovl_En_Ma1/z_en_ma1.c | 3 +- src/overlays/actors/ovl_En_Ma2/z_en_ma2.c | 3 +- src/overlays/actors/ovl_En_Ma3/z_en_ma3.c | 2 - src/overlays/actors/ovl_En_Md/z_en_md.c | 1 + src/overlays/actors/ovl_En_Mk/z_en_mk.c | 3 +- src/overlays/actors/ovl_En_Mm/z_en_mm.c | 3 +- src/overlays/actors/ovl_En_Ms/z_en_ms.c | 3 +- src/overlays/actors/ovl_En_Mu/z_en_mu.c | 3 +- src/overlays/actors/ovl_En_Nb/z_en_nb.c | 3 +- .../actors/ovl_En_Niw_Lady/z_en_niw_lady.c | 3 +- .../ovl_En_Po_Sisters/z_en_po_sisters.c | 2 - src/overlays/actors/ovl_En_Poh/z_en_poh.c | 2 - src/overlays/actors/ovl_En_Rd/z_en_rd.c | 2 - src/overlays/actors/ovl_En_Ru1/z_en_ru1.c | 3 +- src/overlays/actors/ovl_En_Sa/z_en_sa.c | 3 +- src/overlays/actors/ovl_En_Skj/z_en_skj.c | 3 +- src/overlays/actors/ovl_En_Ssh/z_en_ssh.c | 3 +- .../ovl_En_Syateki_Niw/z_en_syateki_niw.c | 1 - src/overlays/actors/ovl_En_Ta/z_en_ta.c | 3 +- src/overlays/actors/ovl_En_Tg/z_en_tg.c | 3 +- src/overlays/actors/ovl_En_Tk/z_en_tk.c | 3 +- .../actors/ovl_En_Torch2/z_en_torch2.c | 2 - src/overlays/actors/ovl_En_Toryo/z_en_toryo.c | 3 +- .../actors/ovl_En_Weiyer/z_en_weiyer.c | 2 - src/overlays/actors/ovl_En_Zf/z_en_zf.c | 2 - src/overlays/actors/ovl_En_Zl3/z_en_zl3.c | 2 - src/overlays/actors/ovl_En_Zl4/z_en_zl4.c | 3 +- src/overlays/actors/ovl_En_Zo/z_en_zo.c | 3 +- src/overlays/actors/ovl_En_fHG/z_en_fhg.c | 2 - .../ovl_Obj_Makekinsuta/z_obj_makekinsuta.c | 4 +- .../actors/ovl_Oceff_Storm/z_oceff_storm.c | 2 - .../ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.c | 10 ++- .../misc/ovl_kaleido_scope/z_kaleido_map.c | 2 + 116 files changed, 419 insertions(+), 297 deletions(-) create mode 100644 include/libu64/mtxuty-cvt.h create mode 100644 include/sys_ucode.h create mode 100644 include/z64face_reaction.h create mode 100644 include/z64path.h create mode 100644 include/z64thread.h diff --git a/include/fault.h b/include/fault.h index 8f1979520f..7418246f46 100644 --- a/include/fault.h +++ b/include/fault.h @@ -3,7 +3,7 @@ #include "ultra64.h" #include "attributes.h" -#include "padmgr.h" +#include "libu64/pad.h" #if !PLATFORM_N64 // These are the same as the 3-bit ansi color codes diff --git a/include/functions.h b/include/functions.h index 4a949a2af5..445e7783ff 100644 --- a/include/functions.h +++ b/include/functions.h @@ -49,7 +49,6 @@ void* MemCpy(void* dest, const void* src, s32 len); u16 QuestHint_GetSariaTextId(PlayState* play); u16 QuestHint_GetNaviTextId(PlayState* play); -u16 MaskReaction_GetTextId(PlayState* play, u32 maskReactionSet); void CutsceneFlags_UnsetAll(PlayState* play); void CutsceneFlags_Set(PlayState* play, s16 flag); void CutsceneFlags_Unset(PlayState* play, s16 flag); @@ -78,10 +77,6 @@ void PreNmiBuff_SetReset(PreNmiBuff* this); u32 PreNmiBuff_IsResetting(PreNmiBuff* this); void Sched_FlushTaskQueue(void); -Path* Path_GetByIndex(PlayState* play, s16 index, s16 max); -f32 Path_OrientAndGetDistSq(Actor* actor, Path* path, s16 waypoint, s16* yaw); -void Path_CopyLastPoint(Path* path, Vec3f* dest); - void PreNMI_Init(GameState* thisx); void func_80095AA0(PlayState* play, Room* room, Input* input, s32 arg3); @@ -96,21 +91,6 @@ void Room_FinishRoomChange(PlayState* play, RoomContext* roomCtx); void Sample_Destroy(GameState* thisx); void Sample_Init(GameState* thisx); -void Skin_UpdateVertices(MtxF* mtx, SkinVertex* skinVertices, SkinLimbModif* modifEntry, Vtx* vtxBuf, Vec3f* pos); -void Skin_DrawAnimatedLimb(GraphicsContext* gfxCtx, Skin* skin, s32 limbIndex, s32 arg3, s32 drawFlags); -void Skin_DrawLimb(GraphicsContext* gfxCtx, Skin* skin, s32 limbIndex, Gfx* dlistOverride, s32 drawFlags); -void func_800A6330(Actor* actor, PlayState* play, Skin* skin, SkinPostDraw postDraw, s32 setTranslation); -void func_800A6360(Actor* actor, PlayState* play, Skin* skin, SkinPostDraw postDraw, - SkinOverrideLimbDraw overrideLimbDraw, s32 setTranslation); -void func_800A6394(Actor* actor, PlayState* play, Skin* skin, SkinPostDraw postDraw, - SkinOverrideLimbDraw overrideLimbDraw, s32 setTranslation, s32 arg6); -void func_800A63CC(Actor* actor, PlayState* play, Skin* skin, SkinPostDraw postDraw, - SkinOverrideLimbDraw overrideLimbDraw, s32 setTranslation, s32 arg6, s32 drawFlags); -void Skin_GetLimbPos(Skin* skin, s32 limbIndex, Vec3f* offset, Vec3f* dst); -void Skin_Init(PlayState* play, Skin* skin, SkeletonHeader* skeletonHeader, AnimationHeader* animationHeader); -void Skin_Free(PlayState* play, Skin* skin); -s32 Skin_ApplyAnimTransformations(Skin* skin, MtxF* limbMatrices, Actor* actor, s32 setTranslation); - void Sram_InitNewSave(void); void Sram_InitDebugSave(void); void Sram_OpenSave(SramContext* sramCtx); @@ -197,19 +177,7 @@ void func_800C213C(PreRender* this, Gfx** gfxP); void PreRender_RestoreFramebuffer(PreRender* this, Gfx** gfxP); void PreRender_CopyImageRegion(PreRender* this, Gfx** gfxP); void PreRender_ApplyFilters(PreRender* this); -void GameState_SetFBFilter(Gfx** gfxP); -void GameState_Draw(GameState* gameState, GraphicsContext* gfxCtx); -void GameState_SetFrameBuffer(GraphicsContext* gfxCtx); -void GameState_ReqPadData(GameState* gameState); -void GameState_Update(GameState* gameState); -void GameState_InitArena(GameState* gameState, size_t size); -void GameState_Realloc(GameState* gameState, size_t size); -void GameState_Init(GameState* gameState, GameStateFunc init, GraphicsContext* gfxCtx); -void GameState_Destroy(GameState* gameState); -GameStateFunc GameState_GetInit(GameState* gameState); -u32 GameState_IsRunning(GameState* gameState); #if DEBUG_FEATURES -void* GameState_Alloc(GameState* gameState, size_t size, const char* file, int line); void* GameAlloc_MallocDebug(GameAlloc* this, u32 size, const char* file, int line); #endif void* GameAlloc_Malloc(GameAlloc* this, u32 size); @@ -233,10 +201,6 @@ void SysCfb_Init(s32 n64dd); void* SysCfb_GetFbPtr(s32 idx); void* SysCfb_GetFbEnd(void); -u64* SysUcode_GetUCodeBoot(void); -size_t SysUcode_GetUCodeBootSize(void); -u64* SysUcode_GetUCode(void); -u64* SysUcode_GetUCodeData(void); NORETURN void func_800D31A0(void); void func_800D31F0(void); void func_800D3210(void); @@ -262,8 +226,6 @@ void DebugArena_Display(void); void RcpUtils_PrintRegisterStatus(void); void RcpUtils_Reset(void); void* Overlay_AllocateAndLoad(uintptr_t vromStart, uintptr_t vromEnd, void* vramStart, void* vramEnd); -void MtxConv_F2L(Mtx* m1, MtxF* m2); -void MtxConv_L2F(MtxF* m1, Mtx* m2); void Overlay_Relocate(void* allocatedRamAddr, OverlayRelocationSection* ovlRelocs, void* vramStart); size_t Overlay_Load(uintptr_t vromStart, uintptr_t vromEnd, void* vramStart, void* vramEnd, void* allocatedRamAddr); // ? func_800FC800(?); diff --git a/include/libu64/mtxuty-cvt.h b/include/libu64/mtxuty-cvt.h new file mode 100644 index 0000000000..636978bb6f --- /dev/null +++ b/include/libu64/mtxuty-cvt.h @@ -0,0 +1,9 @@ +#ifndef LIBU64_MTXUTY_CVT_H +#define LIBU64_MTXUTY_CVT_H + +#include "ultra64.h" + +void MtxConv_F2L(Mtx* m1, MtxF* m2); +void MtxConv_L2F(MtxF* m1, Mtx* m2); + +#endif diff --git a/include/macros.h b/include/macros.h index 343484028d..45cdf6935a 100644 --- a/include/macros.h +++ b/include/macros.h @@ -4,6 +4,9 @@ #include "terminal.h" #include "versions.h" +#define SCREEN_WIDTH 320 +#define SCREEN_HEIGHT 240 + #ifndef AVOID_UB #define BAD_RETURN(type) type #else @@ -116,7 +119,6 @@ #define DMA_REQUEST_SYNC(ram, vrom, size, file, line) DmaMgr_RequestSyncDebug(ram, vrom, size, file, line) #define DMA_REQUEST_ASYNC(req, ram, vrom, size, unk5, queue, msg, file, line) DmaMgr_RequestAsyncDebug(req, ram, vrom, size, unk5, queue, msg, file, line) -#define GAME_STATE_ALLOC(gameState, size, file, line) GameState_Alloc(gameState, size, file, line) #define DEBUG_ARENA_MALLOC(size, file, line) DebugArena_MallocDebug(size, file, line) #define DEBUG_ARENA_MALLOC_R(size, file, line) DebugArena_MallocRDebug(size, file, line) #define DEBUG_ARENA_FREE(size, file, line) DebugArena_FreeDebug(size, file, line) @@ -131,7 +133,6 @@ #define DMA_REQUEST_SYNC(ram, vrom, size, file, line) DmaMgr_RequestSync(ram, vrom, size) #define DMA_REQUEST_ASYNC(req, ram, vrom, size, unk5, queue, msg, file, line) DmaMgr_RequestAsync(req, ram, vrom, size, unk5, queue, msg) -#define GAME_STATE_ALLOC(gameState, size, file, line) THA_AllocTailAlign16(&(gameState)->tha, size) #define DEBUG_ARENA_MALLOC(size, file, line) DebugArena_Malloc(size) #define DEBUG_ARENA_MALLOC_R(size, file, line) DebugArena_MallocR(size) #define DEBUG_ARENA_FREE(size, file, line) DebugArena_Free(size) diff --git a/include/sys_ucode.h b/include/sys_ucode.h new file mode 100644 index 0000000000..fa690d4784 --- /dev/null +++ b/include/sys_ucode.h @@ -0,0 +1,11 @@ +#ifndef SYS_UCODE_H +#define SYS_UCODE_H + +#include "ultra64.h" + +u64* SysUcode_GetUCodeBoot(void); +size_t SysUcode_GetUCodeBootSize(void); +u64* SysUcode_GetUCode(void); +u64* SysUcode_GetUCodeData(void); + +#endif diff --git a/include/variables.h b/include/variables.h index f5f4599e7a..39c73df77b 100644 --- a/include/variables.h +++ b/include/variables.h @@ -68,7 +68,6 @@ extern u32 __osBaseCounter; extern u32 __osViIntrCount; extern u32 __osTimerCounter; extern EffectSsOverlay gEffectSsOverlayTable[EFFECT_SS_TYPE_MAX]; -extern Gfx D_80116280[]; extern ActorOverlay gActorOverlayTable[ACTOR_ID_MAX]; // original name: "actor_dlftbls" 801162A0 extern s32 gMaxActorId; // original name: "MaxProfile" extern s32 gDebugCamEnabled; diff --git a/include/z64.h b/include/z64.h index f53bac0e88..e59a8caa0c 100644 --- a/include/z64.h +++ b/include/z64.h @@ -87,36 +87,6 @@ #include "libc64/sprintf.h" #include "libu64/debug.h" -#define SCREEN_WIDTH 320 -#define SCREEN_HEIGHT 240 - -#define THREAD_PRI_IDLE_INIT 10 -#define THREAD_PRI_MAIN_INIT 10 -#define THREAD_PRI_DMAMGR_LOW 10 // Used when decompressing files -#define THREAD_PRI_GRAPH 11 -#define THREAD_PRI_AUDIOMGR 12 -#define THREAD_PRI_N64DD 13 -#define THREAD_PRI_DDMSG 13 -#define THREAD_PRI_PADMGR 14 -#define THREAD_PRI_MAIN 15 -#define THREAD_PRI_SCHED 15 -#define THREAD_PRI_DMAMGR 16 -#define THREAD_PRI_IRQMGR 17 -#define THREAD_PRI_FAULT_CLIENT (OS_PRIORITY_APPMAX - 1) -#define THREAD_PRI_FAULT OS_PRIORITY_APPMAX - -#define THREAD_ID_IDLE 1 -#define THREAD_ID_FAULT 2 -#define THREAD_ID_MAIN 3 -#define THREAD_ID_GRAPH 4 -#define THREAD_ID_SCHED 5 -#define THREAD_ID_PADMGR 7 -#define THREAD_ID_N64DD 8 -#define THREAD_ID_DDMSG 9 -#define THREAD_ID_AUDIOMGR 10 -#define THREAD_ID_DMAMGR 18 -#define THREAD_ID_IRQMGR 19 - typedef enum LensMode { /* 0 */ LENS_MODE_SHOW_ACTORS, // lens actors are invisible by default, and shown by using lens (for example, invisible enemies) /* 1 */ LENS_MODE_HIDE_ACTORS // lens actors are visible by default, and hidden by using lens (for example, fake walls) diff --git a/include/z64face_reaction.h b/include/z64face_reaction.h new file mode 100644 index 0000000000..274340ebcb --- /dev/null +++ b/include/z64face_reaction.h @@ -0,0 +1,74 @@ +#ifndef Z64FACE_REACTION_H +#define Z64FACE_REACTION_H + +#include "ultra64.h" + +struct PlayState; + +typedef enum MaskReactionSet { + /* 0x00 */ MASK_REACTION_SET_CARPENTER_BOSS, + /* 0x01 */ MASK_REACTION_SET_CARPENTER_1, + /* 0x02 */ MASK_REACTION_SET_CARPENTER_2, + /* 0x03 */ MASK_REACTION_SET_CARPENTER_3, + /* 0x04 */ MASK_REACTION_SET_CARPENTER_4, + /* 0x05 */ MASK_REACTION_SET_HYRULIAN_GUARD, + /* 0x06 */ MASK_REACTION_SET_HEISHI4_1, + /* 0x07 */ MASK_REACTION_SET_HEISHI4_2, + /* 0x08 */ MASK_REACTION_SET_CUCCO_LADY, + /* 0x09 */ MASK_REACTION_SET_CARPENTERS_SON, + /* 0x0A */ MASK_REACTION_SET_KAKARIKO_ROOF_MAN, + /* 0x0B */ MASK_REACTION_SET_WINDMILL_MAN, + /* 0x0C */ MASK_REACTION_SET_12, // Unused + /* 0x0D */ MASK_REACTION_SET_CURSED_SKULLTULA_MAN, + /* 0x0E */ MASK_REACTION_SET_DAMPE, + /* 0x0F */ MASK_REACTION_SET_GRAVEYARD_KID, + /* 0x10 */ MASK_REACTION_SET_SARIA, + /* 0x11 */ MASK_REACTION_SET_MIDO, + /* 0x12 */ MASK_REACTION_SET_FADO, + /* 0x13 */ MASK_REACTION_SET_KOKIRI_1, + /* 0x14 */ MASK_REACTION_SET_KOKIRI_2, + /* 0x15 */ MASK_REACTION_SET_SKULL_KID, + /* 0x16 */ MASK_REACTION_SET_ZELDA, + /* 0x17 */ MASK_REACTION_SET_MALON, + /* 0x18 */ MASK_REACTION_SET_TALON, + /* 0x19 */ MASK_REACTION_SET_INGO, + /* 0x1A */ MASK_REACTION_SET_LAKESIDE_PROFESSOR, + /* 0x1B */ MASK_REACTION_SET_MAGIC_BEAN_SALESMAN, + /* 0x1C */ MASK_REACTION_SET_RUNNING_MAN, + /* 0x1D */ MASK_REACTION_SET_ZORA, + /* 0x1E */ MASK_REACTION_SET_KING_ZORA, + /* 0x1F */ MASK_REACTION_SET_RUTO, + /* 0x20 */ MASK_REACTION_SET_GORON, + /* 0x21 */ MASK_REACTION_SET_DARUNIA, + /* 0x22 */ MASK_REACTION_SET_GERUDO_WHITE, + /* 0x23 */ MASK_REACTION_SET_NABOORU, + /* 0x24 */ MASK_REACTION_SET_DANCING_COUPLE, + /* 0x25 */ MASK_REACTION_SET_DOG_LADY, + /* 0x26 */ MASK_REACTION_SET_WOMAN_3, + /* 0x27 */ MASK_REACTION_SET_MAN_1_BEARD, + /* 0x28 */ MASK_REACTION_SET_MAN_2_BALD, + /* 0x29 */ MASK_REACTION_SET_MAN_1_SHAVED_BLACK_SHIRT, + /* 0x2A */ MASK_REACTION_SET_BEGGAR, + /* 0x2B */ MASK_REACTION_SET_OLD_WOMAN, + /* 0x2C */ MASK_REACTION_SET_OLD_MAN, + /* 0x2D */ MASK_REACTION_SET_YOUNG_WOMAN_BROWN_HAIR, + /* 0x2E */ MASK_REACTION_SET_MAN_2_MUSTACHE_RED_SHIRT, + /* 0x2F */ MASK_REACTION_SET_MAN_2_MUSTACHE_BLUE_SHIRT, + /* 0x30 */ MASK_REACTION_SET_YOUNG_WOMAN_ORANGE_HAIR, + /* 0x31 */ MASK_REACTION_SET_MAN_2_ALT_MUSTACHE, + /* 0x32 */ MASK_REACTION_SET_MAN_1_BOWL_CUT_PURPLE_SHIRT, + /* 0x33 */ MASK_REACTION_SET_MAN_2_BEARD, + /* 0x34 */ MASK_REACTION_SET_OLD_MAN_BALD_BROWN_ROBE, + /* 0x35 */ MASK_REACTION_SET_MAN_2_MUSTACHE_WHITE_SHIRT, + /* 0x36 */ MASK_REACTION_SET_MAN_1_SHAVED_GREEN_SHIRT, + /* 0x37 */ MASK_REACTION_SET_WOMAN_2, + /* 0x38 */ MASK_REACTION_SET_OLD_MAN_BALD_PURPLE_ROBE, + /* 0x39 */ MASK_REACTION_SET_MAN_1_BOWL_CUT_GREEN_SHIRT, + /* 0x3A */ MASK_REACTION_SET_HAGGLING_TOWNSPEOPLE_1, + /* 0x3B */ MASK_REACTION_SET_HAGGLING_TOWNSPEOPLE_2, + /* 0x3C */ MASK_REACTION_SET_MAX +} MaskReactionSet; + +u16 MaskReaction_GetTextId(struct PlayState* play, u32 maskReactionSet); + +#endif diff --git a/include/z64game.h b/include/z64game.h index e41c0dd8d3..918f73fb3d 100644 --- a/include/z64game.h +++ b/include/z64game.h @@ -48,4 +48,19 @@ typedef struct GameState { /* 0xA0 */ u32 inPreNMIState; } GameState; // size = 0xA4 +void GameState_ReqPadData(GameState* gameState); +void GameState_Update(GameState* gameState); +void GameState_InitArena(GameState* gameState, size_t size); +void GameState_Realloc(GameState* gameState, size_t size); +void GameState_Init(GameState* gameState, GameStateFunc init, struct GraphicsContext* gfxCtx); +void GameState_Destroy(GameState* gameState); +GameStateFunc GameState_GetInit(GameState* gameState); +u32 GameState_IsRunning(GameState* gameState); +#if DEBUG_FEATURES +void* GameState_Alloc(GameState* gameState, size_t size, const char* file, int line); +#define GAME_STATE_ALLOC(gameState, size, file, line) GameState_Alloc(gameState, size, file, line) +#else +#define GAME_STATE_ALLOC(gameState, size, file, line) THA_AllocTailAlign16(&(gameState)->tha, size) +#endif + #endif diff --git a/include/z64inventory.h b/include/z64inventory.h index 9a8133b3da..8c1a5a90d8 100644 --- a/include/z64inventory.h +++ b/include/z64inventory.h @@ -3,7 +3,6 @@ #include "ultra64.h" #include "z64item.h" -#include "z64save.h" struct PlayState; diff --git a/include/z64message.h b/include/z64message.h index 415ab80ac7..d332ac4549 100644 --- a/include/z64message.h +++ b/include/z64message.h @@ -115,70 +115,6 @@ typedef enum MessageMode { /* 0x37 */ MSGMODE_PAUSED // Causes the message system to do nothing until external code sets a new message mode or calls a public function } MessageMode; -typedef enum MaskReactionSet { - /* 0x00 */ MASK_REACTION_SET_CARPENTER_BOSS, - /* 0x01 */ MASK_REACTION_SET_CARPENTER_1, - /* 0x02 */ MASK_REACTION_SET_CARPENTER_2, - /* 0x03 */ MASK_REACTION_SET_CARPENTER_3, - /* 0x04 */ MASK_REACTION_SET_CARPENTER_4, - /* 0x05 */ MASK_REACTION_SET_HYRULIAN_GUARD, - /* 0x06 */ MASK_REACTION_SET_HEISHI4_1, - /* 0x07 */ MASK_REACTION_SET_HEISHI4_2, - /* 0x08 */ MASK_REACTION_SET_CUCCO_LADY, - /* 0x09 */ MASK_REACTION_SET_CARPENTERS_SON, - /* 0x0A */ MASK_REACTION_SET_KAKARIKO_ROOF_MAN, - /* 0x0B */ MASK_REACTION_SET_WINDMILL_MAN, - /* 0x0C */ MASK_REACTION_SET_12, // Unused - /* 0x0D */ MASK_REACTION_SET_CURSED_SKULLTULA_MAN, - /* 0x0E */ MASK_REACTION_SET_DAMPE, - /* 0x0F */ MASK_REACTION_SET_GRAVEYARD_KID, - /* 0x10 */ MASK_REACTION_SET_SARIA, - /* 0x11 */ MASK_REACTION_SET_MIDO, - /* 0x12 */ MASK_REACTION_SET_FADO, - /* 0x13 */ MASK_REACTION_SET_KOKIRI_1, - /* 0x14 */ MASK_REACTION_SET_KOKIRI_2, - /* 0x15 */ MASK_REACTION_SET_SKULL_KID, - /* 0x16 */ MASK_REACTION_SET_ZELDA, - /* 0x17 */ MASK_REACTION_SET_MALON, - /* 0x18 */ MASK_REACTION_SET_TALON, - /* 0x19 */ MASK_REACTION_SET_INGO, - /* 0x1A */ MASK_REACTION_SET_LAKESIDE_PROFESSOR, - /* 0x1B */ MASK_REACTION_SET_MAGIC_BEAN_SALESMAN, - /* 0x1C */ MASK_REACTION_SET_RUNNING_MAN, - /* 0x1D */ MASK_REACTION_SET_ZORA, - /* 0x1E */ MASK_REACTION_SET_KING_ZORA, - /* 0x1F */ MASK_REACTION_SET_RUTO, - /* 0x20 */ MASK_REACTION_SET_GORON, - /* 0x21 */ MASK_REACTION_SET_DARUNIA, - /* 0x22 */ MASK_REACTION_SET_GERUDO_WHITE, - /* 0x23 */ MASK_REACTION_SET_NABOORU, - /* 0x24 */ MASK_REACTION_SET_DANCING_COUPLE, - /* 0x25 */ MASK_REACTION_SET_DOG_LADY, - /* 0x26 */ MASK_REACTION_SET_WOMAN_3, - /* 0x27 */ MASK_REACTION_SET_MAN_1_BEARD, - /* 0x28 */ MASK_REACTION_SET_MAN_2_BALD, - /* 0x29 */ MASK_REACTION_SET_MAN_1_SHAVED_BLACK_SHIRT, - /* 0x2A */ MASK_REACTION_SET_BEGGAR, - /* 0x2B */ MASK_REACTION_SET_OLD_WOMAN, - /* 0x2C */ MASK_REACTION_SET_OLD_MAN, - /* 0x2D */ MASK_REACTION_SET_YOUNG_WOMAN_BROWN_HAIR, - /* 0x2E */ MASK_REACTION_SET_MAN_2_MUSTACHE_RED_SHIRT, - /* 0x2F */ MASK_REACTION_SET_MAN_2_MUSTACHE_BLUE_SHIRT, - /* 0x30 */ MASK_REACTION_SET_YOUNG_WOMAN_ORANGE_HAIR, - /* 0x31 */ MASK_REACTION_SET_MAN_2_ALT_MUSTACHE, - /* 0x32 */ MASK_REACTION_SET_MAN_1_BOWL_CUT_PURPLE_SHIRT, - /* 0x33 */ MASK_REACTION_SET_MAN_2_BEARD, - /* 0x34 */ MASK_REACTION_SET_OLD_MAN_BALD_BROWN_ROBE, - /* 0x35 */ MASK_REACTION_SET_MAN_2_MUSTACHE_WHITE_SHIRT, - /* 0x36 */ MASK_REACTION_SET_MAN_1_SHAVED_GREEN_SHIRT, - /* 0x37 */ MASK_REACTION_SET_WOMAN_2, - /* 0x38 */ MASK_REACTION_SET_OLD_MAN_BALD_PURPLE_ROBE, - /* 0x39 */ MASK_REACTION_SET_MAN_1_BOWL_CUT_GREEN_SHIRT, - /* 0x3A */ MASK_REACTION_SET_HAGGLING_TOWNSPEOPLE_1, - /* 0x3B */ MASK_REACTION_SET_HAGGLING_TOWNSPEOPLE_2, - /* 0x3C */ MASK_REACTION_SET_MAX -} MaskReactionSet; - typedef enum TextState { /* 0 */ TEXT_STATE_NONE, /* 1 */ TEXT_STATE_DONE_HAS_NEXT, diff --git a/include/z64path.h b/include/z64path.h new file mode 100644 index 0000000000..0f9243974a --- /dev/null +++ b/include/z64path.h @@ -0,0 +1,19 @@ +#ifndef Z64PATH_H +#define Z64PATH_H + +#include "ultra64.h" +#include "z64math.h" + +struct PlayState; +struct Actor; + +typedef struct Path { + /* 0x00 */ u8 count; // number of points in the path + /* 0x04 */ Vec3s* points; // Segment Address to the array of points +} Path; // size = 0x8 + +Path* Path_GetByIndex(struct PlayState* play, s16 index, s16 max); +f32 Path_OrientAndGetDistSq(struct Actor* actor, Path* path, s16 waypoint, s16* yaw); +void Path_CopyLastPoint(Path* path, Vec3f* dest); + +#endif diff --git a/include/z64play.h b/include/z64play.h index 4fab4283fc..106c4fed00 100644 --- a/include/z64play.h +++ b/include/z64play.h @@ -88,7 +88,7 @@ typedef struct PlayState { /* 0x11DFC */ void* unk_11DFC; /* 0x11E00 */ Spawn* spawnList; /* 0x11E04 */ s16* exitList; - /* 0x11E08 */ Path* pathList; + /* 0x11E08 */ struct Path* pathList; /* 0x11E0C */ struct QuestHintCmd* naviQuestHints; /* 0x11E10 */ void* specialEffects; /* 0x11E14 */ u8 skyboxId; diff --git a/include/z64scene.h b/include/z64scene.h index 4acf9df16a..c22dd95e8e 100644 --- a/include/z64scene.h +++ b/include/z64scene.h @@ -8,6 +8,7 @@ #include "z64environment.h" #include "z64light.h" #include "z64math.h" +#include "z64path.h" #include "command_macros_base.h" @@ -51,11 +52,6 @@ typedef struct Spawn { /* 0x01 */ u8 room; } Spawn; -typedef struct Path { - /* 0x00 */ u8 count; // number of points in the path - /* 0x04 */ Vec3s* points; // Segment Address to the array of points -} Path; // size = 0x8 - // Room shapes typedef enum RoomShapeType { diff --git a/include/z64skin.h b/include/z64skin.h index d29c7c7482..641a980925 100644 --- a/include/z64skin.h +++ b/include/z64skin.h @@ -3,6 +3,10 @@ #include "z64animation.h" +struct Actor; +struct GraphicsContext; +struct PlayState; + /** * Holds a compact version of a vertex used in the Skin system * It is used to initialise the Vtx used by an animated limb @@ -75,4 +79,19 @@ typedef s32 (*SkinOverrideLimbDraw)(struct Actor*, struct PlayState*, s32, Skin* #define SKIN_TRANSFORM_IS_FHG 0x23 +void Skin_UpdateVertices(MtxF* mtx, SkinVertex* skinVertices, SkinLimbModif* modifEntry, Vtx* vtxBuf, Vec3f* pos); +void Skin_DrawAnimatedLimb(struct GraphicsContext* gfxCtx, Skin* skin, s32 limbIndex, s32 arg3, s32 drawFlags); +void Skin_DrawLimb(struct GraphicsContext* gfxCtx, Skin* skin, s32 limbIndex, Gfx* dlistOverride, s32 drawFlags); +void func_800A6330(struct Actor* actor, struct PlayState* play, Skin* skin, SkinPostDraw postDraw, s32 setTranslation); +void func_800A6360(struct Actor* actor, struct PlayState* play, Skin* skin, SkinPostDraw postDraw, + SkinOverrideLimbDraw overrideLimbDraw, s32 setTranslation); +void func_800A6394(struct Actor* actor, struct PlayState* play, Skin* skin, SkinPostDraw postDraw, + SkinOverrideLimbDraw overrideLimbDraw, s32 setTranslation, s32 arg6); +void func_800A63CC(struct Actor* actor, struct PlayState* play, Skin* skin, SkinPostDraw postDraw, + SkinOverrideLimbDraw overrideLimbDraw, s32 setTranslation, s32 arg6, s32 drawFlags); +void Skin_GetLimbPos(Skin* skin, s32 limbIndex, Vec3f* offset, Vec3f* dst); +void Skin_Init(struct PlayState* play, Skin* skin, SkeletonHeader* skeletonHeader, AnimationHeader* animationHeader); +void Skin_Free(struct PlayState* play, Skin* skin); +s32 Skin_ApplyAnimTransformations(Skin* skin, MtxF* limbMatrices, struct Actor* actor, s32 setTranslation); + #endif diff --git a/include/z64thread.h b/include/z64thread.h new file mode 100644 index 0000000000..c4ab827b42 --- /dev/null +++ b/include/z64thread.h @@ -0,0 +1,33 @@ +#ifndef Z64THREAD_H +#define Z64THREAD_H + +#include "ultra64.h" + +#define THREAD_ID_IDLE 1 +#define THREAD_ID_FAULT 2 +#define THREAD_ID_MAIN 3 +#define THREAD_ID_GRAPH 4 +#define THREAD_ID_SCHED 5 +#define THREAD_ID_PADMGR 7 +#define THREAD_ID_N64DD 8 +#define THREAD_ID_DDMSG 9 +#define THREAD_ID_AUDIOMGR 10 +#define THREAD_ID_DMAMGR 18 +#define THREAD_ID_IRQMGR 19 + +#define THREAD_PRI_IDLE_INIT 10 +#define THREAD_PRI_MAIN_INIT 10 +#define THREAD_PRI_DMAMGR_LOW 10 // Used when decompressing files +#define THREAD_PRI_GRAPH 11 +#define THREAD_PRI_AUDIOMGR 12 +#define THREAD_PRI_N64DD 13 +#define THREAD_PRI_DDMSG 13 +#define THREAD_PRI_PADMGR 14 +#define THREAD_PRI_MAIN 15 +#define THREAD_PRI_SCHED 15 +#define THREAD_PRI_DMAMGR 16 +#define THREAD_PRI_IRQMGR 17 +#define THREAD_PRI_FAULT_CLIENT (OS_PRIORITY_APPMAX - 1) +#define THREAD_PRI_FAULT OS_PRIORITY_APPMAX + +#endif diff --git a/src/boot/boot_main.c b/src/boot/boot_main.c index 0c1eeea49e..409f97e530 100644 --- a/src/boot/boot_main.c +++ b/src/boot/boot_main.c @@ -4,6 +4,7 @@ #if PLATFORM_N64 #include "cic6105.h" #endif +#include "z64thread.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:128" diff --git a/src/boot/idle.c b/src/boot/idle.c index 508fd16c4e..b1a6dd2c3b 100644 --- a/src/boot/idle.c +++ b/src/boot/idle.c @@ -2,6 +2,7 @@ #include "stack.h" #include "terminal.h" #include "versions.h" +#include "z64thread.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 ntsc-1.2:64" diff --git a/src/boot/z_std_dma.c b/src/boot/z_std_dma.c index 9efa427881..36930fda5f 100644 --- a/src/boot/z_std_dma.c +++ b/src/boot/z_std_dma.c @@ -26,9 +26,10 @@ #if PLATFORM_N64 #include "n64dd.h" #endif +#include "z64thread.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:76 pal-1.0:74 pal-1.1:74" + "ntsc-1.2:78 pal-1.0:76 pal-1.1:76" StackEntry sDmaMgrStackInfo; OSMesgQueue sDmaMgrMsgQueue; diff --git a/src/code/fault_gc.c b/src/code/fault_gc.c index 5a85d03ebb..3bd75ed5c8 100644 --- a/src/code/fault_gc.c +++ b/src/code/fault_gc.c @@ -40,7 +40,7 @@ * DPad-Up may be pressed to enable sending fault pages over osSyncPrintf as well as displaying them on-screen. * DPad-Down disables sending fault pages over osSyncPrintf. */ -#pragma increment_block_number "gc-eu:160 gc-eu-mq:160 gc-eu-mq-dbg:144 gc-jp:160 gc-jp-ce:160 gc-jp-mq:160 gc-us:160" \ +#pragma increment_block_number "gc-eu:160 gc-eu-mq:160 gc-eu-mq-dbg:160 gc-jp:160 gc-jp-ce:160 gc-jp-mq:160 gc-us:160" \ "gc-us-mq:160 ique-cn:160" #include "global.h" @@ -48,6 +48,7 @@ #include "fault.h" #include "stack.h" #include "terminal.h" +#include "z64thread.h" void Fault_Init(void); void Fault_SetOsSyncPrintfEnabled(u32 enabled); diff --git a/src/code/fault_n64.c b/src/code/fault_n64.c index 720307c0a1..373c20ef97 100644 --- a/src/code/fault_n64.c +++ b/src/code/fault_n64.c @@ -5,6 +5,7 @@ #include "libc64/os_malloc.h" #include "stack.h" #include "terminal.h" +#include "z64thread.h" #pragma increment_block_number "ntsc-1.0:192 ntsc-1.1:192 ntsc-1.2:192 pal-1.0:192 pal-1.1:192" diff --git a/src/code/graph.c b/src/code/graph.c index 046e04d374..c77ef71087 100644 --- a/src/code/graph.c +++ b/src/code/graph.c @@ -1,5 +1,6 @@ #include "global.h" #include "fault.h" +#include "sys_ucode.h" #include "terminal.h" #include "ucode_disas.h" #include "versions.h" diff --git a/src/code/irqmgr.c b/src/code/irqmgr.c index 59d7a41cfa..b90d5df7b7 100644 --- a/src/code/irqmgr.c +++ b/src/code/irqmgr.c @@ -35,6 +35,7 @@ #include "global.h" #include "terminal.h" #include "versions.h" +#include "z64thread.h" vu32 gIrqMgrResetStatus = IRQ_RESET_STATUS_IDLE; volatile OSTime sIrqMgrResetTime = 0; diff --git a/src/code/main.c b/src/code/main.c index 73d9f796ae..00fb9c896b 100644 --- a/src/code/main.c +++ b/src/code/main.c @@ -22,9 +22,10 @@ extern struct IrqMgr gIrqMgr; #include "cic6105.h" #include "n64dd.h" #endif +#include "z64thread.h" #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:160 ntsc-1.0:137 ntsc-1.1:137 ntsc-1.2:137 pal-1.0:135 pal-1.1:135" + "ique-cn:160 ntsc-1.0:139 ntsc-1.1:139 ntsc-1.2:139 pal-1.0:137 pal-1.1:137" extern u8 _buffersSegmentEnd[]; diff --git a/src/code/padmgr.c b/src/code/padmgr.c index 740f15b29a..9e6d1ae14a 100644 --- a/src/code/padmgr.c +++ b/src/code/padmgr.c @@ -31,6 +31,7 @@ #include "libu64/debug.h" #include "libu64/padsetup.h" #include "macros.h" +#include "padmgr.h" #include "fault.h" #include "terminal.h" #include "line_numbers.h" diff --git a/src/code/sched.c b/src/code/sched.c index b22f38b402..3c4199aefe 100644 --- a/src/code/sched.c +++ b/src/code/sched.c @@ -42,6 +42,7 @@ #include "global.h" #include "fault.h" #include "versions.h" +#include "z64thread.h" #define RSP_DONE_MSG 667 #define RDP_DONE_MSG 668 diff --git a/src/code/sys_matrix.c b/src/code/sys_matrix.c index 9e56d4088a..081a292765 100644 --- a/src/code/sys_matrix.c +++ b/src/code/sys_matrix.c @@ -1,7 +1,14 @@ -#include "global.h" +#include "libc64/math64.h" +#include "gfx.h" #if DEBUG_FEATURES #include "fault.h" #endif +#include "macros.h" +#include "sys_matrix.h" +#include "ultra64.h" +#include "z_lib.h" +#include "z64game.h" +#include "z64skin_matrix.h" // clang-format off Mtx gIdentityMtx = gdSPDefMtx( @@ -19,9 +26,6 @@ MtxF gIdentityMtxF = { }; // clang-format on -#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" \ - "pal-1.1:128" - MtxF* sMatrixStack; // "Matrix_stack" MtxF* sCurrentMatrix; // "Matrix_now" diff --git a/src/code/sys_ucode.c b/src/code/sys_ucode.c index 2be2566e84..3e4ad8cbf6 100644 --- a/src/code/sys_ucode.c +++ b/src/code/sys_ucode.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" u64* sDefaultGSPUCodeText = gspF3DZEX2_NoN_PosLight_fifoTextStart; u64* sDefaultGSPUCodeData = gspF3DZEX2_NoN_PosLight_fifoDataStart; diff --git a/src/code/ucode_disas.c b/src/code/ucode_disas.c index ecfc7d7ac4..0684dcd5dc 100644 --- a/src/code/ucode_disas.c +++ b/src/code/ucode_disas.c @@ -1,5 +1,10 @@ -#include "global.h" #include "ucode_disas.h" +#include "ultra64.h" +#include "ultra64/gs2dex.h" +#include "libu64/mtxuty-cvt.h" +#include "segmented_address.h" + +#include "macros.h" #if DEBUG_FEATURES diff --git a/src/code/z_actor.c b/src/code/z_actor.c index d8e1c2ae9c..b6a5c49564 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -1,13 +1,30 @@ -#include "global.h" +#include "libc64/math64.h" #include "fault.h" +#include "gfx.h" +#include "gfx_setupdl.h" #include "quake.h" #include "rand.h" +#include "regs.h" +#include "rumble.h" +#include "segmented_address.h" +#include "sfx.h" +#include "sys_math.h" +#include "sys_matrix.h" #include "terminal.h" #include "versions.h" +#include "z_lib.h" +#include "zelda_arena.h" +#include "z64effect.h" +#include "z64light.h" #include "z64horse.h" +#include "z64play.h" +#include "z64skin_matrix.h" + +#include "global.h" #include "overlays/actors/ovl_Arms_Hook/z_arms_hook.h" #include "overlays/actors/ovl_En_Part/z_en_part.h" + #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" #include "assets/objects/object_bdoor/object_bdoor.h" diff --git a/src/code/z_camera.c b/src/code/z_camera.c index 2f768f35f3..dce9b5b089 100644 --- a/src/code/z_camera.c +++ b/src/code/z_camera.c @@ -3640,7 +3640,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:138 ntsc-1.1:138 ntsc-1.2:138 pal-1.0:136 pal-1.1:136" + "ique-cn:128 ntsc-1.0:140 ntsc-1.1:140 ntsc-1.2:140 pal-1.0:138 pal-1.1:138" s32 Camera_KeepOn4(Camera* camera) { static Vec3f D_8015BD50; diff --git a/src/code/z_face_reaction.c b/src/code/z_face_reaction.c index 9864944b1c..ea6313a762 100644 --- a/src/code/z_face_reaction.c +++ b/src/code/z_face_reaction.c @@ -1,4 +1,6 @@ -#include "global.h" +#include "ultra64.h" +#include "z64face_reaction.h" +#include "z64player.h" u16 sMaskReactionSetTextIds[MASK_REACTION_SET_MAX][PLAYER_MASK_MAX] = { // MASK_REACTION_SET_CARPENTER_BOSS @@ -182,7 +184,7 @@ u16 sMaskReactionSetTextIds[MASK_REACTION_SET_MAX][PLAYER_MASK_MAX] = { { 0x0000, 0x7104, 0x7105, 0x7107, 0x7105, 0x710C, 0x7105, 0x7107, 0x7107 }, }; -u16 MaskReaction_GetTextId(PlayState* play, u32 maskReactionSet) { +u16 MaskReaction_GetTextId(struct PlayState* play, u32 maskReactionSet) { u8 currentMask = Player_GetMask(play); return sMaskReactionSetTextIds[maskReactionSet][currentMask]; diff --git a/src/code/z_frame_advance.c b/src/code/z_frame_advance.c index 486717a50f..5c8f685f22 100644 --- a/src/code/z_frame_advance.c +++ b/src/code/z_frame_advance.c @@ -3,7 +3,7 @@ #include "stdbool.h" #include "controller.h" -#include "padmgr.h" +#include "libu64/pad.h" #include "macros.h" void FrameAdvance_Init(FrameAdvanceContext* frameAdvCtx) { diff --git a/src/code/z_jpeg.c b/src/code/z_jpeg.c index 86a97183aa..81e2999462 100644 --- a/src/code/z_jpeg.c +++ b/src/code/z_jpeg.c @@ -1,6 +1,12 @@ #include "global.h" +#include "ultra64.h" +#include "attributes.h" +#include "jpeg.h" +#include "sys_ucode.h" #include "terminal.h" +#include "macros.h" + #define MARKER_ESCAPE 0x00 #define MARKER_SOI 0xD8 #define MARKER_SOF 0xC0 diff --git a/src/code/z_kankyo.c b/src/code/z_kankyo.c index 012ecdb742..ab0ceaecc9 100644 --- a/src/code/z_kankyo.c +++ b/src/code/z_kankyo.c @@ -1,5 +1,5 @@ -#pragma increment_block_number "gc-eu:224 gc-eu-mq:224 gc-jp:208 gc-jp-ce:208 gc-jp-mq:208 gc-us:208 gc-us-mq:208" \ - "ique-cn:208 ntsc-1.0:224 ntsc-1.1:224 ntsc-1.2:224 pal-1.0:232 pal-1.1:232" +#pragma increment_block_number "gc-eu:228 gc-eu-mq:228 gc-jp:208 gc-jp-ce:208 gc-jp-mq:208 gc-us:208 gc-us-mq:208" \ + "ique-cn:208 ntsc-1.0:224 ntsc-1.1:224 ntsc-1.2:224 pal-1.0:236 pal-1.1:236" #include "global.h" #include "ultra64.h" diff --git a/src/code/z_nulltask.c b/src/code/z_nulltask.c index 1f7dae689e..42ba3d86f9 100644 --- a/src/code/z_nulltask.c +++ b/src/code/z_nulltask.c @@ -1,4 +1,5 @@ -#include "global.h" +#include "ultra64.h" +#include "sched.h" /** * Blocks the current thread until all queued scheduler tasks have completed. diff --git a/src/code/z_path.c b/src/code/z_path.c index 7afe07aab8..29b51a8f17 100644 --- a/src/code/z_path.c +++ b/src/code/z_path.c @@ -1,6 +1,8 @@ #include "ultra64.h" #include "libc64/math64.h" #include "segmented_address.h" +#include "z64actor.h" +#include "z64path.h" #include "z64play.h" Path* Path_GetByIndex(PlayState* play, s16 index, s16 max) { diff --git a/src/code/z_room.c b/src/code/z_room.c index f03ac7881a..4050248b3b 100644 --- a/src/code/z_room.c +++ b/src/code/z_room.c @@ -1,5 +1,6 @@ #include "global.h" #include "fault.h" +#include "sys_ucode.h" #include "terminal.h" #include "versions.h" #include "line_numbers.h" diff --git a/src/code/z_skin.c b/src/code/z_skin.c index 4ba0f6cb47..508943cdd9 100644 --- a/src/code/z_skin.c +++ b/src/code/z_skin.c @@ -1,4 +1,10 @@ -#include "global.h" +#include "gfx.h" +#include "segmented_address.h" +#include "sys_matrix.h" +#include "z64math.h" +#include "z64play.h" +#include "z64skin.h" +#include "z64skin_matrix.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" \ "pal-1.1:128" diff --git a/src/code/z_skin_awb.c b/src/code/z_skin_awb.c index 55633bc872..8a175ed15f 100644 --- a/src/code/z_skin_awb.c +++ b/src/code/z_skin_awb.c @@ -1,5 +1,10 @@ -#include "global.h" #include "overlays/actors/ovl_En_fHG/z_en_fhg.h" +#include "segmented_address.h" +#include "zelda_arena.h" +#include "z64actor.h" +#include "z64play.h" +#include "z64skin.h" +#include "z64skin_matrix.h" /** * Initialises the Vtx buffers used for limb at index `limbIndex` diff --git a/src/libu64/mtxuty-cvt.c b/src/libu64/mtxuty-cvt.c index 10f88f7827..6fa038be13 100644 --- a/src/libu64/mtxuty-cvt.c +++ b/src/libu64/mtxuty-cvt.c @@ -1,4 +1,8 @@ -#include "global.h" +#include "ultra64.h" +#include "libu64/debug.h" +#include "libu64/mtxuty-cvt.h" + +#include "macros.h" void MtxConv_F2L(Mtx* m1, MtxF* m2) { s32 i; diff --git a/src/n64dd/z_n64dd.c b/src/n64dd/z_n64dd.c index 3524cd348e..1b6934f502 100644 --- a/src/n64dd/z_n64dd.c +++ b/src/n64dd/z_n64dd.c @@ -6,6 +6,7 @@ #include "stack.h" #include "versions.h" #include "line_numbers.h" +#include "z64thread.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" diff --git a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c index 67268e9e8a..a92c226117 100644 --- a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c +++ b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c @@ -16,8 +16,6 @@ #include "z_lib.h" #include "z64play.h" -#include "z64.h" - #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) void ArrowFire_Init(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c index e84af1d7b7..953e0a333c 100644 --- a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c +++ b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c @@ -16,8 +16,6 @@ #include "z_lib.h" #include "z64play.h" -#include "z64.h" - #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) void ArrowIce_Init(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c index 4f3f5572e1..100b8c20c1 100644 --- a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c +++ b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c @@ -16,8 +16,6 @@ #include "z_lib.h" #include "z64play.h" -#include "z64.h" - #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) void ArrowLight_Init(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c index 26870e2b8d..435ff81ac8 100644 --- a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c +++ b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c @@ -28,8 +28,6 @@ #include "z64player.h" #include "z64skin_matrix.h" -#include "global.h" - #include "assets/objects/object_sst/object_sst.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c b/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c index 9bf558e641..d61720cdf6 100644 --- a/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c +++ b/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c @@ -22,8 +22,6 @@ #include "z64play.h" #include "z64player.h" -#include "global.h" - #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_demo_6k/object_demo_6k.h" #include "assets/objects/object_gnd_magic/object_gnd_magic.h" diff --git a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c index a4ebdfb131..9e9510f2da 100644 --- a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c +++ b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c @@ -5,8 +5,16 @@ */ #include "z_elf_msg.h" -#include "global.h" + +#include "libu64/debug.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "ichain.h" +#include "regs.h" #include "terminal.h" +#include "z64play.h" +#include "z64player.h" + #include "overlays/actors/ovl_En_Elf/z_en_elf.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED diff --git a/src/overlays/actors/ovl_En_Ani/z_en_ani.c b/src/overlays/actors/ovl_En_Ani/z_en_ani.c index 74cc512104..752fe96004 100644 --- a/src/overlays/actors/ovl_En_Ani/z_en_ani.c +++ b/src/overlays/actors/ovl_En_Ani/z_en_ani.c @@ -13,10 +13,9 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" +#include "z64face_reaction.h" #include "z64play.h" -#include "global.h" - #include "assets/objects/object_ani/object_ani.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY) diff --git a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c index 669e5ed1fb..9000417a23 100644 --- a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c +++ b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c @@ -5,7 +5,21 @@ */ #include "z_en_arrow.h" -#include "global.h" + +#include "libc64/qrand.h" +#include "libu64/debug.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "ichain.h" +#include "regs.h" +#include "sfx.h" +#include "sys_math.h" +#include "sys_math3d.h" +#include "sys_matrix.h" +#include "z_lib.h" +#include "z64effect.h" +#include "z64play.h" + #include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) diff --git a/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c b/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c index f20feeefea..4a3a32663a 100644 --- a/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c +++ b/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c @@ -19,8 +19,6 @@ #include "z64play.h" #include "z64player.h" -#include "z64.h" - #include "assets/objects/object_niw/object_niw.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED diff --git a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c index ea86855810..c20520908a 100644 --- a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c +++ b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c @@ -16,8 +16,6 @@ #include "z64play.h" #include "z64player.h" -#include "global.h" - #include "assets/objects/object_bigokuta/object_bigokuta.h" #define FLAGS \ diff --git a/src/overlays/actors/ovl_En_Boom/z_en_boom.c b/src/overlays/actors/ovl_En_Boom/z_en_boom.c index 982df71a03..b9dcbacb76 100644 --- a/src/overlays/actors/ovl_En_Boom/z_en_boom.c +++ b/src/overlays/actors/ovl_En_Boom/z_en_boom.c @@ -5,7 +5,16 @@ */ #include "z_en_boom.h" -#include "global.h" + +#include "gfx.h" +#include "gfx_setupdl.h" +#include "ichain.h" +#include "sfx.h" +#include "sys_matrix.h" +#include "z_lib.h" +#include "z64effect.h" +#include "z64play.h" + #include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) diff --git a/src/overlays/actors/ovl_En_Box/z_en_box.c b/src/overlays/actors/ovl_En_Box/z_en_box.c index 2d7c748b47..1e1e2271f7 100644 --- a/src/overlays/actors/ovl_En_Box/z_en_box.c +++ b/src/overlays/actors/ovl_En_Box/z_en_box.c @@ -1,6 +1,23 @@ #include "z_en_box.h" -#include "global.h" #include "overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.h" + +#include "libc64/qrand.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "ichain.h" +#include "one_point_cutscene.h" +#include "sequence.h" +#include "sfx.h" +#include "sys_math3d.h" +#include "sys_matrix.h" +#include "z_lib.h" +#include "z64audio.h" +#include "z64curve.h" +#include "z64effect.h" +#include "z64ocarina.h" +#include "z64play.h" +#include "z64player.h" + #include "assets/objects/object_box/object_box.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_En_Bw/z_en_bw.c b/src/overlays/actors/ovl_En_Bw/z_en_bw.c index 61d7cc36d4..0aad9cccae 100644 --- a/src/overlays/actors/ovl_En_Bw/z_en_bw.c +++ b/src/overlays/actors/ovl_En_Bw/z_en_bw.c @@ -23,8 +23,6 @@ #include "z64play.h" #include "z64player.h" -#include "global.h" - #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_bw/object_bw.h" diff --git a/src/overlays/actors/ovl_En_Cs/z_en_cs.c b/src/overlays/actors/ovl_En_Cs/z_en_cs.c index b4f01197d4..877db78157 100644 --- a/src/overlays/actors/ovl_En_Cs/z_en_cs.c +++ b/src/overlays/actors/ovl_En_Cs/z_en_cs.c @@ -4,15 +4,14 @@ #include "libc64/qrand.h" #include "gfx.h" #include "gfx_setupdl.h" -#include "segmented_address.h"s +#include "segmented_address.h" #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" +#include "z64face_reaction.h" #include "z64play.h" #include "z64player.h" -#include "global.h" - #include "assets/objects/object_cs/object_cs.h" #include "assets/objects/object_link_child/object_link_child.h" diff --git a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c index 20b927ec46..d2897a0098 100644 --- a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c +++ b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c @@ -14,8 +14,6 @@ #include "z64play.h" #include "z64player.h" -#include "global.h" - #include "assets/objects/object_daiku/object_daiku.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) diff --git a/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c b/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c index 3071006ba9..2a77645647 100644 --- a/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c +++ b/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c @@ -14,11 +14,10 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" +#include "z64face_reaction.h" #include "z64play.h" #include "z64player.h" -#include "global.h" - #include "assets/objects/object_daiku/object_daiku.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) diff --git a/src/overlays/actors/ovl_En_Dh/z_en_dh.c b/src/overlays/actors/ovl_En_Dh/z_en_dh.c index f52a81bf6c..71792bab7f 100644 --- a/src/overlays/actors/ovl_En_Dh/z_en_dh.c +++ b/src/overlays/actors/ovl_En_Dh/z_en_dh.c @@ -23,8 +23,6 @@ #include "z64play.h" #include "z64player.h" -#include "global.h" - #include "assets/objects/object_dh/object_dh.h" #define FLAGS \ diff --git a/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c b/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c index 98ae6c9af6..e1016ad67e 100644 --- a/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c +++ b/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c @@ -19,11 +19,10 @@ #include "z_lib.h" #include "z64audio.h" #include "z64effect.h" +#include "z64face_reaction.h" #include "z64play.h" #include "z64player.h" -#include "global.h" - #include "assets/objects/object_zo/object_zo.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) diff --git a/src/overlays/actors/ovl_En_Dog/z_en_dog.c b/src/overlays/actors/ovl_En_Dog/z_en_dog.c index b86280fad0..8b69ed6278 100644 --- a/src/overlays/actors/ovl_En_Dog/z_en_dog.c +++ b/src/overlays/actors/ovl_En_Dog/z_en_dog.c @@ -12,8 +12,6 @@ #include "z_lib.h" #include "z64play.h" -#include "global.h" - #include "assets/objects/object_dog/object_dog.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_En_Door/z_en_door.c b/src/overlays/actors/ovl_En_Door/z_en_door.c index 4d650f0a1b..9b25aebe06 100644 --- a/src/overlays/actors/ovl_En_Door/z_en_door.c +++ b/src/overlays/actors/ovl_En_Door/z_en_door.c @@ -5,7 +5,17 @@ */ #include "z_en_door.h" -#include "global.h" + +#include "libc64/qrand.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "ichain.h" +#include "sfx.h" +#include "z_lib.h" +#include "z64effect.h" +#include "z64play.h" +#include "z64player.h" + #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" #include "assets/objects/object_hidan_objects/object_hidan_objects.h" diff --git a/src/overlays/actors/ovl_En_Du/z_en_du.c b/src/overlays/actors/ovl_En_Du/z_en_du.c index a4addc76c1..5aad8c5b5e 100644 --- a/src/overlays/actors/ovl_En_Du/z_en_du.c +++ b/src/overlays/actors/ovl_En_Du/z_en_du.c @@ -8,12 +8,11 @@ #include "sys_matrix.h" #include "z_lib.h" #include "z64audio.h" +#include "z64face_reaction.h" #include "z64ocarina.h" #include "z64play.h" #include "z64player.h" -#include "global.h" - #include "assets/objects/object_du/object_du.h" #include "assets/scenes/overworld/spot18/spot18_scene.h" diff --git a/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c b/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c index d804326890..d60d91c222 100644 --- a/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c +++ b/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c @@ -11,8 +11,6 @@ #include "z64play.h" #include "z64player.h" -#include "global.h" - #include "assets/objects/object_ei/object_ei.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE) diff --git a/src/overlays/actors/ovl_En_Fish/z_en_fish.c b/src/overlays/actors/ovl_En_Fish/z_en_fish.c index f2f9185a72..2ca4187542 100644 --- a/src/overlays/actors/ovl_En_Fish/z_en_fish.c +++ b/src/overlays/actors/ovl_En_Fish/z_en_fish.c @@ -5,9 +5,18 @@ */ #include "z_en_fish.h" -#include "global.h" -#include "assets/objects/gameplay_keep/gameplay_keep.h" + +#include "libc64/qrand.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "ichain.h" +#include "sfx.h" #include "terminal.h" +#include "z_lib.h" +#include "z64play.h" +#include "z64player.h" + +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_En_Fu/z_en_fu.c b/src/overlays/actors/ovl_En_Fu/z_en_fu.c index 71c392851f..0f8969734c 100644 --- a/src/overlays/actors/ovl_En_Fu/z_en_fu.c +++ b/src/overlays/actors/ovl_En_Fu/z_en_fu.c @@ -12,12 +12,11 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" +#include "z64face_reaction.h" #include "z64ocarina.h" #include "z64play.h" #include "z64player.h" -#include "global.h" - #include "assets/objects/object_fu/object_fu.h" #include "assets/scenes/indoors/hakasitarelay/hakasitarelay_scene.h" diff --git a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c index 0345bfbac6..c96f1fa5f8 100644 --- a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c +++ b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c @@ -14,12 +14,11 @@ #include "sys_matrix.h" #include "terminal.h" #include "z_lib.h" +#include "z64face_reaction.h" #include "z64horse.h" #include "z64play.h" #include "z64player.h" -#include "global.h" - #include "assets/objects/object_ge1/object_ge1.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY) diff --git a/src/overlays/actors/ovl_En_Go2/z_en_go2.c b/src/overlays/actors/ovl_En_Go2/z_en_go2.c index c66cf7b849..e99a3d1498 100644 --- a/src/overlays/actors/ovl_En_Go2/z_en_go2.c +++ b/src/overlays/actors/ovl_En_Go2/z_en_go2.c @@ -14,11 +14,10 @@ #include "versions.h" #include "z_lib.h" #include "z64audio.h" +#include "z64face_reaction.h" #include "z64play.h" #include "z64player.h" -#include "global.h" - #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_oF1d_map/object_oF1d_map.h" diff --git a/src/overlays/actors/ovl_En_Gs/z_en_gs.c b/src/overlays/actors/ovl_En_Gs/z_en_gs.c index 2e9c354579..4e590217f0 100644 --- a/src/overlays/actors/ovl_En_Gs/z_en_gs.c +++ b/src/overlays/actors/ovl_En_Gs/z_en_gs.c @@ -20,8 +20,6 @@ #include "z64play.h" #include "z64player.h" -#include "global.h" - #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_gs/object_gs.h" diff --git a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c index de71e48682..034e211d0a 100644 --- a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c +++ b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c @@ -16,11 +16,10 @@ #include "sys_matrix.h" #include "terminal.h" #include "z_lib.h" +#include "z64face_reaction.h" #include "z64play.h" #include "z64player.h" -#include "global.h" - #include "assets/objects/object_sd/object_sd.h" #include "assets/objects/object_link_child/object_link_child.h" diff --git a/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c b/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c index fd9498982f..7a88e66ebe 100644 --- a/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c +++ b/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c @@ -3,11 +3,10 @@ #include "gfx.h" #include "gfx_setupdl.h" #include "terminal.h" +#include "z64face_reaction.h" #include "z64play.h" #include "z64player.h" -#include "global.h" - #include "assets/objects/object_sd/object_sd.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY) diff --git a/src/overlays/actors/ovl_En_Horse/z_en_horse.c b/src/overlays/actors/ovl_En_Horse/z_en_horse.c index a2d4bc5f28..284d175bfe 100644 --- a/src/overlays/actors/ovl_En_Horse/z_en_horse.c +++ b/src/overlays/actors/ovl_En_Horse/z_en_horse.c @@ -29,8 +29,6 @@ #include "z64player.h" #include "z64skin_matrix.h" -#include "global.h" - #include "assets/objects/object_horse/object_horse.h" #include "assets/objects/object_hni/object_hni.h" #include "assets/scenes/overworld/spot09/spot09_scene.h" diff --git a/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c b/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c index 8078eac3c1..e1991688a1 100644 --- a/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c +++ b/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c @@ -17,8 +17,6 @@ #include "z64player.h" #include "z64skin.h" -#include "global.h" - #include "assets/objects/object_horse_ganon/object_horse_ganon.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED diff --git a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c index d88cf92eeb..9d82204298 100644 --- a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c +++ b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c @@ -4,18 +4,23 @@ * Description: Young Epona */ -#include "global.h" +#include "z_en_horse_link_child.h" + #include "gfx.h" #include "gfx_setupdl.h" #include "ichain.h" #include "rand.h" #include "regs.h" +#include "segmented_address.h" #include "sfx.h" +#include "sys_math3d.h" +#include "z_lib.h" #include "z64actor.h" #include "z64horse.h" #include "z64player.h" #include "z64play.h" -#include "z_en_horse_link_child.h" +#include "z64skin.h" + #include "assets/objects/object_horse_link_child/object_horse_link_child.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) diff --git a/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c b/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c index 08646b8a83..bd4e01cf89 100644 --- a/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c +++ b/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c @@ -20,8 +20,6 @@ #include "z64skin.h" #include "z64skin_matrix.h" -#include "global.h" - #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_horse_normal/object_horse_normal.h" diff --git a/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c b/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c index 6e513ff5cb..059f88c3ae 100644 --- a/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c +++ b/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c @@ -16,8 +16,6 @@ #include "z64play.h" #include "z64player.h" -#include "global.h" - #include "assets/objects/object_horse_zelda/object_horse_zelda.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED diff --git a/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c index 005e63258c..4914be17ed 100644 --- a/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c +++ b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c @@ -11,10 +11,9 @@ #include "sys_matrix.h" #include "terminal.h" #include "z_lib.h" +#include "z64face_reaction.h" #include "z64play.h" -#include "global.h" - #include "assets/objects/object_hs/object_hs.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY) diff --git a/src/overlays/actors/ovl_En_Hy/z_en_hy.c b/src/overlays/actors/ovl_En_Hy/z_en_hy.c index d7b4962c9f..ca004db5f0 100644 --- a/src/overlays/actors/ovl_En_Hy/z_en_hy.c +++ b/src/overlays/actors/ovl_En_Hy/z_en_hy.c @@ -16,11 +16,10 @@ #include "versions.h" #include "z_lib.h" #include "z64audio.h" +#include "z64face_reaction.h" #include "z64play.h" #include "z64player.h" -#include "global.h" - #include "assets/objects/object_aob/object_aob.h" #include "assets/objects/object_ahg/object_ahg.h" #include "assets/objects/object_bob/object_bob.h" diff --git a/src/overlays/actors/ovl_En_In/z_en_in.c b/src/overlays/actors/ovl_En_In/z_en_in.c index 333550942f..1910466d10 100644 --- a/src/overlays/actors/ovl_En_In/z_en_in.c +++ b/src/overlays/actors/ovl_En_In/z_en_in.c @@ -13,11 +13,10 @@ #include "versions.h" #include "z_lib.h" #include "z64audio.h" +#include "z64face_reaction.h" #include "z64play.h" #include "z64player.h" -#include "global.h" - #include "assets/objects/object_in/object_in.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) diff --git a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c index 03242220e0..f1099edf2b 100644 --- a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c +++ b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c @@ -5,10 +5,25 @@ */ #include "z_en_kanban.h" -#include "global.h" + +#include "libc64/math64.h" +#include "libc64/qrand.h" +#include "attributes.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "rand.h" +#include "segmented_address.h" +#include "sfx.h" +#include "sys_matrix.h" +#include "terminal.h" +#include "z_lib.h" +#include "z64effect.h" +#include "z64ocarina.h" +#include "z64play.h" +#include "z64player.h" + #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_kanban/object_kanban.h" -#include "terminal.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) diff --git a/src/overlays/actors/ovl_En_Kanban/z_en_kanban_gfx.inc.c b/src/overlays/actors/ovl_En_Kanban/z_en_kanban_gfx.inc.c index c38e9df942..3dca1d6259 100644 --- a/src/overlays/actors/ovl_En_Kanban/z_en_kanban_gfx.inc.c +++ b/src/overlays/actors/ovl_En_Kanban/z_en_kanban_gfx.inc.c @@ -1,4 +1,4 @@ -#include "z_en_kanban.h" +#include "ultra64.h" static u16 sShadowTexFlags[] = { 0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x100, diff --git a/src/overlays/actors/ovl_En_Ko/z_en_ko.c b/src/overlays/actors/ovl_En_Ko/z_en_ko.c index 54fee8f4ed..1f0d1f30fe 100644 --- a/src/overlays/actors/ovl_En_Ko/z_en_ko.c +++ b/src/overlays/actors/ovl_En_Ko/z_en_ko.c @@ -14,6 +14,7 @@ #include "terminal.h" #include "versions.h" #include "z_lib.h" +#include "z64face_reaction.h" #include "z64play.h" #include "z64player.h" diff --git a/src/overlays/actors/ovl_En_Kz/z_en_kz.c b/src/overlays/actors/ovl_En_Kz/z_en_kz.c index 03e8524ffc..7e4c7543e4 100644 --- a/src/overlays/actors/ovl_En_Kz/z_en_kz.c +++ b/src/overlays/actors/ovl_En_Kz/z_en_kz.c @@ -7,6 +7,7 @@ #include "z_en_kz.h" #include "libc64/math64.h" +#include "attributes.h" #include "gfx.h" #include "gfx_setupdl.h" #include "segmented_address.h" @@ -14,11 +15,10 @@ #include "sys_matrix.h" #include "versions.h" #include "z_lib.h" +#include "z64face_reaction.h" #include "z64play.h" #include "z64player.h" -#include "global.h" - #include "assets/objects/object_kz/object_kz.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY) diff --git a/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c b/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c index 1cf964b5b6..22ae984333 100644 --- a/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c +++ b/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c @@ -13,12 +13,11 @@ #include "sys_matrix.h" #include "z_lib.h" #include "z64audio.h" +#include "z64face_reaction.h" #include "z64ocarina.h" #include "z64play.h" #include "z64player.h" -#include "global.h" - #include "assets/objects/object_ma1/object_ma1.h" #define FLAGS \ diff --git a/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c b/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c index 9e8dad5401..5e2482df77 100644 --- a/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c +++ b/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c @@ -8,12 +8,11 @@ #include "sys_matrix.h" #include "z_lib.h" #include "z64audio.h" +#include "z64face_reaction.h" #include "z64ocarina.h" #include "z64play.h" #include "z64player.h" -#include "global.h" - #include "assets/objects/object_ma2/object_ma2.h" #define FLAGS \ diff --git a/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c b/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c index d0ce7b077a..ddf065f837 100644 --- a/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c +++ b/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c @@ -18,8 +18,6 @@ #include "z64play.h" #include "z64player.h" -#include "global.h" - #include "assets/objects/object_ma2/object_ma2.h" #define FLAGS \ diff --git a/src/overlays/actors/ovl_En_Md/z_en_md.c b/src/overlays/actors/ovl_En_Md/z_en_md.c index d2ea74a84a..9bf24e4acb 100644 --- a/src/overlays/actors/ovl_En_Md/z_en_md.c +++ b/src/overlays/actors/ovl_En_Md/z_en_md.c @@ -14,6 +14,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" +#include "z64face_reaction.h" #include "z64ocarina.h" #include "z64play.h" #include "z64player.h" diff --git a/src/overlays/actors/ovl_En_Mk/z_en_mk.c b/src/overlays/actors/ovl_En_Mk/z_en_mk.c index ec76d05029..42b68d1fb7 100644 --- a/src/overlays/actors/ovl_En_Mk/z_en_mk.c +++ b/src/overlays/actors/ovl_En_Mk/z_en_mk.c @@ -11,11 +11,10 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" +#include "z64face_reaction.h" #include "z64play.h" #include "z64player.h" -#include "global.h" - #include "assets/objects/object_mk/object_mk.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) diff --git a/src/overlays/actors/ovl_En_Mm/z_en_mm.c b/src/overlays/actors/ovl_En_Mm/z_en_mm.c index cd3f037148..c640ef74a6 100644 --- a/src/overlays/actors/ovl_En_Mm/z_en_mm.c +++ b/src/overlays/actors/ovl_En_Mm/z_en_mm.c @@ -14,11 +14,10 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" +#include "z64face_reaction.h" #include "z64play.h" #include "z64player.h" -#include "global.h" - #include "assets/objects/object_mm/object_mm.h" #include "assets/objects/object_link_child/object_link_child.h" diff --git a/src/overlays/actors/ovl_En_Ms/z_en_ms.c b/src/overlays/actors/ovl_En_Ms/z_en_ms.c index 33f645d2b6..2debeaf16a 100644 --- a/src/overlays/actors/ovl_En_Ms/z_en_ms.c +++ b/src/overlays/actors/ovl_En_Ms/z_en_ms.c @@ -9,10 +9,9 @@ #include "gfx.h" #include "gfx_setupdl.h" #include "ichain.h" +#include "z64face_reaction.h" #include "z64play.h" -#include "global.h" - #include "assets/objects/object_ms/object_ms.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY) diff --git a/src/overlays/actors/ovl_En_Mu/z_en_mu.c b/src/overlays/actors/ovl_En_Mu/z_en_mu.c index 1a48487d26..24f9bf22f9 100644 --- a/src/overlays/actors/ovl_En_Mu/z_en_mu.c +++ b/src/overlays/actors/ovl_En_Mu/z_en_mu.c @@ -10,10 +10,9 @@ #include "gfx.h" #include "sys_matrix.h" #include "z_lib.h" +#include "z64face_reaction.h" #include "z64play.h" -#include "global.h" - #include "assets/objects/object_mu/object_mu.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY) diff --git a/src/overlays/actors/ovl_En_Nb/z_en_nb.c b/src/overlays/actors/ovl_En_Nb/z_en_nb.c index e3ff7ac013..d765c7caae 100644 --- a/src/overlays/actors/ovl_En_Nb/z_en_nb.c +++ b/src/overlays/actors/ovl_En_Nb/z_en_nb.c @@ -18,11 +18,10 @@ #include "sys_matrix.h" #include "terminal.h" #include "z_lib.h" +#include "z64face_reaction.h" #include "z64play.h" #include "z64player.h" -#include "global.h" - #include "assets/objects/object_nb/object_nb.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED diff --git a/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c b/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c index f1b15076ca..892b1e8396 100644 --- a/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c +++ b/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c @@ -11,11 +11,10 @@ #include "terminal.h" #include "versions.h" #include "z_lib.h" +#include "z64face_reaction.h" #include "z64play.h" #include "z64player.h" -#include "global.h" - #include "assets/objects/object_ane/object_ane.h" #include "assets/objects/object_os_anime/object_os_anime.h" diff --git a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c index 1b549f772d..0f24ad4d0d 100644 --- a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c +++ b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c @@ -22,8 +22,6 @@ #include "z64play.h" #include "z64player.h" -#include "global.h" - #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_po_sisters/object_po_sisters.h" diff --git a/src/overlays/actors/ovl_En_Poh/z_en_poh.c b/src/overlays/actors/ovl_En_Poh/z_en_poh.c index 969260e5a1..d2f3dbe179 100644 --- a/src/overlays/actors/ovl_En_Poh/z_en_poh.c +++ b/src/overlays/actors/ovl_En_Poh/z_en_poh.c @@ -19,8 +19,6 @@ #include "z64play.h" #include "z64player.h" -#include "global.h" - #include "assets/objects/object_poh/object_poh.h" #include "assets/objects/object_po_composer/object_po_composer.h" diff --git a/src/overlays/actors/ovl_En_Rd/z_en_rd.c b/src/overlays/actors/ovl_En_Rd/z_en_rd.c index b735514051..3026636de5 100644 --- a/src/overlays/actors/ovl_En_Rd/z_en_rd.c +++ b/src/overlays/actors/ovl_En_Rd/z_en_rd.c @@ -20,8 +20,6 @@ #include "z64play.h" #include "z64player.h" -#include "global.h" - #include "assets/objects/object_rd/object_rd.h" #define FLAGS \ diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c index fcf2652175..9f5db67aa6 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c @@ -20,11 +20,10 @@ #include "versions.h" #include "z_lib.h" #include "z64effect.h" +#include "z64face_reaction.h" #include "z64play.h" #include "z64player.h" -#include "global.h" - #include "assets/objects/object_ru1/object_ru1.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_CAN_PRESS_SWITCHES) diff --git a/src/overlays/actors/ovl_En_Sa/z_en_sa.c b/src/overlays/actors/ovl_En_Sa/z_en_sa.c index 90e63fc1d7..c7a42e059d 100644 --- a/src/overlays/actors/ovl_En_Sa/z_en_sa.c +++ b/src/overlays/actors/ovl_En_Sa/z_en_sa.c @@ -7,11 +7,10 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" +#include "z64face_reaction.h" #include "z64play.h" #include "z64player.h" -#include "global.h" - #include "assets/objects/object_sa/object_sa.h" #include "assets/scenes/overworld/spot04/spot04_scene.h" #include "assets/scenes/overworld/spot05/spot05_scene.h" diff --git a/src/overlays/actors/ovl_En_Skj/z_en_skj.c b/src/overlays/actors/ovl_En_Skj/z_en_skj.c index 9d8ff555ca..3b976750e3 100644 --- a/src/overlays/actors/ovl_En_Skj/z_en_skj.c +++ b/src/overlays/actors/ovl_En_Skj/z_en_skj.c @@ -13,13 +13,12 @@ #include "z_lib.h" #include "z64audio.h" #include "z64debug_display.h" +#include "z64face_reaction.h" #include "z64ocarina.h" #include "z64effect.h" #include "z64play.h" #include "z64player.h" -#include "global.h" - #include "assets/objects/object_skj/object_skj.h" #define FLAGS \ diff --git a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c index f90bee0dcf..18d7fc3c32 100644 --- a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c +++ b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c @@ -6,11 +6,10 @@ #include "sys_matrix.h" #include "z_lib.h" #include "z64effect.h" +#include "z64face_reaction.h" #include "z64play.h" #include "z64player.h" -#include "global.h" - #include "assets/objects/object_ssh/object_ssh.h" #define FLAGS \ diff --git a/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c b/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c index a55d234477..7e4de74153 100644 --- a/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c +++ b/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c @@ -19,7 +19,6 @@ #include "z64play.h" #include "z64player.h" -#include "z64.h" #include "assets/objects/object_niw/object_niw.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED diff --git a/src/overlays/actors/ovl_En_Ta/z_en_ta.c b/src/overlays/actors/ovl_En_Ta/z_en_ta.c index 2cf923df0b..146ab6a0a9 100644 --- a/src/overlays/actors/ovl_En_Ta/z_en_ta.c +++ b/src/overlays/actors/ovl_En_Ta/z_en_ta.c @@ -20,11 +20,10 @@ #include "terminal.h" #include "z_lib.h" #include "z64audio.h" +#include "z64face_reaction.h" #include "z64play.h" #include "z64player.h" -#include "global.h" - #include "assets/objects/object_ta/object_ta.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY) diff --git a/src/overlays/actors/ovl_En_Tg/z_en_tg.c b/src/overlays/actors/ovl_En_Tg/z_en_tg.c index 2bd2a378d3..1fc830181b 100644 --- a/src/overlays/actors/ovl_En_Tg/z_en_tg.c +++ b/src/overlays/actors/ovl_En_Tg/z_en_tg.c @@ -8,10 +8,9 @@ #include "gfx.h" #include "sys_matrix.h" +#include "z64face_reaction.h" #include "z64play.h" -#include "global.h" - #include "assets/objects/object_mu/object_mu.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY) diff --git a/src/overlays/actors/ovl_En_Tk/z_en_tk.c b/src/overlays/actors/ovl_En_Tk/z_en_tk.c index a19b7ecc13..4187b915dd 100644 --- a/src/overlays/actors/ovl_En_Tk/z_en_tk.c +++ b/src/overlays/actors/ovl_En_Tk/z_en_tk.c @@ -16,10 +16,9 @@ #include "sys_matrix.h" #include "z_en_item00.h" #include "z_lib.h" +#include "z64face_reaction.h" #include "z64play.h" -#include "global.h" - #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_tk/object_tk.h" diff --git a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c index 3764145d20..3fe0ef7df4 100644 --- a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c +++ b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c @@ -22,8 +22,6 @@ #include "z64play.h" #include "z64player.h" -#include "global.h" - #include "assets/objects/object_torch2/object_torch2.h" #define FLAGS \ diff --git a/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c b/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c index 301e3336bd..dd2e469def 100644 --- a/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c +++ b/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c @@ -11,11 +11,10 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" +#include "z64face_reaction.h" #include "z64play.h" #include "z64player.h" -#include "global.h" - #include "assets/objects/object_toryo/object_toryo.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY) diff --git a/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c b/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c index b312e0fd6a..2e19328961 100644 --- a/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c +++ b/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c @@ -17,8 +17,6 @@ #include "z64play.h" #include "z64player.h" -#include "global.h" - #include "assets/objects/object_ei/object_ei.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE) diff --git a/src/overlays/actors/ovl_En_Zf/z_en_zf.c b/src/overlays/actors/ovl_En_Zf/z_en_zf.c index 41e4055fb2..843669b4ec 100644 --- a/src/overlays/actors/ovl_En_Zf/z_en_zf.c +++ b/src/overlays/actors/ovl_En_Zf/z_en_zf.c @@ -22,8 +22,6 @@ #include "z64play.h" #include "z64player.h" -#include "global.h" - #include "assets/objects/object_zf/object_zf.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED) diff --git a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c index 0aec93dbcb..b4acd1077c 100644 --- a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c +++ b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c @@ -26,8 +26,6 @@ #include "z64play.h" #include "z64player.h" -#include "global.h" - #include "overlays/actors/ovl_En_Encount2/z_en_encount2.h" #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h" #include "assets/objects/object_zl2/object_zl2.h" diff --git a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c index 0a66fff1f3..91ec0e5810 100644 --- a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c +++ b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c @@ -17,11 +17,10 @@ #include "sys_matrix.h" #include "z_lib.h" #include "z64audio.h" +#include "z64face_reaction.h" #include "z64play.h" #include "z64player.h" -#include "global.h" - #include "assets/objects/object_zl4/object_zl4.h" #include "assets/scenes/indoors/nakaniwa/nakaniwa_scene.h" diff --git a/src/overlays/actors/ovl_En_Zo/z_en_zo.c b/src/overlays/actors/ovl_En_Zo/z_en_zo.c index 9ab90f08ff..7023c96136 100644 --- a/src/overlays/actors/ovl_En_Zo/z_en_zo.c +++ b/src/overlays/actors/ovl_En_Zo/z_en_zo.c @@ -13,11 +13,10 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" +#include "z64face_reaction.h" #include "z64play.h" #include "z64player.h" -#include "global.h" - #include "assets/objects/object_zo/object_zo.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY) diff --git a/src/overlays/actors/ovl_En_fHG/z_en_fhg.c b/src/overlays/actors/ovl_En_fHG/z_en_fhg.c index 513dce9afd..7f34e8e7fd 100644 --- a/src/overlays/actors/ovl_En_fHG/z_en_fhg.c +++ b/src/overlays/actors/ovl_En_fHG/z_en_fhg.c @@ -23,8 +23,6 @@ #include "z64player.h" #include "z64skin.h" -#include "global.h" - #include "assets/objects/object_fhg/object_fhg.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED diff --git a/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c index 7ac997ae62..93c4b9cdf3 100644 --- a/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c +++ b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c @@ -5,8 +5,10 @@ */ #include "z_obj_makekinsuta.h" -#include "global.h" + #include "terminal.h" +#include "z64play.h" +#include "z64player.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED diff --git a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c index 18ea2231d5..a78c2e1306 100644 --- a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c +++ b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c @@ -12,8 +12,6 @@ #include "z64play.h" #include "z64player.h" -#include "global.h" - #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) void OceffStorm_Init(Actor* thisx, PlayState* play); diff --git a/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.c b/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.c index 5271fc1616..9be42db8d9 100644 --- a/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.c +++ b/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.c @@ -5,7 +5,15 @@ */ #include "z_eff_ss_hitmark.h" -#include "global.h" + +#include "gfx.h" +#include "gfx_setupdl.h" +#include "segmented_address.h" +#include "sys_matrix.h" +#include "z64effect.h" +#include "z64play.h" +#include "z64skin_matrix.h" + #include "assets/objects/gameplay_keep/gameplay_keep.h" #define rTexIndex regs[0] diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map.c index 232e7ae3fe..63b08448b3 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map.c @@ -1,5 +1,7 @@ #include "z_kaleido_scope.h" +#include "sys_ucode.h" #include "versions.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"