diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-05-30 07:48:45 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-30 07:48:45 -0500 |
| commit | d1965e3c751b77243c11d62eadc994422dc682ae (patch) | |
| tree | 61ee8faf9f1fc7569efa086f2108b7f886e49127 /src/fldeff_strength.c | |
| parent | b8f90052a58d1781ef40e2a4b7decf4ca4ed62b8 (diff) | |
| parent | 9680b95bdde1226e12485a84e47c6a7c32932048 (diff) | |
Merge pull request #618 from huderlem/objMovement
Document event object movement
Diffstat (limited to 'src/fldeff_strength.c')
| -rw-r--r-- | src/fldeff_strength.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/fldeff_strength.c b/src/fldeff_strength.c index 9f1f3a670..0b66ed0d2 100644 --- a/src/fldeff_strength.c +++ b/src/fldeff_strength.c @@ -9,7 +9,7 @@ #include "task.h" #include "text.h" #include "constants/field_effects.h" -#include "constants/map_objects.h" +#include "constants/event_objects.h" static void sub_811AA18(void); static void sub_811AA38(void); @@ -31,7 +31,7 @@ void debug_sub_8130318(void) gSpecialVar_Result = 0; sub_811AA38(); } - else if (SetLastTalkedObjectInFrontOfPlayer(MAP_OBJ_GFX_PUSHABLE_BOULDER) == TRUE) + else if (SetLastTalkedObjectInFrontOfPlayer(EVENT_OBJ_GFX_PUSHABLE_BOULDER) == TRUE) { gLastFieldPokeMenuOpened = 0; gSpecialVar_Result = 0; @@ -54,7 +54,7 @@ bool8 SetUpFieldMove_Strength(void) } else { - if (SetLastTalkedObjectInFrontOfPlayer(MAP_OBJ_GFX_PUSHABLE_BOULDER) != TRUE) + if (SetLastTalkedObjectInFrontOfPlayer(EVENT_OBJ_GFX_PUSHABLE_BOULDER) != TRUE) return 0; gSpecialVar_Result = gLastFieldPokeMenuOpened; gFieldCallback = FieldCallback_PrepareFadeInFromMenu; |