From b9ff56bd89ac11a9b40b34f834dcf7a5be4d90a6 Mon Sep 17 00:00:00 2001
From: Cameron Hall <camthesaxman@users.noreply.github.com>
Date: Fri, 27 Jan 2017 13:06:20 -0500
Subject: define more data in C (#219)

* define some graphics data in C

* define wild pokemon in C

* use less #ifdefs

* define data in berry.c
---
 include/global.berry.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'include/global.berry.h')

diff --git a/include/global.berry.h b/include/global.berry.h
index 8b98a5f58..b7938868d 100644
--- a/include/global.berry.h
+++ b/include/global.berry.h
@@ -3,13 +3,13 @@
 
 struct Berry
 {
-    u8 name[7];
+    const u8 name[7];
     u8 firmness;
     u16 size;
     u8 maxYield;
     u8 minYield;
-    u8 *description1;
-    u8 *description2;
+    const u8 *description1;
+    const u8 *description2;
     u8 stageDuration;
     u8 spicy;
     u8 dry;
-- 
cgit v1.2.3


From 242af849cb56ce0c4469c4e2be82a3ad5dbd3434 Mon Sep 17 00:00:00 2001
From: YamaArashi <shadow962@live.com>
Date: Tue, 9 May 2017 20:39:43 -0700
Subject: minutes, not seconds

---
 include/global.berry.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include/global.berry.h')

diff --git a/include/global.berry.h b/include/global.berry.h
index b7938868d..18e022b12 100644
--- a/include/global.berry.h
+++ b/include/global.berry.h
@@ -45,7 +45,7 @@ struct BerryTree
     u8 berry;
     u8 stage:7;
     u8 growthSparkle:1;
-    u16 secondsUntilNextStage;
+    u16 minutesUntilNextStage;
     u8 berryYield;
     u8 regrowthCount:4;
     u8 watered1:1;
-- 
cgit v1.2.3


From a3001a290e35296b016bc55be569a611141ce88e Mon Sep 17 00:00:00 2001
From: Cameron Hall <camthesaxman@users.noreply.github.com>
Date: Wed, 10 May 2017 17:04:21 -0500
Subject: start decompiling battle_2 (#289)

* start decompiling

* tired. finish later

* decompile some more

* BATTLE_TYPE_40 -> BATTLE_TYPE_MULTI
---
 include/global.berry.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'include/global.berry.h')

diff --git a/include/global.berry.h b/include/global.berry.h
index 18e022b12..6632e55e2 100644
--- a/include/global.berry.h
+++ b/include/global.berry.h
@@ -34,10 +34,10 @@ struct EnigmaBerry
 
 struct BattleEnigmaBerry
 {
-    u8 name[7];
-    u8 holdEffect;
-    u8 itemEffect[18];
-    u8 holdEffectParam;
+    /*0x00*/ u8 name[7];
+    /*0x07*/ u8 holdEffect;
+    /*0x08*/ u8 itemEffect[18];
+    /*0x1A*/ u8 holdEffectParam;
 };
 
 struct BerryTree
-- 
cgit v1.2.3