From 0ebe904d0c0511b48cae28670b8dfcad7e12fadf Mon Sep 17 00:00:00 2001
From: krimtonz <33664508+krimtonz@users.noreply.github.com>
Date: Thu, 7 May 2020 18:18:09 -0500
Subject: En_Floormas OK (#97)

* EnFloorMas wip

* floormaster formatting

* floormaster wip

* ovl_En_Floormas OK

* pr recommendations

* pr updates
---
 src/code/z_actor.c     | 2 +-
 src/code/z_en_a_keep.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/code')

diff --git a/src/code/z_actor.c b/src/code/z_actor.c
index 250402d45..97cd22c7c 100644
--- a/src/code/z_actor.c
+++ b/src/code/z_actor.c
@@ -1253,7 +1253,7 @@ void func_8002E4B4(GlobalContext* globalCtx, Actor* actor, f32 arg2, f32 arg3, f
                                             &actor->wallPoly, &sp60, actor, arg2))) {
             sp5C = actor->wallPoly;
             Math_Vec3f_Copy(&actor->posRot.pos, &sp64);
-            actor->unk_7E = atan2s(sp5C->norm.z, sp5C->norm.x);
+            actor->wallPolyRot = atan2s(sp5C->norm.z, sp5C->norm.x);
             actor->bgCheckFlags |= 8;
             actor->wallPolySource = sp60;
         } else {
diff --git a/src/code/z_en_a_keep.c b/src/code/z_en_a_keep.c
index 3358876b9..2e7266d05 100644
--- a/src/code/z_en_a_keep.c
+++ b/src/code/z_en_a_keep.c
@@ -273,7 +273,8 @@ void func_8001D4A8(EnAObj* this, GlobalContext* globalCtx) {
     if ((this->dyna.actor.speedXZ != 0.0f) && (this->dyna.actor.bgCheckFlags & 0x8)) {
         if (1) { // Necessary to match
             this->dyna.actor.posRot.rot.y =
-                ((this->dyna.actor.unk_7E - this->dyna.actor.posRot.rot.y) + this->dyna.actor.unk_7E) - 0x8000;
+                ((this->dyna.actor.wallPolyRot - this->dyna.actor.posRot.rot.y) + this->dyna.actor.wallPolyRot) -
+                0x8000;
         }
         this->dyna.actor.bgCheckFlags &= ~0x8;
     }
-- 
cgit v1.2.3