diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-10-17 20:03:31 -0400 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-10-17 20:03:31 -0400 |
| commit | 2c6d634acdf7bd22fb7e5c4933ff2e13712d2ec3 (patch) | |
| tree | 9d51a6c1c07da6946022fe5867e34300bd71493d /src/berry.c | |
| parent | 65a0c48eec7d2184478841d232d1fb3c3350fa37 (diff) | |
| parent | f67bbbdaaa905833f1c2a315624128aafef9a4cb (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu
Diffstat (limited to 'src/berry.c')
| -rw-r--r-- | src/berry.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/berry.c b/src/berry.c index ea216b61c..66cf91409 100644 --- a/src/berry.c +++ b/src/berry.c @@ -11,7 +11,7 @@ extern u8 EventObjectGetBerryTreeId(u8 eventObjectId); extern void sub_8092EF0(u8 mapId, u8 mapNumber, u8 mapGroup); extern void CB2_ChooseBerry(void); -extern const u8* GetEventObjectScriptPointerForComparison(void); +extern const u8* GetEventObjectScriptPointerPlayerFacing(void); extern bool8 IsBerryTreeSparkling(u8, u8, u8); extern u16 gSpecialVar_ItemId; @@ -930,7 +930,7 @@ bool32 EventObjectInteractionWaterBerryTree(void) bool8 IsPlayerFacingPlantedBerryTree(void) { - if (GetEventObjectScriptPointerForComparison() == BerryTreeScript + if (GetEventObjectScriptPointerPlayerFacing() == BerryTreeScript && GetStageByBerryTreeId(EventObjectGetBerryTreeId(gSelectedEventObject)) == 0) return TRUE; else @@ -939,7 +939,7 @@ bool8 IsPlayerFacingPlantedBerryTree(void) bool8 TryToWaterBerryTree(void) { - if (GetEventObjectScriptPointerForComparison() != BerryTreeScript) + if (GetEventObjectScriptPointerPlayerFacing() != BerryTreeScript) return FALSE; else return EventObjectInteractionWaterBerryTree(); |