summaryrefslogtreecommitdiff
path: root/src/fldeff_cut.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/fldeff_cut.c')
-rw-r--r--src/fldeff_cut.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c
index 8d76ecccb..567e75f2a 100644
--- a/src/fldeff_cut.c
+++ b/src/fldeff_cut.c
@@ -4,7 +4,7 @@
#include "event_object_movement.h"
#include "field_player_avatar.h"
#include "fieldmap.h"
-#include "event_obj_lock.h"
+#include "event_object_lock.h"
#include "metatile_behavior.h"
#include "pokemon_menu.h"
#include "overworld.h"
@@ -92,7 +92,7 @@ void Debug_SetUpFieldMove_Cut(void)
u8 i, j;
u8 metatileBehavior;
- if (CheckObjectGraphicsInFrontOfPlayer(EVENT_OBJ_GFX_CUTTABLE_TREE) == TRUE)
+ if (CheckObjectGraphicsInFrontOfPlayer(OBJ_EVENT_GFX_CUTTABLE_TREE) == TRUE)
{
gLastFieldPokeMenuOpened = 0;
FieldCallback_CutTree();
@@ -131,7 +131,7 @@ bool8 SetUpFieldMove_Cut(void)
u8 i, j;
u8 tileBehavior;
- if (CheckObjectGraphicsInFrontOfPlayer(EVENT_OBJ_GFX_CUTTABLE_TREE) == TRUE)
+ if (CheckObjectGraphicsInFrontOfPlayer(OBJ_EVENT_GFX_CUTTABLE_TREE) == TRUE)
{
// Standing in front of cuttable tree.
gFieldCallback = FieldCallback_PrepareFadeInFromMenu;
@@ -377,7 +377,7 @@ static void CutGrassSpriteCallbackEnd(struct Sprite *sprite)
for (i = 1; i < 8; i++)
DestroySprite(&gSprites[eCutGrassSpriteArray[i]]);
FieldEffectStop(&gSprites[eCutGrassSpriteArray[0]], FLDEFF_CUT_GRASS);
- ScriptUnfreezeEventObjects();
+ ScriptUnfreezeObjectEvents();
ScriptContext2_Disable();
}