ensob1 distortion fix (#1272)

1 files changed, 10 insertions, 3 deletions

diff --git a/mm/2s2h/Rando/ActorBehavior/EnSob1.cpp b/mm/2s2h/Rando/ActorBehavior/EnSob1.cpp
index 3e53d9f03..c382457a7 100644
--- a/mm/2s2h/Rando/ActorBehavior/EnSob1.cpp
+++ b/mm/2s2h/Rando/ActorBehavior/EnSob1.cpp
@@ -1,8 +1,6 @@
 #include "ActorBehavior.h"
-#include "public/bridge/consolevariablebridge.h"
 
 extern "C" {
-#include "variables.h"
 #include "overlays/actors/ovl_En_Sob1/z_en_sob1.h"
 }
 
@@ -18,12 +16,21 @@ void EnSob1_DrawCustomItem(Actor* thisx, PlayState* play) {
     Rando::DrawItem(randoSaveCheck.randoItemId);
 }
 
+static MtxF sLeftHandMtxF;
+
 void Rando::ActorBehavior::InitEnSob1Behavior() {
     COND_VB_SHOULD(VB_DRAW_ITEM_FROM_SOB1, IS_RANDO, {
         Actor* actor = va_arg(args, Actor*);
         if (RANDO_SAVE_CHECKS[RC_BOMB_SHOP_ITEM_01].shuffled) {
-            EnSob1_DrawCustomItem(actor, gPlayState);
+            Matrix_MtxFCopy(&sLeftHandMtxF, Matrix_GetCurrent());
             *should = false;
         }
     });
+
+    COND_ID_HOOK(OnActorDraw, ACTOR_EN_OSSAN, IS_RANDO, [](Actor* actor) {
+        if (RANDO_SAVE_CHECKS[RC_BOMB_SHOP_ITEM_01].shuffled) {
+            Matrix_Put(&sLeftHandMtxF);
+            EnSob1_DrawCustomItem(actor, gPlayState);
+        }
+    });
 }
\ No newline at end of file