diff options
| author | Kenix3 <kenixwhisperwind@gmail.com> | 2020-06-23 17:38:34 -0400 |
|---|---|---|
| committer | Kenix3 <kenixwhisperwind@gmail.com> | 2020-06-23 17:38:34 -0400 |
| commit | 07cfe5b43f08fd379aa7502d2dffd2fbb9728b7b (patch) | |
| tree | e9925050c1aa31bd91ac69099de35e30d863c7db | |
| parent | 7d61d4e6ff2e15dc3c7f166d407a203594a9c90b (diff) | |
| parent | c9dc82cbe5632d9ffcd3075f2f6058b8d53ef47b (diff) | |
Merge branch 'master' of https://github.com/zeldaret/mm
| -rw-r--r-- | include/functions.h | 2 | ||||
| -rw-r--r-- | include/structs.h | 3 | ||||
| -rw-r--r-- | src/code/z_actor.c | 5 |
3 files changed, 7 insertions, 3 deletions
diff --git a/include/functions.h b/include/functions.h index 4b7df1e1d..70a45c2e8 100644 --- a/include/functions.h +++ b/include/functions.h @@ -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 diff --git a/include/structs.h b/include/structs.h index 6360c0e3f..bd2f72287 100644 --- a/include/structs.h +++ b/include/structs.h @@ -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]; diff --git a/src/code/z_actor.c b/src/code/z_actor.c index c792a6b1e..595ae4882 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -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") |