diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-16 15:41:54 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-16 15:41:54 -0400 |
| commit | 559833ccf622eef7932369b169f279a0b73c807f (patch) | |
| tree | 4bec10795ab76bc055dfd9c3d73c3e79100ec38d /include/berry.h | |
| parent | c7f28f034c4a86b6373b45941f47e5a231392ad0 (diff) | |
| parent | 19d2d73c7064375e6cef64ced734052170d4361b (diff) | |
Merge branch 'master' into field_map_obj
Diffstat (limited to 'include/berry.h')
| -rw-r--r-- | include/berry.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/berry.h b/include/berry.h index e9f0f8de9..dc0481d3d 100644 --- a/include/berry.h +++ b/include/berry.h @@ -43,12 +43,14 @@ u8 CalcBerryYieldInternal(u16 max, u16 min, u8 water); u8 CalcBerryYield(struct BerryTree *tree); u8 GetBerryCountByBerryTreeId(u8 id); u16 GetStageDurationByBerryType(u8); +void Bag_ChooseBerry(void); void FieldObjectInteractionGetBerryTreeData(void); -void sub_80B4EE4(void); void FieldObjectInteractionPlantBerryTree(void); void FieldObjectInteractionPickBerryTree(void); void FieldObjectInteractionRemoveBerryTree(void); u8 PlayerHasBerries(void); void ResetBerryTreeSparkleFlags(void); +extern const struct Berry gBerries[]; + #endif // GUARD_BERRY_H |