diff options
author | Diegoisawesome <diego@domoreaweso.me> | 2018-07-05 20:33:47 -0700 |
---|---|---|
committer | Diegoisawesome <diego@domoreaweso.me> | 2018-07-05 20:33:47 -0700 |
commit | 6313f360d5006527549b142253e22374624129e9 (patch) | |
tree | 99f4f3c4f4810cc24e247fa714a304897c073f64 /src/fldeff_strength.c | |
parent | efebc51972b23ddffa2700b1dd6895d4728646a3 (diff) | |
parent | f79ac26ce36197ddf98ab18b6699c76039ec68db (diff) |
Merge branch 'DizzyEggg-decompile_cut'
Diffstat (limited to 'src/fldeff_strength.c')
-rw-r--r-- | src/fldeff_strength.c | 7 |
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; |