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

Merge remote-tracking branch 'upstream/master' into elemental-arrows

Browse Source
This commit is contained in:
fig02
2020-03-31 05:03:25 -04:00
parent 340fbd5a40 d75595de3c
commit 8d37f3a15e
372 changed files with 3338 additions and 4404 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
+37 -38
View File
@@ -403,8 +403,8 @@ void func_80034CC4(GlobalContext* globalCtx, SkelAnime* skelAnime, SkelAnime_Lim
SkelAnime_LimbAppendDlist2 unkFunc2, Actor* actor, s16 alpha);
void func_80034EC0(SkelAnime* skelAnime, struct_80034EC0_Entry* arg1, s32 arg2);
void Actor_Noop(Actor* actor, GlobalContext* globalCtx);
void Draw_DListOpa(GlobalContext* globalCtx, u32 dlist);
void Draw_DListXlu(GlobalContext* globalCtx, u32 dlist);
void Gfx_DrawDListOpa(GlobalContext* globalCtx, u32 dlist);
void Gfx_DrawDListXlu(GlobalContext* globalCtx, u32 dlist);
Actor* Actor_FindNearby(GlobalContext* globalCtx, Actor* refActor, s16 actorId, u8 actorType, f32 range);
s32 func_800354B4(GlobalContext* globalCtx, Actor* actor, f32 range, s16 arg3, s16 arg4, s16 arg5);
void func_8003555C(GlobalContext* globalCtx, Vec3f* arg1, Vec3f* arg2, Vec3f* arg3);
@@ -796,10 +796,8 @@ void func_800694A0(GlobalContext* globalCtx, s16 drawId);
// ? func_8006BA00(?);
// ? func_8006BA30(?);
void Audio_PlaySoundAtPosition(GlobalContext* globalCtx, Vec3f* pos2, s32 radius, u16 sfxId);
// ? func_8006BBC0(?);
// ? func_8006BE88(?);
// ? func_8006BF1C(?);
// ? func_8006C0FC(?);
u16 ElfMessage_GetSariaText(GlobalContext* globalCtx);
u16 ElfMessage_GetCUpText(GlobalContext* globalCtx);
u16 Text_GetFaceReaction(GlobalContext* globalCtx, u32 reactionSet);
// ? func_8006C3A0(?);
// ? func_8006C3D0(?);
@@ -1078,42 +1076,43 @@ void Quake_Init();
s16 Quake_Add(Camera* cam, u32 callbackIdx);
u32 Quake_RemoveFromIdx(s16 idx);
s16 Quake_Calc(Camera* camera, UnkQuakeCalcStruct* camData);
// ? func_80093370(?);
// ? func_80093708(?);
// ? func_8009373C(?);
Gfx* func_80093774(Gfx* a0, u32 a1);
Gfx* func_800937C0(Gfx* a0);
// ? func_80093808(?);
// ? func_800938B4(?);
// ? func_8009398C(?);
// ? func_80093AD0(?);
Gfx* Gfx_SetFog(Gfx* gfx, s32 r, s32 g, s32 b, s32 a, s32 n, s32 f);
Gfx* Gfx_SetFogWithSync(Gfx* gfx, s32 r, s32 g, s32 b, s32 a, s32 n, s32 f);
Gfx* Gfx_SetFog2(Gfx* gfx, s32 r, s32 g, s32 b, s32 a, s32 n, s32 f);
Gfx* Gfx_CallSetupDL(Gfx* gfx, u32 i);
Gfx* func_800937C0(Gfx* gfx);
Gfx* func_80093808(Gfx* gfx);
void func_800938B4(GraphicsContext* gfxCtx);
void func_8009398C(GraphicsContext* gfxCtx);
void func_80093AD0(GraphicsContext* gfxCtx);
void func_80093BA8(GraphicsContext* gfxCtx);
// ? func_80093C80(?);
void func_80093C80(GlobalContext* globalCtx);
void func_80093D18(GraphicsContext* gfxCtx);
void func_80093D84(GraphicsContext* gfxCtx);
// ? func_80093F34(?);
// ? func_80093F58(?);
Gfx* func_80093F34(Gfx* gfx);
Gfx* func_80093F58(Gfx* gfx);
void func_80094044(GraphicsContext* gfxCtx);
// ? func_800940B0(?);
// ? func_800942F0(?);
// ? func_8009435C(?);
// ? func_800944A0(?);
// ? func_80094520(?);
// ? func_8009457C(?);
// ? func_800945A0(?);
// ? func_80094678(?);
Gfx* func_800946E4(Gfx* a0);
// ? func_800947AC(?);
// ? func_80094A14(?);
// ? func_80094C50(?);
// ? func_80094DB8(?);
void func_800940B0(GraphicsContext* gfxCtx);
void func_800942F0(GraphicsContext* gfxCtx);
void func_8009435C(GraphicsContext* gfxCtx);
Gfx* func_800944A0(Gfx* gfx);
void func_80094520(GraphicsContext* gfxCtx);
void func_8009457C(Gfx** gfxp);
void func_800945A0(GraphicsContext* gfxCtx);
void func_80094678(GraphicsContext* gfxCtx);
Gfx* func_800946E4(Gfx* gfx);
Gfx* func_800947AC(Gfx* gfx);
void func_80094A14(GraphicsContext* gfxCtx);
void func_80094C50(GraphicsContext* gfxCtx);
void Gfx_BranchTexScroll(Gfx** gfxp, u32 x, u32 y, s32 width, s32 height);
Gfx* func_80094E78(GraphicsContext* gfxCtx, u32 x, u32 y);
Gfx* Draw_TexScroll(GraphicsContext* gfxCtx, u32 x, u32 y, s32 width, s32 height);
Gfx* Draw_TwoTexScroll(GraphicsContext* gfxCtx, s32 tile1, u32 x1, u32 y1, s32 width1, s32 height1, s32 tile2, u32 x2,
u32 y2, s32 width2, s32 height2);
Gfx* Draw_TwoTexScrollEnvColor(GraphicsContext* gfxCtx, s32 tile1, u32 x1, u32 y1, s32 width1, s32 height1, s32 tile2,
u32 x2, u32 y2, s32 width2, s32 height2, s32 red, s32 green, s32 blue, s32 alpha);
// ? func_80095248(?);
Gfx* Gfx_TexScroll(GraphicsContext* gfxCtx, u32 x, u32 y, s32 width, s32 height);
Gfx* Gfx_TwoTexScroll(GraphicsContext* gfxCtx, s32 tile1, u32 x1, u32 y1, s32 width1, s32 height1, s32 tile2, u32 x2,
u32 y2, s32 width2, s32 height2);
Gfx* Gfx_TwoTexScrollEnvColor(GraphicsContext* gfxCtx, s32 tile1, u32 x1, u32 y1, s32 width1, s32 height1, s32 tile2,
u32 x2, u32 y2, s32 width2, s32 height2, s32 r, s32 g, s32 b, s32 a);
void func_80095248(GraphicsContext* gfxCtx, u8 r, u8 g, u8 b);
void func_80095974(GraphicsContext* gfxCtx);
void func_80095AA0(GlobalContext* globalCtx, Room* room, UNK_TYPE arg2, UNK_TYPE arg3);
// ? func_8009638C(?);
void func_80096FD4(GlobalContext* globalCtx, Room* room);
@@ -1541,7 +1540,7 @@ 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);
Gfx* func_800C6C28(Gfx* a0, Gfx* dlist); // branch dlist
// ? func_800C6C3C(?);
Gfx* func_800C6C3C(Gfx** a0, u32 size);
ListAlloc* ListAlloc_Init(ListAlloc* this);
void* ListAlloc_Alloc(ListAlloc* this, u32 size);
void ListAlloc_Free(ListAlloc* this, void* data);
include/ultra64/gbi.h
+2 -2
View File
@@ -4201,7 +4201,7 @@ _DW({ \
#define gDPSetScissorFrac(pkt, mode, ulx, uly, lrx, lry) \
{ \
_DW({ \
Gfx *_g = (Gfx *)pkt; \
\
_g->words.w0 = _SHIFTL(G_SETSCISSOR, 24, 8) | \
@@ -4210,7 +4210,7 @@ _DW({ \
_g->words.w1 = _SHIFTL(mode, 24, 2) | \
_SHIFTL((int)((lrx)), 12, 12) | \
_SHIFTL((int)((lry)), 0, 12); \
}
})
#define gsDPSetScissor(mode, ulx, uly, lrx, lry) \
{ \
include/variables.h
+2 -51
View File
@@ -263,8 +263,6 @@ extern s32 D_8011D3AC;
extern s16 D_8011E0B0;
extern Color_RGBA8 D_8011E0B4[];
//extern ? D_8011E0D4;
//extern ? D_8011F3A0;
//extern ? D_8011F3D4;
//extern ? D_8011F830;
//extern ? D_8011F860;
//extern ? D_8011F890;
@@ -481,54 +479,7 @@ extern s16 gSpoilingItemReverts[3];
//extern ? D_80126240;
//extern ? D_80126250;
//extern ? D_80126254;
//extern ? D_80126280;
//extern ? D_801262E0;
//extern ? D_80126340;
//extern ? D_80126640;
//extern ? D_80126730;
//extern ? D_80126760;
//extern ? D_80126790;
//extern ? D_801267C0;
//extern ? D_80126850;
//extern ? D_80126880;
//extern ? D_801268B0;
//extern ? D_801268E0;
//extern ? D_80126910;
//extern ? D_80126940;
//extern ? D_80126970;
//extern ? D_801269A0;
//extern ? D_801269D0;
//extern ? D_80126A00;
//extern ? D_80126A30;
//extern ? D_80126A60;
//extern ? D_80126A90;
//extern ? D_80126AC0;
//extern ? D_80126AF0;
//extern ? D_80126B20;
//extern ? D_80126B50;
//extern ? D_80126B80;
//extern ? D_80126BB0;
//extern ? D_80126BE0;
//extern ? D_80126C10;
//extern ? D_80126C40;
//extern ? D_80126C70;
//extern ? D_80126CA0;
//extern ? D_80126CD0;
//extern ? D_80126D00;
//extern ? D_80126D30;
//extern ? D_80126D60;
//extern ? D_80126D90;
//extern ? D_80126DC0;
//extern ? D_80126DF0;
//extern ? D_80126E80;
//extern ? D_80126EB0;
//extern ? D_80126EE0;
//extern ? D_80126F10;
//extern ? D_80126F40;
//extern ? D_80126F70;
//extern ? D_80126FA0;
//extern ? D_80126FD0;
extern Gfx D_80127098[];
extern Gfx gEmptyDL[];
extern u32 gBitFlags[32];
extern u16 gEquipMasks[4];
extern u16 gEquipNegMasks[4];
@@ -3545,7 +3496,7 @@ extern u8 D_801610DA;
//extern ? D_80161360;
//extern ? D_801613B0;
//extern ? D_8016148C;
//extern ? D_80161490;
extern s32 D_80161490;
//extern ? D_80161498;
extern Color_RGBA8 D_801614B0;
//extern ? D_801614B3;
include/z64.h
+10 -1
View File
@@ -241,6 +241,8 @@ typedef struct {
/* 0x02A8 */ TwoHeadGfxArena overlay;
/* 0x02B8 */ TwoHeadGfxArena polyOpa;
/* 0x02C8 */ TwoHeadGfxArena polyXlu;
/* 0x02D8 */ char unk_2D8[0x0004];
/* 0x02DC */ UNK_TYPE unk_2DC;
} GraphicsContext;
typedef struct {
@@ -801,6 +803,13 @@ typedef struct
/* 0x00A8 */ View view;
} SampleContext;
typedef struct {
/* 0x00 */ u8 byte0;
/* 0x01 */ u8 byte1;
/* 0x02 */ u8 byte2;
/* 0x03 */ u8 byte3;
} ElfMessage; // size = 0x4
// Global Context (dbg ram start: 80212020)
typedef struct GlobalContext {
/* 0x00000 */ GameState state;
@@ -902,7 +911,7 @@ typedef struct GlobalContext {
/* 0x11E00 */ EntranceEntry* setupEntranceList;
/* 0x11E04 */ UNK_PTR setupExitList;
/* 0x11E08 */ Path* setupPathList;
/* 0x11E0C */ UNK_PTR naviMsgSegment;
/* 0x11E0C */ ElfMessage* cUpElfMsgs;
/* 0x11E10 */ char unk_11E10[0x4];
/* 0x11E14 */ u8 skyboxId;
/* 0x11E15 */ s8 sceneLoadFlag; // "fade_direction"
include/z64scene.h
+1 -1
View File
@@ -66,7 +66,7 @@ typedef struct {
typedef struct {
/* 0x00 */ u8 code;
/* 0x01 */ u8 naviMsgNum;
/* 0x01 */ u8 cUpElfMsgNum;
/* 0x04 */ u32 keepObjectId;
} SCmdSpecialFiles;