diff options
author | camthesaxman <cameronghall@cox.net> | 2017-05-10 16:53:14 -0500 |
---|---|---|
committer | camthesaxman <cameronghall@cox.net> | 2017-05-10 16:53:14 -0500 |
commit | 32153295edc1e93bd27894f75f2ab01f9140bed5 (patch) | |
tree | 397bb2852fbacc95b66a2b121c0a7eeb31c5c44d /include/berry.h | |
parent | e78f49f1efc2eadb674d00c00ffc9a4018b3cdbd (diff) | |
parent | 242af849cb56ce0c4469c4e2be82a3ad5dbd3434 (diff) |
Merge remote-tracking branch 'upstream/master' into decompile_battle_2
Diffstat (limited to 'include/berry.h')
-rw-r--r-- | include/berry.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/berry.h b/include/berry.h index 0013b4dba..f0acbe0ad 100644 --- a/include/berry.h +++ b/include/berry.h @@ -22,7 +22,7 @@ bool8 IsPlayerFacingPlantedBerryTree(void); bool8 TryToWaterBerryTree(void); void ClearBerryTrees(void); bool32 BerryTreeGrow(struct BerryTree *tree); -void BerryTreeTimeUpdate(int time); +void BerryTreeTimeUpdate(s32 minutes); void PlantBerryTree(u8 id, u8 berry, u8 stage, bool8 sparkle); void RemoveBerryTree(u8 id); u8 GetBerryTypeByBerryTreeId(u8 id); |