diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-07-05 20:33:07 -0700 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-07-05 20:33:07 -0700 |
| commit | f79ac26ce36197ddf98ab18b6699c76039ec68db (patch) | |
| tree | 99f4f3c4f4810cc24e247fa714a304897c073f64 /src | |
| parent | 5189442bcc1122fe10013d497dc132d0e410fc66 (diff) | |
Rename SetLastTalkedObjectInFrontOfPlayer to CheckObjectGraphicsInFrontOfPlayer
Diffstat (limited to 'src')
| -rw-r--r-- | src/fldeff_cut.c | 4 | ||||
| -rw-r--r-- | src/fldeff_strength.c | 2 | ||||
| -rw-r--r-- | src/rom6.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c index c2f5e7731..9de954e80 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 ae7b557d8..74eb100bc 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 6c7439622..78cbbe2de 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; |