merge union room with master

1 files changed, 4 insertions, 3 deletions

diff --git a/src/fldeff_strength.c b/src/fldeff_strength.c
index 162479c73..74eb100bc 100644
--- a/src/fldeff_strength.c
+++ b/src/fldeff_strength.c
@@ -6,6 +6,7 @@
 #include "rom6.h"
 #include "script.h"
 #include "task.h"
+#include "constants/event_objects.h"
 
 // static functions
 static void FldEff_UseStrength(void);
@@ -14,11 +15,11 @@ static void sub_8145E74(void);
 // text
 bool8 SetUpFieldMove_Strength(void)
 {
-    if (npc_before_player_of_type(87) == TRUE)
+    if (CheckObjectGraphicsInFrontOfPlayer(EVENT_OBJ_GFX_PUSHABLE_BOULDER) == TRUE)
     {
         gSpecialVar_Result = GetCursorSelectionMonId();
-        gUnknown_03005DB0 = FieldCallback_Teleport;
-        gUnknown_0203CEEC = FldEff_UseStrength;
+        gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu;
+        gPostMenuFieldCallback = FldEff_UseStrength;
         return TRUE;
     }
     return FALSE;