diff options
| author | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-07-08 01:23:28 +0100 |
|---|---|---|
| committer | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-07-08 01:23:28 +0100 |
| commit | 08774bdd88e9c61fec790c7a92a3af78c66ba0c0 (patch) | |
| tree | 7bc855529fc11e599cc40ceda9f114f86b9a6340 /src/fldeff_strength.c | |
| parent | dd228fae5a4f0426c0242b3bb5ac6dfe62673a1f (diff) | |
| parent | 6313f360d5006527549b142253e22374624129e9 (diff) | |
Merge https://github.com/pret/pokeemerald into pokedex-doc
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; |