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

Merge branch 'master' into ovl_En_Ik

Browse source
This commit is contained in:
Sirius902 2020-10-04 12:31:32 -07:00
commit f56668c8e2
279 changed files with 4691 additions and 15675 deletions
Download patch file Download diff file Expand all files Collapse all files

5
include/functions.h
View file

@ -654,7 +654,7 @@ void DynaPolyInfo_Alloc(UNK_PTR arg0, UNK_PTR arg1);
// ? func_80041B80(?);
struct_80041C10_ret* func_80041C10(CollisionContext* colCtx, s32, s32);
// ? func_80041C98(?);
// ? func_80041D4C(?);
UNK_TYPE func_80041D4C(CollisionContext*, CollisionPoly*, CollisionPoly*);
// ? func_80041D94(?);
// ? func_80041DB8(?);
// ? func_80041EC8(?);
@ -1115,7 +1115,7 @@ Vec3f* OLib_Vec3fDiffRad(Vec3f* dest, Vec3f* a, Vec3f* b);
// ? func_80080024(?);
s16 func_800800F8(GlobalContext* globalCtx, s16 arg1, s16 arg2, Actor* actor, s16 arg4);
void func_800803F0(GlobalContext* globalCtx, s16 camId);
UNK_RET func_80080480(GlobalContext* globalCtx, Actor* actor);
s16 func_80080480(GlobalContext* globalCtx, Actor* actor);
UNK_TYPE func_800806BC(GlobalContext* globalCtx, Actor* actor, UNK_TYPE);
UNK_TYPE func_80080728(GlobalContext* globalCtx, u8 actorType);
void func_80080788(UNK_TYPE, UNK_TYPE);
@ -2257,6 +2257,7 @@ void func_800F4190(Vec3f*, u16);
void func_800F436C(UNK_TYPE arg0, s16 arg1, f32 arg2);
// ? func_800F4414(?);
// ? func_800F4524(?);
void func_800F46E0(Vec3f* pos, f32 arg0);
// ? func_800F4784(?);
void func_800F47BC(void);
void func_800F47FC(void);