atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename SetLastTalkedObjectInFrontOfPlayer to CheckObjectGraphicsInFrontOfPlayer

Browse source
This commit is contained in:
Diegoisawesome 2018-07-05 20:33:07 -07:00
parent 5189442bcc
commit f79ac26ce3
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/rom6.h
View file

@ -12,7 +12,7 @@ void UpdateFrontierManiac(u16 days);
void UpdateFrontierGambler(u16 days); void UpdateFrontierGambler(u16 days);
void SetShoalItemFlag(u16 days); void SetShoalItemFlag(u16 days);
bool8 SetLastTalkedObjectInFrontOfPlayer(u8); bool8 CheckObjectGraphicsInFrontOfPlayer(u8);
u8 oei_task_add(void); u8 oei_task_add(void);
#endif //GUARD_ROM6_H #endif //GUARD_ROM6_H

4
src/fldeff_cut.c
View file

@ -19,7 +19,7 @@
#include "constants/songs.h" #include "constants/songs.h"
#include "constants/abilities.h" #include "constants/abilities.h"
extern bool8 SetLastTalkedObjectInFrontOfPlayer(u8); extern bool8 CheckObjectGraphicsInFrontOfPlayer(u8);
extern u8 oei_task_add(void); extern u8 oei_task_add(void);
extern void ScriptUnfreezeEventObjects(void); extern void ScriptUnfreezeEventObjects(void);
extern bool8 IsMewPlayingHideAndSeek(void); extern bool8 IsMewPlayingHideAndSeek(void);
@ -183,7 +183,7 @@ bool8 SetUpFieldMove_Cut(void)
bool8 cutTiles[CUT_NORMAL_AREA]; bool8 cutTiles[CUT_NORMAL_AREA];
bool8 ret; bool8 ret;
if (SetLastTalkedObjectInFrontOfPlayer(EVENT_OBJ_GFX_CUTTABLE_TREE) == TRUE) if (CheckObjectGraphicsInFrontOfPlayer(EVENT_OBJ_GFX_CUTTABLE_TREE) == TRUE)
{ {
// Standing in front of cuttable tree. // Standing in front of cuttable tree.
gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu; gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu;

2
src/fldeff_strength.c
View file

@ -15,7 +15,7 @@ static void sub_8145E74(void);
// text // text
bool8 SetUpFieldMove_Strength(void) bool8 SetUpFieldMove_Strength(void)
{ {
if (SetLastTalkedObjectInFrontOfPlayer(EVENT_OBJ_GFX_PUSHABLE_BOULDER) == TRUE) if (CheckObjectGraphicsInFrontOfPlayer(EVENT_OBJ_GFX_PUSHABLE_BOULDER) == TRUE)
{ {
gSpecialVar_Result = GetCursorSelectionMonId(); gSpecialVar_Result = GetCursorSelectionMonId();
gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu; gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu;

4
src/rom6.c
View file

@ -30,7 +30,7 @@ static void sub_8135780(void);
extern struct MapPosition gPlayerFacingPosition; extern struct MapPosition gPlayerFacingPosition;
// text // text
bool8 SetLastTalkedObjectInFrontOfPlayer(u8 a) bool8 CheckObjectGraphicsInFrontOfPlayer(u8 a)
{ {
u8 eventObjId; u8 eventObjId;
@ -125,7 +125,7 @@ bool8 SetUpFieldMove_RockSmash(void)
gPostMenuFieldCallback = sub_8179834; gPostMenuFieldCallback = sub_8179834;
return TRUE; return TRUE;
} }
else if (SetLastTalkedObjectInFrontOfPlayer(EVENT_OBJ_GFX_BREAKABLE_ROCK) == TRUE) else if (CheckObjectGraphicsInFrontOfPlayer(EVENT_OBJ_GFX_BREAKABLE_ROCK) == TRUE)
{ {
gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu; gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu;
gPostMenuFieldCallback = sub_81356C4; gPostMenuFieldCallback = sub_81356C4;