diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-02-24 09:02:25 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-24 09:02:25 -0500 |
| commit | a0fa06a066dd2261dfdfb87ea5fd8a4ecb3fa634 (patch) | |
| tree | b5bec9a5a1b819bf9d98fb349598e9cf5feb1207 /src/fldeff_rocksmash.c | |
| parent | 942ea77a0d574b7c9bb71bace53755dc9ccde5b5 (diff) | |
| parent | 1fc8db43b7254f7445b335cec22c7406edb1902d (diff) | |
Merge pull request #265 from GriffinRichards/sync-objgfx
Sync object event gfx constants
Diffstat (limited to 'src/fldeff_rocksmash.c')
| -rw-r--r-- | src/fldeff_rocksmash.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/fldeff_rocksmash.c b/src/fldeff_rocksmash.c index baa51412b..058922f06 100644 --- a/src/fldeff_rocksmash.c +++ b/src/fldeff_rocksmash.c @@ -11,7 +11,7 @@ #include "overworld.h" #include "event_object_movement.h" #include "constants/songs.h" -#include "constants/object_events.h" +#include "constants/event_objects.h" #include "constants/maps.h" static void task08_080C9820(u8 taskId); @@ -104,7 +104,7 @@ static void sub_80C99A0(u8 taskId) bool8 SetUpFieldMove_RockSmash(void) { - if (CheckObjectGraphicsInFrontOfPlayer(OBJECT_EVENT_GFX_ROCK_SMASH_ROCK) == TRUE) + if (CheckObjectGraphicsInFrontOfPlayer(OBJ_EVENT_GFX_ROCK_SMASH_ROCK) == TRUE) { gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu; gPostMenuFieldCallback = sub_80C9A10; |