mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-06-11 21:18:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into z_en_tk

Browse Source
This commit is contained in:
glank
2020-03-21 12:31:29 +01:00
parent 8e5c9e78e4 af62b0e7d7
commit fa4c848cad
72 changed files with 994 additions and 2402 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
+14 -12
View File
@@ -760,7 +760,7 @@ void func_80062D60(GlobalContext*, Vec3f*);
s32 func_80062ECC(f32, f32, f32, Vec3f*, Vec3f*, Vec3f*, Vec3f*, Vec3f*);
void SaveContext_Init(void);
// ? func_800636C0(?);
void func_8006375C(UNK_TYPE, UNK_TYPE, UNK_TYPE);
void func_8006375C(s32 arg0, s32 arg1, float* d_80855320);
// ? func_8006376C(?);
// ? func_80063828(?);
// ? func_8006390C(?);
@@ -848,7 +848,7 @@ void func_800775D8();
s32 func_800775E4();
void func_800775F0(u16);
// ? func_80077600(?);
void Lib_MemSet(void* dest, size_t size, u8 val);
void Lib_MemSet(u8* dest, size_t size, u8 val);
f32 Math_Coss(s16 angle);
f32 Math_Sins(s16 angle);
s32 Math_ApproxUpdateScaledS(s16* fp, s16 target, s16 step);
@@ -923,10 +923,10 @@ u8 ZeldaArena_IsInitalized();
void MapMark_Init(GlobalContext* globalCtx);
void MapMark_ClearPointers(GlobalContext* globalCtx);
void MapMark_DrawConditionally(GlobalContext* globalCtx);
// ? func_8007BE60(?);
// ? func_8007BED4(?);
// ? func_8007BF08(?);
// ? func_8007BF10(?);
void PreNmiBuff_Init(PreNmiBuff* this);
void PreNmiBuff_SetReset(PreNmiBuff* this);
u32 PreNmiBuff_IsResetting(PreNmiBuff* this);
void MsgEvent_SendNullTask();
f32 func_8007BF90(Vec3f*, Vec3f*);
// ? func_8007C028(?);
// ? func_8007C058(?);
@@ -1476,7 +1476,7 @@ void* Graph_Alloc(GraphicsContext* gfxCtx, size_t size);
void func_800C6AC4(Gfx** a0, GraphicsContext* gfxCtx, char* file, s32 line);
void func_800C6B54(Gfx** a0, GraphicsContext* gfxCtx, char* file, s32 line);
Gfx* func_800C6C20(Gfx* a0);
// ? func_800C6C28(?);
Gfx* func_800C6C28(Gfx* a0, Gfx* dlist); //branch dlist
// ? func_800C6C3C(?);
ListAlloc* ListAlloc_Init(ListAlloc* this);
void* ListAlloc_Alloc(ListAlloc* this, u32 size);
@@ -1633,10 +1633,10 @@ void func_800D2264(MtxF* mf, Vec3s* vec, s32 flag);
void func_800D23FC(f32 f, Vec3f* vec, u8 mode);
MtxF* Matrix_CheckFloats(MtxF* mf, char* file, s32 line);
void func_800D2CEC(Mtx* mtx, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6);
// ? func_800D2DF0(?);
// ? func_800D2DFC(?);
// ? func_800D2E14(?);
// ? func_800D2E20(?);
// ? SysUcode_GetUCodeBoot(?);
// ? SysUcode_GetUcodeBootSize(?);
// ? SysUcode_GetUcode(?);
// ? SysUcode_GetUcodeData(?);
// ? func_800D2E30(?);
// ? func_800D3140(?);
// ? func_800D3140(?);
@@ -2386,5 +2386,7 @@ void func_801109B0(GlobalContext* globalCtx);
void func_80110F68(GlobalContext* globalCtx);
void func_80112098(GlobalContext* globalCtx);
void func_80800878(TitleContext*);
void Title_Init(TitleContext*);
void Opening_Init(OpeningContext* this);
#endif
include/regs.h
+6 -1
View File
@@ -1,7 +1,12 @@
#ifndef _REGS_H_
#define _REGS_H_
#define BASE_REG(n, r) gGameInfo->data[n * 96 + r]
#define REG_GROUPS 29 //number of REG groups, i.e. REG, SREG, OREG, etc.
#define REG_PAGES 6
#define REG_PER_PAGE 16
#define REG_PER_GROUP REG_PAGES * REG_PER_PAGE
#define BASE_REG(n, r) gGameInfo->data[n * REG_PER_GROUP + r]
#define REG(r) BASE_REG(0, r)
#define SREG(r) BASE_REG(1, r)
include/sched.h
+14 -2
View File
@@ -3,6 +3,16 @@
#include <global.h>
#define OS_SC_NEEDS_RDP 0x0001
#define OS_SC_NEEDS_RSP 0x0002
#define OS_SC_DRAM_DLIST 0x0004
#define OS_SC_PARALLEL_TASK 0x0010
#define OS_SC_LAST_TASK 0x0020
#define OS_SC_SWAPBUFFER 0x0040
#define OS_SC_RCP_MASK 0x0003
#define OS_SC_TYPE_MASK 0x0007
typedef struct OSScTask
{
/* 0x00 */ struct OSScTask* next;
@@ -10,8 +20,8 @@ typedef struct OSScTask
/* 0x08 */ u32 flags;
/* 0x0C */ void* framebuffer;
/* 0x10 */ OSTask list;
/* 0x58 */ OSMesgQueue* msgQ;
/* 0x5C */ OSMesg msg;
/* 0x50 */ OSMesgQueue* msgQ;
/* 0x54 */ OSMesg msg;
} OSScTask;
typedef struct
@@ -39,4 +49,6 @@ typedef struct
/* 0x0220 */ char unk_254[0x04];
} SchedContext; // size = 0x258
extern SchedContext gSchedContext;
#endif
include/segment_symbols.h
+1
View File
@@ -921,6 +921,7 @@ DECLARE_ROM_SEGMENT(g_pn_55)
DECLARE_ROM_SEGMENT(g_pn_56)
DECLARE_ROM_SEGMENT(g_pn_57)
DECLARE_ROM_SEGMENT(nintendo_rogo_static)
DECLARE_ROM_SEGMENT(title_static)
DECLARE_ROM_SEGMENT(parameter_static)
DECLARE_ROM_SEGMENT(vr_cloud2_static)
include/ultra64/mbi.h
+5 -3
View File
@@ -76,9 +76,11 @@
*
**************************************************************************/
#define M_GFXTASK 1
#define M_AUDTASK 2
#define M_VIDTASK 3
#define M_NULTASK 0
#define M_GFXTASK 1
#define M_AUDTASK 2
#define M_VIDTASK 3
#define M_NJPEGTASK 4
#define M_HVQTASK 6
#define M_HVQMTASK 7
include/variables.h
+4 -9
View File
@@ -259,8 +259,8 @@ extern s32 D_8011D3AC;
//extern ? D_8011E096;
//extern ? D_8011E098;
//extern ? D_8011E09A;
//extern ? D_8011E0B0;
//extern ? D_8011E0B4;
extern s16 D_8011E0B0;
extern Color_RGBA8 D_8011E0B4[];
//extern ? D_8011E0D4;
//extern ? D_8011F3A0;
//extern ? D_8011F3D4;
@@ -697,7 +697,7 @@ extern volatile u32 D_8012D290;
extern Mtx gMtxClear;
extern MtxF gMtxFClear;
//extern ? D_8012DBB0;
//extern ? D_8012DBC0;
extern u32 D_8012DBC0;
extern volatile u32 gIrqMgrResetStatus;
extern u32 D_8012DBA0;
extern u32 D_8012DBA4;
@@ -1355,11 +1355,6 @@ extern f32 D_80136D44;
//extern ? D_8013AC7C;
//extern ? D_8013ACA0;
//extern ? D_8013ACB8;
//extern ? D_8013AD40;
//extern ? D_8013AD50;
//extern ? D_8013AD54;
//extern ? D_8013AD60;
//extern ? D_8013AD70;
//extern ? D_8013B830;
//extern ? D_8013B844;
//extern ? D_8013B858;
@@ -3578,7 +3573,7 @@ extern Color_RGBA8 D_801614B0;
//extern ? D_801665E0;
//extern ? D_801665F0;
//extern ? D_80166648;
extern u8* gAppNmiBufferPtr;
extern PreNmiBuff* gAppNmiBufferPtr;
//extern ? gSchedContext;
//extern u8 gPadMgr[];
extern u8 D_80166B68;
include/z64.h
+30 -6
View File
@@ -33,8 +33,12 @@
// Data normally accessed through REG macros (see regs.h)
typedef struct
{
/* 0x00 */ char unk_00[0x14];
/* 0x14 */ s16 data[0xAE0];
/* 0x00 */ s32 regPage; //1 is first page
/* 0x04 */ s32 regGroup; //"register" group (R, RS, RO, RP etc.)
/* 0x08 */ s32 regCur; //selected register within page
/* 0x0C */ s32 dpadLast;
/* 0x10 */ s32 repeat;
/* 0x14 */ s16 data[REG_GROUPS * REG_PER_GROUP]; //0xAE0
} GameInfo; // size = 0x15D4
typedef struct
@@ -814,6 +818,11 @@ typedef struct
/* 0x04 */ u32 vromEnd;
} RomFile; // size = 0x8
typedef struct
{
/* 0x00 */ void* read_buff;
} Sram; // size = 0x4
typedef struct GameAllocEntry
{
/* 0x00 */ struct GameAllocEntry* next;
@@ -846,10 +855,17 @@ typedef struct GameState
typedef struct
{
/* 0x0000 */ GameState state;
/* 0x00A4 */ char unk_A4[0x12C];
/* 0x01D0 */ UNK_TYPE unk_1D0;
/* 0x01D4 */ char unk_1D4[0xD];
/* 0x01E1 */ u8 unk_1E1;
/* 0x00A4 */ void* staticSegment;
/* 0x00A8 */ View view;
/* 0x01D0 */ Sram sram;
/* 0x01D4 */ u16 unk_1D4; // not used in mq dbg (some sort of timer that doesn't seem to affect anything)
/* 0x01D6 */ s16 coverAlpha;
/* 0x01D8 */ s16 addAlpha; // not used in mq dbg
/* 0x01DA */ u16 visibleDuration; // not used in mq dbg
/* 0x01DC */ s16 ult;
/* 0x01DE */ s16 uls;
/* 0x01E0 */ char unk_1E0;
/* 0x01E1 */ u8 exit;
/* 0x01E2 */ char unk_1E2[6];
} TitleContext; // size = 0x1E8
@@ -1380,4 +1396,12 @@ typedef struct ListAlloc
/* 0x04 */ struct ListAlloc* next;
} ListAlloc; //size = 0x8
typedef struct
{
/* 0x00 */ u32 resetting;
/* 0x04 */ u32 resetCount;
/* 0x08 */ OSTime duration;
/* 0x10 */ OSTime resetTime;
} PreNmiBuff; //size = 0x18 (actually osAppNmiBuffer is 0x40 bytes large but the rest is unused)
#endif
include/z64actor.h
+1
View File
@@ -329,6 +329,7 @@ typedef struct
/* 0x15A */ u16 unk_15A;
/* 0x15C */ u32 unk_15C;
/* 0x160 */ u8 unk_160;
/* 0x162 */ s16 unk_162;
} DynaPolyActor; // size = 0x164
typedef struct