From 92bd6400b7ded57bde9a41206d10a5dcbd9f6383 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 26 Jan 2021 05:16:01 -0500 Subject: Fix up berry sparkle --- include/berry.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'include/berry.h') diff --git a/include/berry.h b/include/berry.h index afd1bc499..3412caae5 100644 --- a/include/berry.h +++ b/include/berry.h @@ -1,6 +1,8 @@ #ifndef GUARD_BERRY_H #define GUARD_BERRY_H +#include "constants/berry.h" + void ClearEnigmaBerries(void); void SetEnigmaBerry(u8 *src); bool32 IsEnigmaBerryValid(void); @@ -24,7 +26,7 @@ void ObjectEventInteractionPlantBerryTree(void); void ObjectEventInteractionPickBerryTree(void); void ObjectEventInteractionRemoveBerryTree(void); bool8 PlayerHasBerries(void); -void ResetBerryTreeSparkleFlags(void); +void SetBerryTreesSeen(void); extern const struct Berry gBerries[]; -- cgit v1.2.3 From 0851c34bac0f38699e3442d8b79c4d7fe52ca71c Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 5 Feb 2021 15:25:12 -0500 Subject: Add berry tree id constants --- include/berry.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'include/berry.h') diff --git a/include/berry.h b/include/berry.h index 3412caae5..4a5a46615 100644 --- a/include/berry.h +++ b/include/berry.h @@ -1,8 +1,6 @@ #ifndef GUARD_BERRY_H #define GUARD_BERRY_H -#include "constants/berry.h" - void ClearEnigmaBerries(void); void SetEnigmaBerry(u8 *src); bool32 IsEnigmaBerryValid(void); -- cgit v1.2.3 From 22e2c0a47ca876313604f0dd031abb324477186f Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 16 Mar 2021 05:40:42 -0400 Subject: Document Berry Crush --- include/berry.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'include/berry.h') diff --git a/include/berry.h b/include/berry.h index 4a5a46615..22b9158ee 100644 --- a/include/berry.h +++ b/include/berry.h @@ -28,11 +28,11 @@ void SetBerryTreesSeen(void); extern const struct Berry gBerries[]; -struct UnkStruct_0858AB24 { - u8 unk0; - u16 unk1; +struct BerryCrushBerryData { + u8 difficulty; // The number of A presses required to crush it + u16 powder; }; -extern const struct UnkStruct_0858AB24 gUnknown_0858AB24[]; +extern const struct BerryCrushBerryData gBerryCrush_BerryData[]; #endif // GUARD_BERRY_H -- cgit v1.2.3