summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-10-23 12:09:13 -0700
committerYamaArashi <shadow962@live.com>2016-10-23 12:09:13 -0700
commitec0a1478fe50039679c51e529a1032e4995a10a5 (patch)
tree9dd4caa664226c8822f8f490084ea55e8750bb95
parenta00910c71d34ac1102573969772124699b8b84b6 (diff)
berry tree struct
-rw-r--r--include/berry.h8
-rw-r--r--include/global.h3
2 files changed, 10 insertions, 1 deletions
diff --git a/include/berry.h b/include/berry.h
index 87d80de89..76e85c71d 100644
--- a/include/berry.h
+++ b/include/berry.h
@@ -40,4 +40,12 @@ struct BattleEnigmaBerry
u8 holdEffectParam;
};
+struct BerryTree
+{
+ u8 berry;
+ u8 stage;
+ u16 secondsUntilNextStage;
+ u8 wateredFlags;
+};
+
#endif // GUARD_BERRY_H
diff --git a/include/global.h b/include/global.h
index a489b93be..223cdd4a4 100644
--- a/include/global.h
+++ b/include/global.h
@@ -147,7 +147,8 @@ struct SaveBlock1
u8 flags[0x120];
u16 vars[0x100];
u32 gameStats[NUM_GAME_STATS];
- u8 filler_1608[0x18F4];
+ struct BerryTree berryTrees[128];
+ u8 filler_1A08[0x14F4];
struct SB1_2EFC_Struct sb1_2EFC_struct[5];
u8 filler_2F9C[0x1C4];
struct EnigmaBerry enigmaBerry;