diff --git a/include/rom6.h b/include/rom6.h index 629df57fe8..96c3b3ca2b 100644 --- a/include/rom6.h +++ b/include/rom6.h @@ -12,7 +12,7 @@ void UpdateFrontierManiac(u16 days); void UpdateFrontierGambler(u16 days); void SetShoalItemFlag(u16 days); -bool8 SetLastTalkedObjectInFrontOfPlayer(u8); +bool8 CheckObjectGraphicsInFrontOfPlayer(u8); u8 oei_task_add(void); #endif //GUARD_ROM6_H diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c index c2f5e77319..9de954e80e 100644 --- a/src/fldeff_cut.c +++ b/src/fldeff_cut.c @@ -19,7 +19,7 @@ #include "constants/songs.h" #include "constants/abilities.h" -extern bool8 SetLastTalkedObjectInFrontOfPlayer(u8); +extern bool8 CheckObjectGraphicsInFrontOfPlayer(u8); extern u8 oei_task_add(void); extern void ScriptUnfreezeEventObjects(void); extern bool8 IsMewPlayingHideAndSeek(void); @@ -183,7 +183,7 @@ bool8 SetUpFieldMove_Cut(void) bool8 cutTiles[CUT_NORMAL_AREA]; bool8 ret; - if (SetLastTalkedObjectInFrontOfPlayer(EVENT_OBJ_GFX_CUTTABLE_TREE) == TRUE) + if (CheckObjectGraphicsInFrontOfPlayer(EVENT_OBJ_GFX_CUTTABLE_TREE) == TRUE) { // Standing in front of cuttable tree. gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu; diff --git a/src/fldeff_strength.c b/src/fldeff_strength.c index ae7b557d8d..74eb100bca 100644 --- a/src/fldeff_strength.c +++ b/src/fldeff_strength.c @@ -15,7 +15,7 @@ static void sub_8145E74(void); // text bool8 SetUpFieldMove_Strength(void) { - if (SetLastTalkedObjectInFrontOfPlayer(EVENT_OBJ_GFX_PUSHABLE_BOULDER) == TRUE) + if (CheckObjectGraphicsInFrontOfPlayer(EVENT_OBJ_GFX_PUSHABLE_BOULDER) == TRUE) { gSpecialVar_Result = GetCursorSelectionMonId(); gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu; diff --git a/src/rom6.c b/src/rom6.c index 6c74396224..78cbbe2de5 100644 --- a/src/rom6.c +++ b/src/rom6.c @@ -30,7 +30,7 @@ static void sub_8135780(void); extern struct MapPosition gPlayerFacingPosition; // text -bool8 SetLastTalkedObjectInFrontOfPlayer(u8 a) +bool8 CheckObjectGraphicsInFrontOfPlayer(u8 a) { u8 eventObjId; @@ -125,7 +125,7 @@ bool8 SetUpFieldMove_RockSmash(void) gPostMenuFieldCallback = sub_8179834; return TRUE; } - else if (SetLastTalkedObjectInFrontOfPlayer(EVENT_OBJ_GFX_BREAKABLE_ROCK) == TRUE) + else if (CheckObjectGraphicsInFrontOfPlayer(EVENT_OBJ_GFX_BREAKABLE_ROCK) == TRUE) { gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu; gPostMenuFieldCallback = sub_81356C4;