diff options
author | Marcus Huderle <huderlem@gmail.com> | 2018-05-30 07:48:45 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-30 07:48:45 -0500 |
commit | d1965e3c751b77243c11d62eadc994422dc682ae (patch) | |
tree | 61ee8faf9f1fc7569efa086f2108b7f886e49127 /include/berry.h | |
parent | b8f90052a58d1781ef40e2a4b7decf4ca4ed62b8 (diff) | |
parent | 9680b95bdde1226e12485a84e47c6a7c32932048 (diff) |
Merge pull request #618 from huderlem/objMovement
Document event object movement
Diffstat (limited to 'include/berry.h')
-rw-r--r-- | include/berry.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/berry.h b/include/berry.h index 9de443fe7..259ada634 100644 --- a/include/berry.h +++ b/include/berry.h @@ -39,7 +39,7 @@ void debug_sub_80C2C18(const u8 *name, u8 holdEffect, u8 holdEffectParam); void SetEnigmaBerry(u8 *src); bool32 IsEnigmaBerryValid(void); const struct Berry *GetBerryInfo(u8 berry); -bool32 FieldObjectInteractionWaterBerryTree(void); +bool32 EventObjectInteractionWaterBerryTree(void); bool8 IsPlayerFacingUnplantedSoil(void); bool8 TryToWaterBerryTree(void); void ClearBerryTrees(void); @@ -51,11 +51,11 @@ u8 GetStageByBerryTreeId(u8); u8 ItemIdToBerryType(u16 item); void GetBerryNameByBerryType(u8 berry, u8 *string); void ResetBerryTreeSparkleFlag(u8 id); -void FieldObjectInteractionGetBerryTreeData(void); +void EventObjectInteractionGetBerryTreeData(void); void Berry_FadeAndGoToBerryBagMenu(void); -void FieldObjectInteractionPlantBerryTree(void); -void FieldObjectInteractionPickBerryTree(void); -void FieldObjectInteractionRemoveBerryTree(void); +void EventObjectInteractionPlantBerryTree(void); +void EventObjectInteractionPickBerryTree(void); +void EventObjectInteractionRemoveBerryTree(void); bool8 PlayerHasBerries(void); void ResetBerryTreeSparkleFlags(void); void debug_sub_80C2D24(u8 spicy, u8 dry, u8 sweet, u8 bitter, u8 sour, u8 smoothness); |