mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-05 07:24:34 +00:00
Code Issues Projects Releases Wiki Activity

Match 4 functions in z_player.c (#560)

Browse source 
* Match 4 functions z_player.c

Only Player_Init left

* Cleanup

* Review changes

* Unnecessary changes

* Remove asm again
This commit is contained in:
Synray 2020-12-27 17:45:03 -08:00 • committed by GitHub
parent dadf69a67e
commit fef0697063
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 29 additions and 2376 deletions
Download patch file Download diff file Expand all files Collapse all files

11
include/functions.h
View file

@ -546,6 +546,7 @@ void ActorOverlayTable_Cleanup(void);
// ? func_800389D4(?);
void func_80038A28(CollisionPoly* poly, f32 x, f32 y, f32 z, MtxF* mtxF);
f32 func_80038B7C(CollisionPoly*, Vec3f*);
void func_80038C78(CollisionPoly*, u8, CollisionContext*, Vec3f*);
// ? func_80038BE0(?);
// ? func_80038D48(?);
// ? func_80038E78(?);
@ -662,13 +663,21 @@ u16 func_80041B80(CollisionContext* colCtx, CollisionPoly* poly, s32 bgId);
Vec3s* func_80041C10(CollisionContext* colCtx, s32, s32);
Vec3s* func_80041C98(CollisionContext* colCtx, CollisionPoly*, s32);
u32 func_80041D4C(CollisionContext* colCtx, CollisionPoly* poly, s32 bgId);
s32 func_80041E4C(CollisionContext* colCtx, CollisionPoly* wallPoly, u8 source);
s32 func_80041EA4(CollisionContext* colCtx, CollisionPoly* floorPoly, s32 source);
// ? func_80041D94(?);
// ? func_80041DB8(?);
s32 func_80041DB8(CollisionContext* colCtx, CollisionPoly* floorPoly, s32 source);
s32 func_80041DE4(CollisionContext* colCtx, CollisionPoly* floorPoly, s32 source);
s32 func_80041E18(CollisionContext* colCtx, CollisionPoly* floorPoly, s32 source);
// ? func_80041EC8(?);
// ? func_80041F10(?);
u16 func_80041F34(CollisionContext*, CollisionPoly*, u32);
s32 func_80041FA0(CollisionContext*, CollisionPoly*, u32);
s32 func_80041FC4(CollisionContext* colCtx, CollisionPoly* floorPoly, s32 source);
s32 func_80042048(CollisionContext*, CollisionPoly*, s32);
s32 func_80042084(CollisionContext* colCtx, CollisionPoly* floorPoly, s32 source);
s32 func_800420C0(CollisionContext* colCtx, CollisionPoly* floorPoly, s32 source);
s32 func_800420E4(CollisionContext* colCtx, CollisionPoly* floorPoly, s32 source);
// ? func_80042108(?);
s32 func_8004213C(GlobalContext*, CollisionContext*, f32, f32, f32*, WaterBox**);
s32 func_8004239C(GlobalContext* globalCtx, CollisionContext* colCtx, Vec3f* arg2, f32 arg3, WaterBox** arg4);