mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-10-20 13:40:02 +00:00
Code Issues Projects Releases Wiki Activity

en_sb OK (#159)

Browse source 
* en_sb OK

* en_sb done

* remove asm

* remove diff.txt

* pr changes

* pr changes 2

* merge master and add description
This commit is contained in:
fig02 2020-05-26 11:57:54 -04:00 • committed by GitHub
commit 442b15c79f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
35 changed files with 464 additions and 1398 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/functions.h
View file

@ -239,7 +239,7 @@ void func_80028B74(GlobalContext*, Vec3f*, UNK_PTR, UNK_PTR, Color_RGB8*, Color_
// ? func_800292DC(?);
// ? func_80029320(?);
// ? func_800293A0(?);
// ? func_800293E4(?);
void func_800293E4(GlobalContext*, Vec3f* pos, f32, f32, f32, f32);
// ? func_80029444(?);
// ? func_8002949C(?);
// ? func_80029530(?);
@ -411,6 +411,7 @@ Actor* Actor_Delete(ActorContext* actorCtx, Actor* actor, GlobalContext* globalC
Actor* func_80032AF0(GlobalContext* globalCtx, ActorContext* actorCtx, Actor** actorPtr, Player* player);
Actor* Actor_Find(ActorContext* actorCtx, s32 actorId, s32 actorType);
void func_80032C7C(GlobalContext* globalCtx, Actor* actor);
void func_80032E24(struct_80032E24* arg0, s32 arg1, GlobalContext* globalCtx);
void func_80033260(GlobalContext* globalCtx, Actor* actor, Vec3f* arg2, f32 arg3, s32 arg4, f32 arg5, s16 arg6,
s16 arg7, u8 arg8);
void func_80033480(GlobalContext* globalCtx, Vec3f* arg1, f32 arg2, s32 arg3, s16 arg4, s16 arg5, u8 arg6);

10
include/z64actor.h
View file

@ -205,6 +205,16 @@ typedef struct {
/* 0x10 */ Vec3f base;
} Struct_80090480_arg2;
typedef struct {
/* 0x00 */ MtxF* unk_00;
/* 0x04 */ s16* unk_04;
/* 0x08 */ s16 unk_08;
/* 0x0A */ char unk_0A[0x02];
/* 0x0C */ s32* unk_0C;
/* 0x10 */ s32 unk_10;
/* 0x14 */ s32 unk_14;
} struct_80032E24;
struct Player;
typedef void (*PlayerActionFunc)(struct Player*, struct GlobalContext*);