1 files changed, 53 insertions, 15 deletions

diff --git a/src/code/code_80043480.c b/src/code/code_80043480.c
index 54f422a6f..900dd9683 100644
--- a/src/code/code_80043480.c
+++ b/src/code/code_80043480.c
@@ -1,7 +1,7 @@
 #include "global.h"
 
-void DynaPolyInfo_SetActorMove(DynaPolyActor* dynaActor, DynaPolyMoveFlag flags) {
-    dynaActor->dynaPolyId = -1;
+void DynaPolyActor_Init(DynaPolyActor* dynaActor, DynaPolyMoveFlag flags) {
+    dynaActor->bgId = -1;
     dynaActor->unk_15C = flags;
     dynaActor->unk_160 = 0;
     dynaActor->unk_150 = 0.0f;
@@ -20,8 +20,8 @@ void func_800434B8(DynaPolyActor* dynaActor) {
     dynaActor->unk_160 |= 2;
 }
 
-void func_800434C8(CollisionContext* colCtx, u32 floorPolySource) {
-    DynaPolyActor* dynaActor = DynaPolyInfo_GetActor(colCtx, floorPolySource);
+void func_800434C8(CollisionContext* colCtx, s32 floorPolySource) {
+    DynaPolyActor* dynaActor = (DynaPolyActor*)DynaPoly_GetActor(colCtx, floorPolySource);
 
     if (dynaActor != NULL) {
         func_800434B8(dynaActor);
@@ -32,8 +32,8 @@ void func_800434F8(DynaPolyActor* dynaActor) {
     dynaActor->unk_160 |= 4;
 }
 
-void func_80043508(CollisionContext* colCtx, u32 floorPolySource) {
-    DynaPolyActor* dynaActor = DynaPolyInfo_GetActor(colCtx, floorPolySource);
+void func_80043508(CollisionContext* colCtx, s32 floorPolySource) {
+    DynaPolyActor* dynaActor = (DynaPolyActor*)DynaPoly_GetActor(colCtx, floorPolySource);
 
     if (dynaActor != NULL) {
         func_800434F8(dynaActor);
@@ -46,34 +46,72 @@ void func_80043538(DynaPolyActor* dynaActor) {
 
 s32 func_80043548(DynaPolyActor* dynaActor) {
     if (dynaActor->unk_160 & 1) {
-        return 1;
+        return true;
     } else {
-        return 0;
+        return false;
     }
 }
 
 s32 func_8004356C(DynaPolyActor* dynaActor) {
     if (dynaActor->unk_160 & 2) {
-        return 1;
+        return true;
     } else {
-        return 0;
+        return false;
     }
 }
 
 s32 func_80043590(DynaPolyActor* dynaActor) {
     if (dynaActor->unk_160 & 4) {
-        return 1;
+        return true;
     } else {
-        return 0;
+        return false;
     }
 }
 
 s32 func_800435B4(DynaPolyActor* dynaActor) {
     if (dynaActor->unk_160 & 8) {
-        return 1;
+        return true;
     } else {
-        return 0;
+        return false;
     }
 }
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_80043480/func_800435D8.s")
+s32 func_800435D8(GlobalContext* globalCtx, DynaPolyActor* actor, s16 arg2, s16 arg3, s16 arg4) {
+    Vec3f posA;
+    Vec3f posB;
+    Vec3f posResult;
+    f32 sin;
+    f32 cos;
+    s32 bgId;
+    CollisionPoly* poly;
+    f32 a2;
+    f32 a3;
+    f32 sign;
+
+    sin = Math_SinS(actor->unk_158);
+    cos = Math_CosS(actor->unk_158);
+    sign = (0.0f <= actor->unk_150) ? 1.0f : -1.0f;
+
+    a2 = (f32)arg2 - 0.1f;
+    posA.x = actor->actor.posRot.pos.x + (a2 * cos);
+    posA.y = actor->actor.posRot.pos.y + arg4;
+    posA.z = actor->actor.posRot.pos.z - (a2 * sin);
+
+    a3 = (f32)arg3 - 0.1f;
+    posB.x = sign * a3 * sin + posA.x;
+    posB.y = posA.y;
+    posB.z = sign * a3 * cos + posA.z;
+    if (BgCheck_EntityLineTest3(&globalCtx->colCtx, &posA, &posB, &posResult, &poly, true, false, false, true, &bgId,
+                                actor, 0.0f)) {
+        return false;
+    }
+    posA.x = (actor->actor.posRot.pos.x * 2) - posA.x;
+    posA.z = (actor->actor.posRot.pos.z * 2) - posA.z;
+    posB.x = sign * a3 * sin + posA.x;
+    posB.z = sign * a3 * cos + posA.z;
+    if (BgCheck_EntityLineTest3(&globalCtx->colCtx, &posA, &posB, &posResult, &poly, true, false, false, true, &bgId,
+                                actor, 0.0f)) {
+        return false;
+    }
+    return true;
+}