mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-08-10 11:14:18 -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-30 05:52:27 -04:00
parent d8cd8450c4 51c85fe660
commit dd0541751c
164 changed files with 2022 additions and 5057 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
+24 -14
View File
@@ -831,6 +831,7 @@ void func_8006EE48(UNK_TYPE);
// ? func_8006F0FC(?);
// ? func_8006F140(?);
f32 func_8006F93C(u16, u16, u16);
f32 func_8006F9BC(u16, u16, u16, u16, u16);
// ? func_8006FB94(?);
// ? func_8006FC88(?);
// ? func_80070600(?);
@@ -856,6 +857,7 @@ f32 func_800746DC();
// ? func_800766C4(?);
// ? func_8007672C(?);
// ? func_80076934(?);
void func_800773A8(GlobalContext* globalCtx, f32 arg1, f32 arg2, f32 arg3, f32 arg4);
s32 func_800775CC();
void func_800775D8();
s32 func_800775E4();
@@ -1054,20 +1056,28 @@ u8 func_80090480(GlobalContext* globalCtx, Collider* collider, UNK_PTR a2, Vec3f
// ? func_80091880(?);
// ? func_80091A24(?);
void PreNMI_Init(PreNMIContext* prenmiCtx);
// ? func_80092500(?);
// ? func_80092584(?);
// ? func_80092AB8(?);
// ? func_80092B48(?);
// ? func_80092BFC(?);
// ? func_80092C20(?);
void func_80092DAC(s16, s16);
void func_80092DF0(s16, s16);
// ? func_80092E3C(?);
void func_80092E70(s16, s16, UNK_TYPE, UNK_TYPE, UNK_TYPE);
// ? func_80092F38(?);
s16 func_80092F88(Camera*, UNK_TYPE);
// ? func_80092FAC(?);
// ? func_80092FF0(?);
Vec3f* Quake_AddVec(Vec3f* dst, Vec3f* arg1, struct_80045714* arg2);
void Quake_UpdateShakeInfo(QuakeRequest* req, ShakeInfo* shake, f32 y, f32 x);
s16 Quake_Callback1(QuakeRequest* req, ShakeInfo* shake);
s16 Quake_Callback2(QuakeRequest* req, ShakeInfo* shake);
s16 Quake_Callback3(QuakeRequest* req, ShakeInfo* shake);
s16 Quake_Callback4(QuakeRequest* req, ShakeInfo* shake);
s16 Quake_Callback5(QuakeRequest* req, ShakeInfo* shake);
s16 Quake_Callback6(QuakeRequest* req, ShakeInfo* shake);
s16 Quake_GetFreeIndex();
QuakeRequest* Quake_AddImpl(Camera* cam, u32 callbackIdx);
void Quake_Remove(QuakeRequest* req);
QuakeRequest* Quake_GetRequest(s16 idx);
QuakeRequest* Quake_SetValue(s16 idx, s16 valueType, s16 value);
u32 Quake_SetSpeed(s16 idx, s16 value);
u32 Quake_SetCountdown(s16 idx, s16 value);
s16 Quake_GetCountdown(s16 idx);
u32 Quake_SetQuakeValues(s16 idx, s16 y, s16 x, s16 zoom, s16 rotZ);
u32 Quake_SetUnkValues(s16 idx, s16 arg1, SubQuakeRequest14 arg2);
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(?);
include/variables.h
+2 -1
View File
@@ -185,7 +185,8 @@ extern EffectTableInfo EffectSS2Info; // 801158B0
//extern ? D_80115F68;
//extern ? D_80115F6C;
//extern ? D_80115F70;
extern ActorOverlay gActorOverlayTable[471]; // original name: "actor_dlftbls"
extern Gfx D_80116280[];
extern ActorOverlay gActorOverlayTable[471]; // original name: "actor_dlftbls" 801162A0
extern s32 gMaxProfile;
//extern ? D_80119E2C;
//extern ? D_80119E52;
include/z64.h
+39
View File
@@ -1277,4 +1277,43 @@ typedef struct {
/* 0x10 */ OSTime resetTime;
} PreNmiBuff; // size = 0x18 (actually osAppNmiBuffer is 0x40 bytes large but the rest is unused)
typedef struct {
/* 0x00 */ s16 unk_00;
/* 0x02 */ s16 unk_02;
/* 0x04 */ s16 unk_04;
} SubQuakeRequest14;
typedef struct {
/* 0x00 */ s16 randIdx;
/* 0x02 */ s16 countdownMax;
/* 0x04 */ Camera* cam;
/* 0x08 */ u32 callbackIdx;
/* 0x0C */ s16 y;
/* 0x0E */ s16 x;
/* 0x10 */ s16 zoom;
/* 0x12 */ s16 rotZ;
/* 0x14 */ SubQuakeRequest14 unk_14;
/* 0x1A */ s16 speed;
/* 0x1C */ s16 unk_1C;
/* 0x1E */ s16 countdown;
/* 0x20 */ s16 camPtrIdx;
} QuakeRequest; // size = 0x24
typedef struct {
/* 0x00 */ Vec3f vec1;
/* 0x0C */ Vec3f vec2;
/* 0x18 */ s16 rotZ;
/* 0x1A */ s16 unk_1A;
/* 0x1C */ s16 zoom;
} ShakeInfo; // size = 0x1E
typedef struct {
/* 0x00 */ Vec3f vec1;
/* 0x0C */ Vec3f vec2;
/* 0x18 */ s16 rotZ;
/* 0x1A */ s16 unk_1A;
/* 0x1C */ s16 zoom;
/* 0x20 */ f32 unk_20;
} UnkQuakeCalcStruct; // size = 0x24
#endif
include/z64actor.h
+3 -3
View File
@@ -275,9 +275,9 @@ typedef struct {
typedef struct {
/* 0x00 */ ColliderBodyInfo body;
/* 0x06 */ ColliderBodyInfoInner inner;
/* 0x20 */ ColliderDimensions dim;
} ColliderCylinderInit; // size = 0x2C
/* 0x08 */ ColliderBodyInfoInner inner;
/* 0x22 */ ColliderDimensions dim;
} ColliderCylinderInit; // size = 0x2E
typedef struct {
/* 0x00 */ Actor* actor;