falso
/
mm
mirror of https://github.com/zeldaret/mm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/zeldaret/mm

This commit is contained in:
Kenix3 2020-06-23 17:38:34 -04:00
parent 7d61d4e6ff c9dc82cbe5
commit 07cfe5b43f
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/functions.h
View File

@ -760,7 +760,7 @@ void func_800B722C(void); // func_800B722C
UNK_TYPE4 func_800B724C(GlobalContext* ctxt, UNK_TYPE4 param_2, u8 param_3); // func_800B724C
unsigned int func_800B7298(GlobalContext* ctxt, UNK_TYPE4 param_2, u8 param_3); // func_800B7298
void func_800B72E0(s32 param_1); // func_800B72E0
void func_800B72F8(void); // func_800B72F8
void func_800B72F8(DynaPolyActor* dpactor, f32 a1, s16 a2); // func_800B72F8
s32 Actor_IsLinkFacingActor(Actor* actor, s16 tolerance, GlobalContext* ctxt); // func_800B7320
s32 Actor_IsActorFacedByActor(Actor* actor, Actor* other, s16 tolerance); // func_800B7378
s32 Actor_IsActorFacingLink(Actor* actor, s16 angle); // func_800B73E0

3
include/structs.h
View File

@ -3079,7 +3079,8 @@ struct DynaPolyActor {
/* 0x144 */ s32 dynaPolyId;
/* 0x148 */ f32 unk148;
/* 0x14C */ f32 unk14C;
/* 0x150 */ UNK_TYPE4 unk150;
/* 0x150 */ s16 unk150;
/* 0x152 */ s16 unk152;
/* 0x154 */ u32 unk154;
/* 0x158 */ u8 dynaFlags;
/* 0x159 */ UNK_TYPE1 pad159[0x3];

5
src/code/z_actor.c
View File

@ -405,7 +405,10 @@ GLOBAL_ASM("asm/non_matchings/z_actor//func_800B7298.asm")
GLOBAL_ASM("asm/non_matchings/z_actor//func_800B72E0.asm")
GLOBAL_ASM("asm/non_matchings/z_actor//func_800B72F8.asm")
void func_800B72F8(DynaPolyActor* dpactor, f32 a1, s16 a2) {
dpactor->unk150 = a2;
dpactor->unk148 += a1;
}
GLOBAL_ASM("asm/non_matchings/z_actor//Actor_IsLinkFacingActor.asm")