Merge branch 'develop' of github.com:HarbourMasters/2ship2harkinian into develop-rando

2 files changed, 6 insertions, 1 deletions

diff --git a/mm/src/code/z_collision_check.c b/mm/src/code/z_collision_check.c
index 107d95cc2..2be4cbcd5 100644
--- a/mm/src/code/z_collision_check.c
+++ b/mm/src/code/z_collision_check.c
@@ -1639,6 +1639,10 @@ void CollisionCheck_SetBounce(Collider* at, Collider* ac) {
  */
 s32 CollisionCheck_SetATvsAC(PlayState* play, Collider* at, ColliderInfo* atInfo, Vec3f* atPos, Collider* ac,
                              ColliderInfo* acInfo, Vec3f* acPos, Vec3f* hitPos) {
+    if (!GameInteractor_Should(VB_PERFORM_AC_COLLISION, true, at, ac)) {
+        return 0;
+    }
+
     f32 damage;
     u32 effect;
 
diff --git a/mm/src/code/z_view.c b/mm/src/code/z_view.c
index 23bba491d..c7c7e8883 100644
--- a/mm/src/code/z_view.c
+++ b/mm/src/code/z_view.c
@@ -444,7 +444,8 @@ s32 View_ApplyPerspective(View* view) {
         }
     }
 
-    if (dont_interpolate) {
+    // Ignore camera heuristics when not in the PlayState or the game is paused as the camera moves a lot in Kaleido
+    if (dont_interpolate && gPlayState != NULL && R_PAUSE_BG_PRERENDER_STATE == PRERENDER_FILTER_STATE_NONE) {
         FrameInterpolation_DontInterpolateCamera();
     }