diff options
| author | hondew <pokehondew@gmail.com> | 2020-05-02 13:38:25 -0400 |
|---|---|---|
| committer | hondew <pokehondew@gmail.com> | 2020-05-02 13:38:25 -0400 |
| commit | 048d1ffbdbe00e56ee4511d023885a11d018864b (patch) | |
| tree | e24376f984677b57c910330cb6e92b6c807c63d4 | |
| parent | 49184cd799e083b3b612f216da68ccafeb2cfb4f (diff) | |
Clarify stages
| -rw-r--r-- | include/berry.h | 2 | ||||
| -rw-r--r-- | include/constants/berry.h | 7 | ||||
| -rw-r--r-- | src/berry.c | 6 |
3 files changed, 10 insertions, 5 deletions
diff --git a/include/berry.h b/include/berry.h index b583f3eb2..afd1bc499 100644 --- a/include/berry.h +++ b/include/berry.h @@ -1,8 +1,6 @@ #ifndef GUARD_BERRY_H #define GUARD_BERRY_H -#define NUM_BERRY_STAGES 4 - void ClearEnigmaBerries(void); void SetEnigmaBerry(u8 *src); bool32 IsEnigmaBerryValid(void); diff --git a/include/constants/berry.h b/include/constants/berry.h index d413b9947..8f1e7cd82 100644 --- a/include/constants/berry.h +++ b/include/constants/berry.h @@ -25,4 +25,11 @@ #define BERRY_STAGE_BERRIES 5 #define BERRY_STAGE_SPARKLING 255 +// Berries can be watered in the following stages: +// - BERRY_STAGE_PLANTED +// - BERRY_STAGE_SPROUTED +// - BERRY_STAGE_TALLER +// - BERRY_STAGE_FLOWERING +#define NUM_WATER_STAGES 4 + #endif // GUARD_CONSTANTS_BERRY_H diff --git a/src/berry.c b/src/berry.c index 3f59639ad..e548d3c57 100644 --- a/src/berry.c +++ b/src/berry.c @@ -1225,10 +1225,10 @@ static u8 CalcBerryYieldInternal(u16 max, u16 min, u8 water) rand = randMin + Random() % (randMax - randMin + 1); // Round upwards - if ((rand % NUM_BERRY_STAGES) >= NUM_BERRY_STAGES / 2) - extraYield = rand / NUM_BERRY_STAGES + 1; + if ((rand % NUM_WATER_STAGES) >= NUM_WATER_STAGES / 2) + extraYield = rand / NUM_WATER_STAGES + 1; else - extraYield = rand / NUM_BERRY_STAGES; + extraYield = rand / NUM_WATER_STAGES; return extraYield + min; } } |