mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-04-08 15:46:42 +00:00
Code Issues Projects Releases Wiki Activity

Reduce overlay dependencies on global.h (6) (#2468)

Browse source 
* 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 8fc74c0672.

* split z64path.h and z64skin.h functions

* z64face_reaction.h

* cleanup overlay global references

* trim padding

* bss
This commit is contained in:
mzxrules 2025-02-13 18:15:14 -05:00 • committed by GitHub
parent 494aecc9fc
commit 4639914583
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
116 changed files with 419 additions and 297 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/fault.h
View file

@ -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

38
include/functions.h
View file

@ -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(?);

9
include/libu64/mtxuty-cvt.h Normal file
View file

@ -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

5
include/macros.h
View file

@ -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)

11
include/sys_ucode.h Normal file
View file

@ -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

1
include/variables.h
View file

@ -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;

30
include/z64.h
View file

@ -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)

74
include/z64face_reaction.h Normal file
View file

@ -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

15
include/z64game.h
View file

@ -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

1
include/z64inventory.h
View file

@ -3,7 +3,6 @@
#include "ultra64.h"
#include "z64item.h"
#include "z64save.h"
struct PlayState;

64
include/z64message.h
View file

@ -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,

19
include/z64path.h Normal file
View file

@ -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

2
include/z64play.h
View file

@ -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;

6
include/z64scene.h
View file

@ -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 {

19
include/z64skin.h
View file

@ -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

33
include/z64thread.h Normal file
View file

@ -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

1
src/boot/boot_main.c
View file

@ -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"

1
src/boot/idle.c
View file

@ -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"

3
src/boot/z_std_dma.c
View file

@ -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;

3
src/code/fault_gc.c
View file

@ -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);

1
src/code/fault_n64.c
View file

@ -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"

1
src/code/graph.c
View file

@ -1,5 +1,6 @@
#include "global.h"
#include "fault.h"
#include "sys_ucode.h"
#include "terminal.h"
#include "ucode_disas.h"
#include "versions.h"

1
src/code/irqmgr.c
View file

@ -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;

3
src/code/main.c
View file

@ -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[];

1
src/code/padmgr.c
View file

@ -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"

1
src/code/sched.c
View file

@ -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

12
src/code/sys_matrix.c
View file

@ -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"

2
src/code/sys_ucode.c
View file

@ -1,4 +1,4 @@
#include "global.h"
#include "ultra64.h"
u64* sDefaultGSPUCodeText = gspF3DZEX2_NoN_PosLight_fifoTextStart;
u64* sDefaultGSPUCodeData = gspF3DZEX2_NoN_PosLight_fifoDataStart;

7
src/code/ucode_disas.c
View file

@ -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

19
src/code/z_actor.c
View file

@ -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"

2
src/code/z_camera.c
View file

@ -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;

6
src/code/z_face_reaction.c
View file

@ -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];

2
src/code/z_frame_advance.c
View file

@ -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) {

6
src/code/z_jpeg.c
View file

@ -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

4
src/code/z_kankyo.c
View file

@ -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"

3
src/code/z_nulltask.c
View file

@ -1,4 +1,5 @@
#include "global.h"
#include "ultra64.h"
#include "sched.h"
/**
* Blocks the current thread until all queued scheduler tasks have completed.

2
src/code/z_path.c
View file

@ -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) {

1
src/code/z_room.c
View file

@ -1,5 +1,6 @@
#include "global.h"
#include "fault.h"
#include "sys_ucode.h"
#include "terminal.h"
#include "versions.h"
#include "line_numbers.h"

8
src/code/z_skin.c
View file

@ -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"

7
src/code/z_skin_awb.c
View file

@ -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`

6
src/libu64/mtxuty-cvt.c
View file

@ -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;

1
src/n64dd/z_n64dd.c
View file

@ -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"

2
src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c
View file

@ -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);

2
src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c
View file

@ -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);

2
src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c
View file

@ -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);

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

@ -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"

2
src/overlays/actors/ovl_Demo_6K/z_demo_6k.c
View file

@ -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"

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

@ -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

3
src/overlays/actors/ovl_En_Ani/z_en_ani.c
View file

@ -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)

16
src/overlays/actors/ovl_En_Arrow/z_en_arrow.c
View file

@ -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)

2
src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c
View file

@ -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

2
src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c
View file

@ -16,8 +16,6 @@
#include "z64play.h"
#include "z64player.h"
#include "global.h"
#include "assets/objects/object_bigokuta/object_bigokuta.h"
#define FLAGS \

11
src/overlays/actors/ovl_En_Boom/z_en_boom.c
View file

@ -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)

19
src/overlays/actors/ovl_En_Box/z_en_box.c
View file

@ -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

2
src/overlays/actors/ovl_En_Bw/z_en_bw.c
View file

@ -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"

5
src/overlays/actors/ovl_En_Cs/z_en_cs.c
View file

@ -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"

2
src/overlays/actors/ovl_En_Daiku/z_en_daiku.c
View file

@ -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)

3
src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c
View file

@ -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)

2
src/overlays/actors/ovl_En_Dh/z_en_dh.c
View file

@ -23,8 +23,6 @@
#include "z64play.h"
#include "z64player.h"
#include "global.h"
#include "assets/objects/object_dh/object_dh.h"
#define FLAGS \

3
src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c
View file

@ -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)

2
src/overlays/actors/ovl_En_Dog/z_en_dog.c
View file

@ -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

12
src/overlays/actors/ovl_En_Door/z_en_door.c
View file

@ -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"

3
src/overlays/actors/ovl_En_Du/z_en_du.c
View file

@ -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"

2
src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c
View file

@ -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)

13
src/overlays/actors/ovl_En_Fish/z_en_fish.c
View file

@ -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

3
src/overlays/actors/ovl_En_Fu/z_en_fu.c
View file

@ -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"

3
src/overlays/actors/ovl_En_Ge1/z_en_ge1.c
View file

@ -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)

3
src/overlays/actors/ovl_En_Go2/z_en_go2.c
View file

@ -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"

2
src/overlays/actors/ovl_En_Gs/z_en_gs.c
View file

@ -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"

3
src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c
View file

@ -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"

3
src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c
View file

@ -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)

2
src/overlays/actors/ovl_En_Horse/z_en_horse.c
View file

@ -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"

2
src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c
View file

@ -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

9
src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c
View file

@ -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)

2
src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c
View file

@ -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"

2
src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c
View file

@ -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

3
src/overlays/actors/ovl_En_Hs2/z_en_hs2.c
View file

@ -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)

3
src/overlays/actors/ovl_En_Hy/z_en_hy.c
View file

@ -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"

3
src/overlays/actors/ovl_En_In/z_en_in.c
View file

@ -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)

19
src/overlays/actors/ovl_En_Kanban/z_en_kanban.c
View file

@ -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)

2
src/overlays/actors/ovl_En_Kanban/z_en_kanban_gfx.inc.c
View file

@ -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,

1
src/overlays/actors/ovl_En_Ko/z_en_ko.c
View file

@ -14,6 +14,7 @@
#include "terminal.h"
#include "versions.h"
#include "z_lib.h"
#include "z64face_reaction.h"
#include "z64play.h"
#include "z64player.h"

4
src/overlays/actors/ovl_En_Kz/z_en_kz.c
View file

@ -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)

3
src/overlays/actors/ovl_En_Ma1/z_en_ma1.c
View file

@ -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 \

3
src/overlays/actors/ovl_En_Ma2/z_en_ma2.c
View file

@ -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 \

2
src/overlays/actors/ovl_En_Ma3/z_en_ma3.c
View file

@ -18,8 +18,6 @@
#include "z64play.h"
#include "z64player.h"
#include "global.h"
#include "assets/objects/object_ma2/object_ma2.h"
#define FLAGS \

1
src/overlays/actors/ovl_En_Md/z_en_md.c
View file

@ -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"

3
src/overlays/actors/ovl_En_Mk/z_en_mk.c
View file

@ -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)

3
src/overlays/actors/ovl_En_Mm/z_en_mm.c
View file

@ -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"

3
src/overlays/actors/ovl_En_Ms/z_en_ms.c
View file

@ -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)

3
src/overlays/actors/ovl_En_Mu/z_en_mu.c
View file

@ -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)

3
src/overlays/actors/ovl_En_Nb/z_en_nb.c
View file

@ -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

3
src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c
View file

@ -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"

2
src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c
View file

@ -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"

2
src/overlays/actors/ovl_En_Poh/z_en_poh.c
View file

@ -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"

2
src/overlays/actors/ovl_En_Rd/z_en_rd.c
View file

@ -20,8 +20,6 @@
#include "z64play.h"
#include "z64player.h"
#include "global.h"
#include "assets/objects/object_rd/object_rd.h"
#define FLAGS \

3
src/overlays/actors/ovl_En_Ru1/z_en_ru1.c
View file

@ -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)

3
src/overlays/actors/ovl_En_Sa/z_en_sa.c
View file

@ -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"

3
src/overlays/actors/ovl_En_Skj/z_en_skj.c
View file

@ -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 \

3
src/overlays/actors/ovl_En_Ssh/z_en_ssh.c
View file

@ -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 \

Some files were not shown because too many files have changed in this diff Show more