summaryrefslogtreecommitdiff
path: root/src/code
diff options
context:
space:
mode:
authorKenix3 <kenixwhisperwind@gmail.com>2020-06-23 17:38:34 -0400
committerKenix3 <kenixwhisperwind@gmail.com>2020-06-23 17:38:34 -0400
commit07cfe5b43f08fd379aa7502d2dffd2fbb9728b7b (patch)
treee9925050c1aa31bd91ac69099de35e30d863c7db /src/code
parent7d61d4e6ff2e15dc3c7f166d407a203594a9c90b (diff)
parentc9dc82cbe5632d9ffcd3075f2f6058b8d53ef47b (diff)
Merge branch 'master' of https://github.com/zeldaret/mm
Diffstat (limited to 'src/code')
-rw-r--r--src/code/z_actor.c5
1 files changed, 4 insertions, 1 deletions
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")