5 files changed, 11 insertions, 9 deletions

diff --git a/mm/src/code/z_actor.c b/mm/src/code/z_actor.c
index a763d6451..b4e52be69 100644
--- a/mm/src/code/z_actor.c
+++ b/mm/src/code/z_actor.c
@@ -4,6 +4,7 @@
  */
 
 #include "z64actor.h"
+#include "z64door.h"
 
 #include "prevent_bss_reordering.h"
 #include "fault.h"
@@ -3705,7 +3706,7 @@ void Actor_SpawnTransitionActors(PlayState* play, ActorContext* actorCtx) {
                 if (Actor_SpawnAsChildAndCutscene(actorCtx, play, transitionActorList->id & 0x1FFF,
                                                   transitionActorList->pos.x, transitionActorList->pos.y,
                                                   transitionActorList->pos.z, 0, rotY, 0,
-                                                  (i << 0xA) + (transitionActorList->params & 0x3FF),
+                                                  TRANSITION_ACTOR_PARAMS(i, transitionActorList->params),
                                                   transitionActorList->rotY & 0x7F, HALFDAYBIT_ALL, 0) != NULL) {
                     transitionActorList->id = -transitionActorList->id;
                 }
diff --git a/mm/src/code/z_en_hy_code.c b/mm/src/code/z_en_hy_code.c
index afdd0fa8a..844f6ae7c 100644
--- a/mm/src/code/z_en_hy_code.c
+++ b/mm/src/code/z_en_hy_code.c
@@ -191,7 +191,7 @@ void func_800F0BB4(EnHy* enHy, PlayState* play, EnDoor* door, s16 arg3, s16 arg4
     enHy->skelAnime.prevTransl = enHy->skelAnime.jointTable[LIMB_ROOT_POS];
     enHy->skelAnime.moveFlags |= (ANIM_FLAG_UPDATE_Y | ANIM_FLAG_1);
     AnimationContext_SetMoveActor(play, &enHy->actor, &enHy->skelAnime, 1.0f);
-    door->knobDoor.playOpenAnim = true;
+    door->knobDoor.requestOpen = true;
     door->knobDoor.animIndex = animIndex;
 }
 
diff --git a/mm/src/code/z_scene.c b/mm/src/code/z_scene.c
index 5d1beca9d..a3ee948dc 100644
--- a/mm/src/code/z_scene.c
+++ b/mm/src/code/z_scene.c
@@ -112,7 +112,7 @@ s32 Object_GetSlot(ObjectContext* objectCtx, s16 objectId) {
         }
     }
 
-    return CVarGetInteger("gDeveloperTools.DisableObjectDependency", 0) ? 0 : -1;
+    return CVarGetInteger("gDeveloperTools.DisableObjectDependency", 0) ? 0 : OBJECT_SLOT_NONE;
 }
 
 s32 Object_IsLoaded(ObjectContext* objectCtx, s32 slot) {
diff --git a/mm/src/code/z_sub_s.c b/mm/src/code/z_sub_s.c
index b5f5f58ef..0738e7a9b 100644
--- a/mm/src/code/z_sub_s.c
+++ b/mm/src/code/z_sub_s.c
@@ -16,9 +16,10 @@ Vec3f gOneVec3f = { 1.0f, 1.0f, 1.0f };
 s32 D_801C5DBC[] = { 0, 1 }; // Unused
 
 /**
- * Finds the first EnDoor instance with doorType == ENDOOR_TYPE_5 and the specified switchFlag.
+ * Finds the first EnDoor instance of type `ENDOOR_TYPE_SCHEDULE` and the specified schType (a value from the
+ * EnDoorScheduleType enum).
  */
-EnDoor* SubS_FindDoor(PlayState* play, s32 switchFlag) {
+EnDoor* SubS_FindScheduleDoor(PlayState* play, s32 schType) {
     Actor* actor = NULL;
     EnDoor* door;
 
@@ -30,7 +31,7 @@ EnDoor* SubS_FindDoor(PlayState* play, s32 switchFlag) {
             break;
         }
 
-        if ((door->doorType == ENDOOR_TYPE_5) && (door->switchFlag == (u8)switchFlag)) {
+        if ((door->doorType == ENDOOR_TYPE_SCHEDULE) && (door->typeVar.schType == (u8)schType)) {
             break;
         }
 
diff --git a/mm/src/code/z_view.c b/mm/src/code/z_view.c
index b93ad36ee..bb651ee86 100644
--- a/mm/src/code/z_view.c
+++ b/mm/src/code/z_view.c
@@ -306,13 +306,13 @@ s32 View_StepDistortion(View* view, Mtx* projectionMtx) {
 /**
  * Apply view to POLY_OPA_DISP, POLY_XLU_DISP (and OVERLAY_DISP if ortho)
  */
-void View_Apply(View* view, s32 mask) {
+s32 View_Apply(View* view, s32 mask) {
     mask = (view->flags & mask) | (mask >> 4);
 
     if (mask & VIEW_PROJECTION_ORTHO) {
-        View_ApplyOrtho(view);
+        return View_ApplyOrtho(view);
     } else {
-        View_ApplyPerspective(view);
+        return View_ApplyPerspective(view);
     }
 }