From e9eb3d3626281cd07e845bd4c40288f22f351c8b Mon Sep 17 00:00:00 2001
From: louist103 <louist103@gmail.com>
Date: Thu, 12 May 2022 12:15:49 -0400
Subject: [PATCH] conflicts

---
 soh/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/soh/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c b/soh/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c
index bb385c75e..c4bffeb33 100644
--- a/soh/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c
+++ b/soh/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c
@@ -404,7 +404,7 @@ void BgPoEvent_BlockPush(BgPoEvent* this, GlobalContext* globalCtx) {
         this->dyna.actor.home.pos.z = this->dyna.actor.world.pos.z;
         sBgPoEventblockPushDist = 0.0f;
         this->dyna.actor.speedXZ = 0.0f;
-        this->direction = 5;
+        this->direction = CVar_GetS32("gFasterBlockPush", 0) != 0 ? 3 : 5;
         sBgPoEventBlocksAtRest++;
         this->actionFunc = BgPoEvent_BlockIdle;
         if (this->type == 1) {