Merge pull request #1 from pret/master

Update fork to match main fork.

1 files changed, 1024 insertions, 62 deletions

diff --git a/src/berry.c b/src/berry.c
index aee624c33..d6fbb955e 100644
--- a/src/berry.c
+++ b/src/berry.c
@@ -1,46 +1,1008 @@
 #include "global.h"
 #include "berry.h"
-#include "asm.h"
+#include "field_control_avatar.h"
+#include "field_map_obj.h"
+#include "fieldmap.h"
 #include "item.h"
+#include "item_menu.h"
+#include "items.h"
 #include "main.h"
-#include "text.h"
 #include "rng.h"
+#include "text.h"
+
+#define BERRY_NAME_LENGTH 6
+
+#define FIRST_BERRY ITEM_CHERI_BERRY
+#define LAST_BERRY  ITEM_ENIGMA_BERRY
+
+#ifdef ENGLISH
+#define NAME_CHERI_BERRY   _("CHERI")
+#define NAME_CHESTO_BERRY  _("CHESTO")
+#define NAME_PECHA_BERRY   _("PECHA")
+#define NAME_RAWST_BERRY   _("RAWST")
+#define NAME_ASPEAR_BERRY  _("ASPEAR")
+#define NAME_LEPPA_BERRY   _("LEPPA")
+#define NAME_ORAN_BERRY    _("ORAN")
+#define NAME_PERSIM_BERRY  _("PERSIM")
+#define NAME_LUM_BERRY     _("LUM")
+#define NAME_SITRUS_BERRY  _("SITRUS")
+#define NAME_FIGY_BERRY    _("FIGY")
+#define NAME_WIKI_BERRY    _("WIKI")
+#define NAME_MAGO_BERRY    _("MAGO")
+#define NAME_AGUAV_BERRY   _("AGUAV")
+#define NAME_IAPAPA_BERRY  _("IAPAPA")
+#define NAME_RAZZ_BERRY    _("RAZZ")
+#define NAME_BLUK_BERRY    _("BLUK")
+#define NAME_NANAB_BERRY   _("NANAB")
+#define NAME_WEPEAR_BERRY  _("WEPEAR")
+#define NAME_PINAP_BERRY   _("PINAP")
+#define NAME_POMEG_BERRY   _("POMEG")
+#define NAME_KELPSY_BERRY  _("KELPSY")
+#define NAME_QUALOT_BERRY  _("QUALOT")
+#define NAME_HONDEW_BERRY  _("HONDEW")
+#define NAME_GREPA_BERRY   _("GREPA")
+#define NAME_TAMATO_BERRY  _("TAMATO")
+#define NAME_CORNN_BERRY   _("CORNN")
+#define NAME_MAGOST_BERRY  _("MAGOST")
+#define NAME_RABUTA_BERRY  _("RABUTA")
+#define NAME_NOMEL_BERRY   _("NOMEL")
+#define NAME_SPELON_BERRY  _("SPELON")
+#define NAME_PAMTRE_BERRY  _("PAMTRE")
+#define NAME_WATMEL_BERRY  _("WATMEL")
+#define NAME_DURIN_BERRY   _("DURIN")
+#define NAME_BELUE_BERRY   _("BELUE")
+#define NAME_LIECHI_BERRY  _("LIECHI")
+#define NAME_GANLON_BERRY  _("GANLON")
+#define NAME_SALAC_BERRY   _("SALAC")
+#define NAME_PETAYA_BERRY  _("PETAYA")
+#define NAME_APICOT_BERRY  _("APICOT")
+#define NAME_LANSAT_BERRY  _("LANSAT")
+#define NAME_STARF_BERRY   _("STARF")
+#define NAME_ENIGMA_BERRY  _("ENIGMA")
 
-#define FIRST_BERRY 0x85 // ITEM_CHERI_BERRY
-#define LAST_BERRY 0xaf // ITEM_ENIGMA_BERRY
+const u8 gBerryDescriptionPart1_Cheri[] = _("Blooms with delicate pretty flowers.");
+const u8 gBerryDescriptionPart2_Cheri[] = _("The bright red BERRY is very spicy.");
+const u8 gBerryDescriptionPart1_Chesto[] = _("The BERRY’s thick skin and fruit are");
+const u8 gBerryDescriptionPart2_Chesto[] = _("very tough. It is dry-tasting all over.");
+const u8 gBerryDescriptionPart1_Pecha[] = _("Very sweet and delicious.");
+const u8 gBerryDescriptionPart2_Pecha[] = _("Also very tender - handle with care.");
+const u8 gBerryDescriptionPart1_Rawst[] = _("If the leaves grow long and curly,");
+const u8 gBerryDescriptionPart2_Rawst[] = _("the BERRY seems to grow very bitter.");
+const u8 gBerryDescriptionPart1_Aspear[] = _("The hard BERRY is dense with a rich");
+const u8 gBerryDescriptionPart2_Aspear[] = _("juice. It is quite sour.");
+const u8 gBerryDescriptionPart1_Leppa[] = _("Grows slower than CHERI and others.");
+const u8 gBerryDescriptionPart2_Leppa[] = _("The smaller the BERRY, the tastier.");
+const u8 gBerryDescriptionPart1_Oran[] = _("A peculiar BERRY with a mix of flavors.");
+const u8 gBerryDescriptionPart2_Oran[] = _("BERRIES grow in half a day.");
+const u8 gBerryDescriptionPart1_Persim[] = _("Loves sunlight. The BERRY’s color");
+const u8 gBerryDescriptionPart2_Persim[] = _("grows vivid when exposed to the sun.");
+const u8 gBerryDescriptionPart1_Lum[] = _("Slow to grow. If raised with loving");
+const u8 gBerryDescriptionPart2_Lum[] = _("care, it may grow two BERRIES.");
+const u8 gBerryDescriptionPart1_Sitrus[] = _("Closely related to ORAN. The large");
+const u8 gBerryDescriptionPart2_Sitrus[] = _("BERRY has a well-rounded flavor.");
+const u8 gBerryDescriptionPart1_Figy[] = _("The BERRY, which looks chewed up,");
+const u8 gBerryDescriptionPart2_Figy[] = _("brims with spicy substances.");
+const u8 gBerryDescriptionPart1_Wiki[] = _("The BERRY is said to have grown lumpy");
+const u8 gBerryDescriptionPart2_Wiki[] = _("to help POKéMON grip it.");
+const u8 gBerryDescriptionPart1_Mago[] = _("The BERRY turns curvy as it grows.");
+const u8 gBerryDescriptionPart2_Mago[] = _("The curvier, the sweeter and tastier.");
+const u8 gBerryDescriptionPart1_Aguav[] = _("The flower is dainty. It is rare in its");
+const u8 gBerryDescriptionPart2_Aguav[] = _("ability to grow without light.");
+const u8 gBerryDescriptionPart1_Iapapa[] = _("The BERRY is very big and sour.");
+const u8 gBerryDescriptionPart2_Iapapa[] = _("It takes at least a day to grow.");
+const u8 gBerryDescriptionPart1_Razz[] = _("The red BERRY tastes slightly spicy.");
+const u8 gBerryDescriptionPart2_Razz[] = _("It grows quickly in just four hours.");
+const u8 gBerryDescriptionPart1_Bluk[] = _("The BERRY is blue on the outside, but");
+const u8 gBerryDescriptionPart2_Bluk[] = _("it blackens the mouth when eaten.");
+const u8 gBerryDescriptionPart1_Nanab[] = _("This BERRY was the seventh");
+const u8 gBerryDescriptionPart2_Nanab[] = _("discovered in the world. It is sweet.");
+const u8 gBerryDescriptionPart1_Wepear[] = _("The flower is small and white. It has a");
+const u8 gBerryDescriptionPart2_Wepear[] = _("delicate balance of bitter and sour.");
+const u8 gBerryDescriptionPart1_Pinap[] = _("Weak against wind and cold.");
+const u8 gBerryDescriptionPart2_Pinap[] = _("The fruit is spicy and the skin, sour.");
+const u8 gBerryDescriptionPart1_Pomeg[] = _("However much it is watered,");
+const u8 gBerryDescriptionPart2_Pomeg[] = _("it only grows up to six BERRIES.");
+const u8 gBerryDescriptionPart1_Kelpsy[] = _("A rare variety shaped like a root.");
+const u8 gBerryDescriptionPart2_Kelpsy[] = _("Grows a very large flower.");
+const u8 gBerryDescriptionPart1_Qualot[] = _("Loves water. Grows strong even in");
+const u8 gBerryDescriptionPart2_Qualot[] = _("locations with constant rainfall.");
+const u8 gBerryDescriptionPart1_Hondew[] = _("A BERRY that is very valuable and");
+const u8 gBerryDescriptionPart2_Hondew[] = _("rarely seen. It is very delicious.");
+const u8 gBerryDescriptionPart1_Grepa[] = _("Despite its tenderness and round");
+const u8 gBerryDescriptionPart2_Grepa[] = _("shape, the BERRY is unimaginably sour.");
+const u8 gBerryDescriptionPart1_Tamato[] = _("The BERRY is lip-bendingly spicy.");
+const u8 gBerryDescriptionPart2_Tamato[] = _("It takes time to grow.");
+const u8 gBerryDescriptionPart1_Cornn[] = _("A BERRY from an ancient era. May not");
+const u8 gBerryDescriptionPart2_Cornn[] = _("grow unless planted in quantity.");
+const u8 gBerryDescriptionPart1_Magost[] = _("A BERRY that is widely said to have");
+const u8 gBerryDescriptionPart2_Magost[] = _("a finely balanced flavor.");
+const u8 gBerryDescriptionPart1_Rabuta[] = _("A rare variety that is overgrown with");
+const u8 gBerryDescriptionPart2_Rabuta[] = _("hair. It is quite bitter.");
+const u8 gBerryDescriptionPart1_Nomel[] = _("Quite sour. Just one bite makes it");
+const u8 gBerryDescriptionPart2_Nomel[] = _("impossible to taste for three days.");
+const u8 gBerryDescriptionPart1_Spelon[] = _("The vividly red BERRY is very spicy.");
+const u8 gBerryDescriptionPart2_Spelon[] = _("Its warts secrete a spicy substance.");
+const u8 gBerryDescriptionPart1_Pamtre[] = _("Drifts on the sea from somewhere.");
+const u8 gBerryDescriptionPart2_Pamtre[] = _("It is thought to grow elsewhere.");
+const u8 gBerryDescriptionPart1_Watmel[] = _("A huge BERRY, with some over 20");
+const u8 gBerryDescriptionPart2_Watmel[] = _("inches discovered. Exceedingly sweet.");
+const u8 gBerryDescriptionPart1_Durin[] = _("Bitter to even look at. It is so");
+const u8 gBerryDescriptionPart2_Durin[] = _("bitter, no one has ever eaten it as is.");
+const u8 gBerryDescriptionPart1_Belue[] = _("It is glossy and looks delicious, but");
+const u8 gBerryDescriptionPart2_Belue[] = _("it is awfully sour. Takes time to grow.");
+const u8 gBerryDescriptionPart1_Liechi[] = _("A mysterious BERRY. It is rumored to");
+const u8 gBerryDescriptionPart2_Liechi[] = _("contain the power of the sea.");
+const u8 gBerryDescriptionPart1_Ganlon[] = _("A mysterious BERRY. It is rumored to");
+const u8 gBerryDescriptionPart2_Ganlon[] = _("contain the power of the land.");
+const u8 gBerryDescriptionPart1_Salac[] = _("A mysterious BERRY. It is rumored to");
+const u8 gBerryDescriptionPart2_Salac[] = _("contain the power of the sky.");
+const u8 gBerryDescriptionPart1_Petaya[] = _("A mysterious BERRY. It is rumored to");
+const u8 gBerryDescriptionPart2_Petaya[] = _("contain the power of all living things.");
+const u8 gBerryDescriptionPart1_Apicot[] = _("A very mystifying BERRY. No telling");
+const u8 gBerryDescriptionPart2_Apicot[] = _("what may happen or how it can be used.");
+const u8 gBerryDescriptionPart1_Lansat[] = _("Said to be a legendary BERRY.");
+const u8 gBerryDescriptionPart2_Lansat[] = _("Holding it supposedly brings joy.");
+const u8 gBerryDescriptionPart1_Starf[] = _("So strong, it was abandoned at the");
+const u8 gBerryDescriptionPart2_Starf[] = _("world’s edge. Considered a mirage.");
+const u8 gBerryDescriptionPart1_Enigma[] = _("A completely enigmatic BERRY.");
+const u8 gBerryDescriptionPart2_Enigma[] = _("Appears to have the power of stars.");
+#elif defined(GERMAN)
+#define NAME_CHERI_BERRY   _("AMRENA")
+#define NAME_CHESTO_BERRY  _("MARON")
+#define NAME_PECHA_BERRY   _("PIRSIF")
+#define NAME_RAWST_BERRY   _("FRAGIA")
+#define NAME_ASPEAR_BERRY  _("WILBIR")
+#define NAME_LEPPA_BERRY   _("JONAGO")
+#define NAME_ORAN_BERRY    _("SINEL")
+#define NAME_PERSIM_BERRY  _("PERSIM")
+#define NAME_LUM_BERRY     _("PRUNUS")
+#define NAME_SITRUS_BERRY  _("TSITRU")
+#define NAME_FIGY_BERRY    _("GIEFE")
+#define NAME_WIKI_BERRY    _("WIKI")
+#define NAME_MAGO_BERRY    _("MAGO")
+#define NAME_AGUAV_BERRY   _("GAUVE")
+#define NAME_IAPAPA_BERRY  _("YAPA")
+#define NAME_RAZZ_BERRY    _("HIMMIH")
+#define NAME_BLUK_BERRY    _("MORB")
+#define NAME_NANAB_BERRY   _("NANAB")
+#define NAME_WEPEAR_BERRY  _("NIRBE")
+#define NAME_PINAP_BERRY   _("SANANA")
+#define NAME_POMEG_BERRY   _("GRANA")
+#define NAME_KELPSY_BERRY  _("SETANG")
+#define NAME_QUALOT_BERRY  _("QUALOT")
+#define NAME_HONDEW_BERRY  _("HONMEL")
+#define NAME_GREPA_BERRY   _("LABRUS")
+#define NAME_TAMATO_BERRY  _("TAMOT")
+#define NAME_CORNN_BERRY   _("SAIM")
+#define NAME_MAGOST_BERRY  _("MAGOST")
+#define NAME_RABUTA_BERRY  _("RABUTA")
+#define NAME_NOMEL_BERRY   _("TRONZI")
+#define NAME_SPELON_BERRY  _("KIWAN")
+#define NAME_PAMTRE_BERRY  _("PALLM")
+#define NAME_WATMEL_BERRY  _("WASMEL")
+#define NAME_DURIN_BERRY   _("DURIN")
+#define NAME_BELUE_BERRY   _("MYRTIL")
+#define NAME_LIECHI_BERRY  _("LYDZI")
+#define NAME_GANLON_BERRY  _("LINGAN")
+#define NAME_SALAC_BERRY   _("SALKA")
+#define NAME_PETAYA_BERRY  _("TAHAY")
+#define NAME_APICOT_BERRY  _("APIKO")
+#define NAME_LANSAT_BERRY  _("LANSAT")
+#define NAME_STARF_BERRY   _("KRAMBO")
+#define NAME_ENIGMA_BERRY  _("ENIGMA")
+
+const u8 gBerryDescriptionPart1_Cheri[] = _("Erblüht mit hübschen, zarten Blumen.");
+const u8 gBerryDescriptionPart2_Cheri[] = _("Diese knallrote BEERE ist sehr scharf.");
+const u8 gBerryDescriptionPart1_Chesto[] = _("Diese BEERE hat eine dicke Haut und");
+const u8 gBerryDescriptionPart2_Chesto[] = _("hartes Fruchtfleisch. Trocken!");
+const u8 gBerryDescriptionPart1_Pecha[] = _("Sehr süß und delikat.");
+const u8 gBerryDescriptionPart2_Pecha[] = _("Sehr zart. Vorsichtig anfassen!");
+const u8 gBerryDescriptionPart1_Rawst[] = _("Wenn die Blätter lang und wellig sind,");
+const u8 gBerryDescriptionPart2_Rawst[] = _("wird die BEERE sehr bitter.");
+const u8 gBerryDescriptionPart1_Aspear[] = _("Diese harte BEERE ist sehr");
+const u8 gBerryDescriptionPart2_Aspear[] = _("saftig und sauer im Geschmack!");
+const u8 gBerryDescriptionPart1_Leppa[] = _("Wächst langsamer als AMRENA und");
+const u8 gBerryDescriptionPart2_Leppa[] = _("andere. Je kleiner, desto delikater.");
+const u8 gBerryDescriptionPart1_Oran[] = _("Eine BEERE unterschiedlichsten Ge-");
+const u8 gBerryDescriptionPart2_Oran[] = _("schmacks. Wächst an einem halben Tag.");
+const u8 gBerryDescriptionPart1_Persim[] = _("Liebt Sonnenlicht. Die BEERE");
+const u8 gBerryDescriptionPart2_Persim[] = _("wächst im Sonnenlicht sehr schnell.");
+const u8 gBerryDescriptionPart1_Lum[] = _("Langsamer Wuchs. Wird sie liebevoll ge-");
+const u8 gBerryDescriptionPart2_Lum[] = _("pflegt, kann sie 2 BEEREN tragen.");
+const u8 gBerryDescriptionPart1_Sitrus[] = _("Eng verwandt mit SINEL. Diese große");
+const u8 gBerryDescriptionPart2_Sitrus[] = _("BEERE ist von rundem Geschmack.");
+const u8 gBerryDescriptionPart1_Figy[] = _("Die BEERE sieht angekaut aus. Sie ist");
+const u8 gBerryDescriptionPart2_Figy[] = _("voller scharfer Substanzen.");
+const u8 gBerryDescriptionPart1_Wiki[] = _("Die BEERE wächst unförmig,");
+const u8 gBerryDescriptionPart2_Wiki[] = _("damit PKMN sie besser greifen können.");
+const u8 gBerryDescriptionPart1_Mago[] = _("Die BEERE hat Ausbeulungen. Je mehr");
+const u8 gBerryDescriptionPart2_Mago[] = _("Beulen, desto schmackhafter ist sie.");
+const u8 gBerryDescriptionPart1_Aguav[] = _("Die Blume ist zart. Sie ist fähig,");
+const u8 gBerryDescriptionPart2_Aguav[] = _("ohne Licht wachsen zu können.");
+const u8 gBerryDescriptionPart1_Iapapa[] = _("Die BEERE ist groß und sauer.");
+const u8 gBerryDescriptionPart2_Iapapa[] = _("Sie braucht einen Tag zum Wachsen.");
+const u8 gBerryDescriptionPart1_Razz[] = _("Diese rote BEERE schmeckt etwas");
+const u8 gBerryDescriptionPart2_Razz[] = _("scharf. Sie wächst in nur 4 Stunden.");
+const u8 gBerryDescriptionPart1_Bluk[] = _("Die BEERE ist außen blau, verfärbt");
+const u8 gBerryDescriptionPart2_Bluk[] = _("sich im Mund aber schwarz.");
+const u8 gBerryDescriptionPart1_Nanab[] = _("Diese BEERE war die 7., die auf der");
+const u8 gBerryDescriptionPart2_Nanab[] = _("Welt entdeckt wurde. Sie ist süß.");
+const u8 gBerryDescriptionPart1_Wepear[] = _("Die Blume ist klein und weiß. Angenehm");
+const u8 gBerryDescriptionPart2_Wepear[] = _("bitter und sauer zugleich.");
+const u8 gBerryDescriptionPart1_Pinap[] = _("Wind und Kälte verträgt sie nicht.");
+const u8 gBerryDescriptionPart2_Pinap[] = _("Fruchtfleisch: Scharf. Haut: Sauer.");
+const u8 gBerryDescriptionPart1_Pomeg[] = _("Egal wie viel Wasser sie bekommt, sie");
+const u8 gBerryDescriptionPart2_Pomeg[] = _("trägt immer bis zu 6 BEEREN.");
+const u8 gBerryDescriptionPart1_Kelpsy[] = _("Eine Seltenheit. Geformt wie eine");
+const u8 gBerryDescriptionPart2_Kelpsy[] = _("Wurzel. Hat eine große Blume.");
+const u8 gBerryDescriptionPart1_Qualot[] = _("Liebt das Wasser. Wächst besonders");
+const u8 gBerryDescriptionPart2_Qualot[] = _("gut in regenreichen Gegenden.");
+const u8 gBerryDescriptionPart1_Hondew[] = _("Eine wertvolle und seltene BEERE.");
+const u8 gBerryDescriptionPart2_Hondew[] = _("Sie ist sehr schmackhaft.");
+const u8 gBerryDescriptionPart1_Grepa[] = _("Die BEERE ist zart und von runder");
+const u8 gBerryDescriptionPart2_Grepa[] = _("Form. Aber sie ist unglaublich sauer!");
+const u8 gBerryDescriptionPart1_Tamato[] = _("Die Schärfe der BEERE verbrennt die");
+const u8 gBerryDescriptionPart2_Tamato[] = _("Lippen. Sie braucht Zeit zum Wachsen.");
+const u8 gBerryDescriptionPart1_Cornn[] = _("Eine BEERE aus alten Zeiten. Wächst");
+const u8 gBerryDescriptionPart2_Cornn[] = _("nur, wenn in großen Mengen gepflanzt.");
+const u8 gBerryDescriptionPart1_Magost[] = _("Eine BEERE, die für ihren feinen, aus-");
+const u8 gBerryDescriptionPart2_Magost[] = _("gewogenen Geschmack bekannt ist.");
+const u8 gBerryDescriptionPart1_Rabuta[] = _("Eine Seltenheit, die über und über mit");
+const u8 gBerryDescriptionPart2_Rabuta[] = _("Haaren bewachsen ist. Sehr bitter!");
+const u8 gBerryDescriptionPart1_Nomel[] = _("Sehr sauer. Ein Biss betäubt die");
+const u8 gBerryDescriptionPart2_Nomel[] = _("Geschmacksnerven für 3 Tage!");
+const u8 gBerryDescriptionPart1_Spelon[] = _("Die leuchtend rote BEERE ist sehr");
+const u8 gBerryDescriptionPart2_Spelon[] = _("scharf. Gibt scharfe Substanzen ab!");
+const u8 gBerryDescriptionPart1_Pamtre[] = _("Wird vom Meer angespült. Sie wächst");
+const u8 gBerryDescriptionPart2_Pamtre[] = _("an einem anderen Ort.");
+const u8 gBerryDescriptionPart1_Watmel[] = _("Eine große BEERE, 25 cm groß.");
+const u8 gBerryDescriptionPart2_Watmel[] = _("Außergewöhnlich süß.");
+const u8 gBerryDescriptionPart1_Durin[] = _("Bitter schon ihr Anblick! Sie ist so");
+const u8 gBerryDescriptionPart2_Durin[] = _("bitter, dass niemand sie pur isst.");
+const u8 gBerryDescriptionPart1_Belue[] = _("Sie glänzt, sieht zart aus, ist extrem");
+const u8 gBerryDescriptionPart2_Belue[] = _("sauer und braucht Zeit zum Wachsen.");
+const u8 gBerryDescriptionPart1_Liechi[] = _("Eine geheimnisvolle BEERE. Man sagt,");
+const u8 gBerryDescriptionPart2_Liechi[] = _("sie enthalte die Kraft des Meeres.");
+const u8 gBerryDescriptionPart1_Ganlon[] = _("Eine geheimnisvolle BEERE. Man sagt,");
+const u8 gBerryDescriptionPart2_Ganlon[] = _("sie enthalte die Kraft des Landes.");
+const u8 gBerryDescriptionPart1_Salac[] = _("Eine geheimnisvolle BEERE. Man sagt,");
+const u8 gBerryDescriptionPart2_Salac[] = _("sie enthalte die Kraft des Himmels.");
+const u8 gBerryDescriptionPart1_Petaya[] = _("Eine geheimnisvolle BEERE. Man sagt,");
+const u8 gBerryDescriptionPart2_Petaya[] = _("sie enthalte die Kraft allen Lebens.");
+const u8 gBerryDescriptionPart1_Apicot[] = _("Eine rätselhafte BEERE. Man kann");
+const u8 gBerryDescriptionPart2_Apicot[] = _("nicht sagen, wie und was sie ist.");
+const u8 gBerryDescriptionPart1_Lansat[] = _("Eine legendäre BEERE. Sie zu");
+const u8 gBerryDescriptionPart2_Lansat[] = _("tragen bringt Freude.");
+const u8 gBerryDescriptionPart1_Starf[] = _("So stark, dass sie an den Rand der");
+const u8 gBerryDescriptionPart2_Starf[] = _("Welt verbannt wurde. Ein Märchen?");
+const u8 gBerryDescriptionPart1_Enigma[] = _("Eine enigmatische BEERE. Sie scheint");
+const u8 gBerryDescriptionPart2_Enigma[] = _("die Macht der Sterne zu besitzen.");
+#endif
+
+const struct Berry gBerries[] =
+{
+    {
+        .name = NAME_CHERI_BERRY,
+        .firmness = BERRY_FIRMNESS_SOFT,
+        .size = 20,
+        .maxYield = 3,
+        .minYield = 2,
+        .description1 = gBerryDescriptionPart1_Cheri,
+        .description2 = gBerryDescriptionPart2_Cheri,
+        .stageDuration = 3,
+        .spicy = 10,
+        .dry = 0,
+        .sweet = 0,
+        .bitter = 0,
+        .sour = 0,
+        .smoothness = 25,
+    },
+    {
+        .name = NAME_CHESTO_BERRY,
+        .firmness = BERRY_FIRMNESS_SUPER_HARD,
+        .size = 80,
+        .maxYield = 3,
+        .minYield = 2,
+        .description1 = gBerryDescriptionPart1_Chesto,
+        .description2 = gBerryDescriptionPart2_Chesto,
+        .stageDuration = 3,
+        .spicy = 0,
+        .dry = 10,
+        .sweet = 0,
+        .bitter = 0,
+        .sour = 0,
+        .smoothness = 25,
+    },
+    {
+        .name = NAME_PECHA_BERRY,
+        .firmness = BERRY_FIRMNESS_VERY_SOFT,
+        .size = 40,
+        .maxYield = 3,
+        .minYield = 2,
+        .description1 = gBerryDescriptionPart1_Pecha,
+        .description2 = gBerryDescriptionPart2_Pecha,
+        .stageDuration = 3,
+        .spicy = 0,
+        .dry = 0,
+        .sweet = 10,
+        .bitter = 0,
+        .sour = 0,
+        .smoothness = 25,
+    },
+    {
+        .name = NAME_RAWST_BERRY,
+        .firmness = BERRY_FIRMNESS_HARD,
+        .size = 32,
+        .maxYield = 3,
+        .minYield = 2,
+        .description1 = gBerryDescriptionPart1_Rawst,
+        .description2 = gBerryDescriptionPart2_Rawst,
+        .stageDuration = 3,
+        .spicy = 0,
+        .dry = 0,
+        .sweet = 0,
+        .bitter = 10,
+        .sour = 0,
+        .smoothness = 25,
+    },
+    {
+        .name = NAME_ASPEAR_BERRY,
+        .firmness = BERRY_FIRMNESS_SUPER_HARD,
+        .size = 50,
+        .maxYield = 3,
+        .minYield = 2,
+        .description1 = gBerryDescriptionPart1_Aspear,
+        .description2 = gBerryDescriptionPart2_Aspear,
+        .stageDuration = 3,
+        .spicy = 0,
+        .dry = 0,
+        .sweet = 0,
+        .bitter = 0,
+        .sour = 10,
+        .smoothness = 25,
+    },
+    {
+        .name = NAME_LEPPA_BERRY,
+        .firmness = BERRY_FIRMNESS_VERY_HARD,
+        .size = 28,
+        .maxYield = 3,
+        .minYield = 2,
+        .description1 = gBerryDescriptionPart1_Leppa,
+        .description2 = gBerryDescriptionPart2_Leppa,
+        .stageDuration = 4,
+        .spicy = 10,
+        .dry = 0,
+        .sweet = 10,
+        .bitter = 10,
+        .sour = 10,
+        .smoothness = 20,
+    },
+    {
+        .name = NAME_ORAN_BERRY,
+        .firmness = BERRY_FIRMNESS_SUPER_HARD,
+        .size = 35,
+        .maxYield = 3,
+        .minYield = 2,
+        .description1 = gBerryDescriptionPart1_Oran,
+        .description2 = gBerryDescriptionPart2_Oran,
+        .stageDuration = 3,
+        .spicy = 10,
+        .dry = 10,
+        .sweet = 10,
+        .bitter = 10,
+        .sour = 10,
+        .smoothness = 20,
+    },
+    {
+        .name = NAME_PERSIM_BERRY,
+        .firmness = BERRY_FIRMNESS_HARD,
+        .size = 47,
+        .maxYield = 3,
+        .minYield = 2,
+        .description1 = gBerryDescriptionPart1_Persim,
+        .description2 = gBerryDescriptionPart2_Persim,
+        .stageDuration = 3,
+        .spicy = 10,
+        .dry = 10,
+        .sweet = 10,
+        .bitter = 10,
+        .sour = 10,
+        .smoothness = 20,
+    },
+    {
+        .name = NAME_LUM_BERRY,
+        .firmness = BERRY_FIRMNESS_SUPER_HARD,
+        .size = 34,
+        .maxYield = 2,
+        .minYield = 1,
+        .description1 = gBerryDescriptionPart1_Lum,
+        .description2 = gBerryDescriptionPart2_Lum,
+        .stageDuration = 12,
+        .spicy = 10,
+        .dry = 10,
+        .sweet = 10,
+        .bitter = 10,
+        .sour = 10,
+        .smoothness = 20,
+    },
+    {
+        .name = NAME_SITRUS_BERRY,
+        .firmness = BERRY_FIRMNESS_VERY_HARD,
+        .size = 95,
+        .maxYield = 3,
+        .minYield = 2,
+        .description1 = gBerryDescriptionPart1_Sitrus,
+        .description2 = gBerryDescriptionPart2_Sitrus,
+        .stageDuration = 6,
+        .spicy = 10,
+        .dry = 10,
+        .sweet = 10,
+        .bitter = 10,
+        .sour = 10,
+        .smoothness = 20,
+    },
+    {
+        .name = NAME_FIGY_BERRY,
+        .firmness = BERRY_FIRMNESS_SOFT,
+        .size = 100,
+        .maxYield = 3,
+        .minYield = 2,
+        .description1 = gBerryDescriptionPart1_Figy,
+        .description2 = gBerryDescriptionPart2_Figy,
+        .stageDuration = 6,
+        .spicy = 10,
+        .dry = 0,
+        .sweet = 0,
+        .bitter = 0,
+        .sour = 0,
+        .smoothness = 25,
+    },
+    {
+        .name = NAME_WIKI_BERRY,
+        .firmness = BERRY_FIRMNESS_HARD,
+        .size = 115,
+        .maxYield = 3,
+        .minYield = 2,
+        .description1 = gBerryDescriptionPart1_Wiki,
+        .description2 = gBerryDescriptionPart2_Wiki,
+        .stageDuration = 6,
+        .spicy = 0,
+        .dry = 10,
+        .sweet = 0,
+        .bitter = 0,
+        .sour = 0,
+        .smoothness = 25,
+    },
+    {
+        .name = NAME_MAGO_BERRY,
+        .firmness = BERRY_FIRMNESS_HARD,
+        .size = 126,
+        .maxYield = 3,
+        .minYield = 2,
+        .description1 = gBerryDescriptionPart1_Mago,
+        .description2 = gBerryDescriptionPart2_Mago,
+        .stageDuration = 6,
+        .spicy = 0,
+        .dry = 0,
+        .sweet = 10,
+        .bitter = 0,
+        .sour = 0,
+        .smoothness = 25,
+    },
+    {
+        .name = NAME_AGUAV_BERRY,
+        .firmness = BERRY_FIRMNESS_SUPER_HARD,
+        .size = 64,
+        .maxYield = 3,
+        .minYield = 2,
+        .description1 = gBerryDescriptionPart1_Aguav,
+        .description2 = gBerryDescriptionPart2_Aguav,
+        .stageDuration = 6,
+        .spicy = 0,
+        .dry = 0,
+        .sweet = 0,
+        .bitter = 10,
+        .sour = 0,
+        .smoothness = 25,
+    },
+    {
+        .name = NAME_IAPAPA_BERRY,
+        .firmness = BERRY_FIRMNESS_SOFT,
+        .size = 223,
+        .maxYield = 3,
+        .minYield = 2,
+        .description1 = gBerryDescriptionPart1_Iapapa,
+        .description2 = gBerryDescriptionPart2_Iapapa,
+        .stageDuration = 6,
+        .spicy = 0,
+        .dry = 0,
+        .sweet = 0,
+        .bitter = 0,
+        .sour = 10,
+        .smoothness = 25,
+    },
+    {
+        .name = NAME_RAZZ_BERRY,
+        .firmness = BERRY_FIRMNESS_VERY_HARD,
+        .size = 120,
+        .maxYield = 6,
+        .minYield = 3,
+        .description1 = gBerryDescriptionPart1_Razz,
+        .description2 = gBerryDescriptionPart2_Razz,
+        .stageDuration = 1,
+        .spicy = 10,
+        .dry = 10,
+        .sweet = 0,
+        .bitter = 0,
+        .sour = 0,
+        .smoothness = 20,
+    },
+    {
+        .name = NAME_BLUK_BERRY,
+        .firmness = BERRY_FIRMNESS_SOFT,
+        .size = 108,
+        .maxYield = 6,
+        .minYield = 3,
+        .description1 = gBerryDescriptionPart1_Bluk,
+        .description2 = gBerryDescriptionPart2_Bluk,
+        .stageDuration = 1,
+        .spicy = 0,
+        .dry = 10,
+        .sweet = 10,
+        .bitter = 0,
+        .sour = 0,
+        .smoothness = 20,
+    },
+    {
+        .name = NAME_NANAB_BERRY,
+        .firmness = BERRY_FIRMNESS_VERY_HARD,
+        .size = 77,
+        .maxYield = 6,
+        .minYield = 3,
+        .description1 = gBerryDescriptionPart1_Nanab,
+        .description2 = gBerryDescriptionPart2_Nanab,
+        .stageDuration = 1,
+        .spicy = 0,
+        .dry = 0,
+        .sweet = 10,
+        .bitter = 10,
+        .sour = 0,
+        .smoothness = 20,
+    },
+    {
+        .name = NAME_WEPEAR_BERRY,
+        .firmness = BERRY_FIRMNESS_SUPER_HARD,
+        .size = 74,
+        .maxYield = 6,
+        .minYield = 3,
+        .description1 = gBerryDescriptionPart1_Wepear,
+        .description2 = gBerryDescriptionPart2_Wepear,
+        .stageDuration = 1,
+        .spicy = 0,
+        .dry = 0,
+        .sweet = 0,
+        .bitter = 10,
+        .sour = 10,
+        .smoothness = 20,
+    },
+    {
+        .name = NAME_PINAP_BERRY,
+        .firmness = BERRY_FIRMNESS_HARD,
+        .size = 80,
+        .maxYield = 6,
+        .minYield = 3,
+        .description1 = gBerryDescriptionPart1_Pinap,
+        .description2 = gBerryDescriptionPart2_Pinap,
+        .stageDuration = 1,
+        .spicy = 10,
+        .dry = 0,
+        .sweet = 0,
+        .bitter = 0,
+        .sour = 10,
+        .smoothness = 20,
+    },
+    {
+        .name = NAME_POMEG_BERRY,
+        .firmness = BERRY_FIRMNESS_VERY_HARD,
+        .size = 135,
+        .maxYield = 6,
+        .minYield = 2,
+        .description1 = gBerryDescriptionPart1_Pomeg,
+        .description2 = gBerryDescriptionPart2_Pomeg,
+        .stageDuration = 3,
+        .spicy = 10,
+        .dry = 0,
+        .sweet = 10,
+        .bitter = 10,
+        .sour = 0,
+        .smoothness = 20,
+    },
+    {
+        .name = NAME_KELPSY_BERRY,
+        .firmness = BERRY_FIRMNESS_HARD,
+        .size = 150,
+        .maxYield = 6,
+        .minYield = 2,
+        .description1 = gBerryDescriptionPart1_Kelpsy,
+        .description2 = gBerryDescriptionPart2_Kelpsy,
+        .stageDuration = 3,
+        .spicy = 0,
+        .dry = 10,
+        .sweet = 0,
+        .bitter = 10,
+        .sour = 10,
+        .smoothness = 20,
+    },
+    {
+        .name = NAME_QUALOT_BERRY,
+        .firmness = BERRY_FIRMNESS_HARD,
+        .size = 110,
+        .maxYield = 6,
+        .minYield = 2,
+        .description1 = gBerryDescriptionPart1_Qualot,
+        .description2 = gBerryDescriptionPart2_Qualot,
+        .stageDuration = 3,
+        .spicy = 10,
+        .dry = 0,
+        .sweet = 10,
+        .bitter = 0,
+        .sour = 10,
+        .smoothness = 20,
+    },
+    {
+        .name = NAME_HONDEW_BERRY,
+        .firmness = BERRY_FIRMNESS_HARD,
+        .size = 162,
+        .maxYield = 6,
+        .minYield = 2,
+        .description1 = gBerryDescriptionPart1_Hondew,
+        .description2 = gBerryDescriptionPart2_Hondew,
+        .stageDuration = 3,
+        .spicy = 10,
+        .dry = 10,
+        .sweet = 0,
+        .bitter = 10,
+        .sour = 0,
+        .smoothness = 20,
+    },
+    {
+        .name = NAME_GREPA_BERRY,
+        .firmness = BERRY_FIRMNESS_SOFT,
+        .size = 149,
+        .maxYield = 6,
+        .minYield = 2,
+        .description1 = gBerryDescriptionPart1_Grepa,
+        .description2 = gBerryDescriptionPart2_Grepa,
+        .stageDuration = 3,
+        .spicy = 0,
+        .dry = 10,
+        .sweet = 10,
+        .bitter = 0,
+        .sour = 10,
+        .smoothness = 20,
+    },
+    {
+        .name = NAME_TAMATO_BERRY,
+        .firmness = BERRY_FIRMNESS_SOFT,
+        .size = 200,
+        .maxYield = 4,
+        .minYield = 2,
+        .description1 = gBerryDescriptionPart1_Tamato,
+        .description2 = gBerryDescriptionPart2_Tamato,
+        .stageDuration = 6,
+        .spicy = 20,
+        .dry = 10,
+        .sweet = 0,
+        .bitter = 0,
+        .sour = 0,
+        .smoothness = 30,
+    },
+    {
+        .name = NAME_CORNN_BERRY,
+        .firmness = BERRY_FIRMNESS_HARD,
+        .size = 75,
+        .maxYield = 4,
+        .minYield = 2,
+        .description1 = gBerryDescriptionPart1_Cornn,
+        .description2 = gBerryDescriptionPart2_Cornn,
+        .stageDuration = 6,
+        .spicy = 0,
+        .dry = 20,
+        .sweet = 10,
+        .bitter = 0,
+        .sour = 0,
+        .smoothness = 30,
+    },
+    {
+        .name = NAME_MAGOST_BERRY,
+        .firmness = BERRY_FIRMNESS_HARD,
+        .size = 140,
+        .maxYield = 4,
+        .minYield = 2,
+        .description1 = gBerryDescriptionPart1_Magost,
+        .description2 = gBerryDescriptionPart2_Magost,
+        .stageDuration = 6,
+        .spicy = 0,
+        .dry = 0,
+        .sweet = 20,
+        .bitter = 10,
+        .sour = 0,
+        .smoothness = 30,
+    },
+    {
+        .name = NAME_RABUTA_BERRY,
+        .firmness = BERRY_FIRMNESS_SOFT,
+        .size = 226,
+        .maxYield = 4,
+        .minYield = 2,
+        .description1 = gBerryDescriptionPart1_Rabuta,
+        .description2 = gBerryDescriptionPart2_Rabuta,
+        .stageDuration = 6,
+        .spicy = 0,
+        .dry = 0,
+        .sweet = 0,
+        .bitter = 20,
+        .sour = 10,
+        .smoothness = 30,
+    },
+    {
+        .name = NAME_NOMEL_BERRY,
+        .firmness = BERRY_FIRMNESS_SUPER_HARD,
+        .size = 285,
+        .maxYield = 4,
+        .minYield = 2,
+        .description1 = gBerryDescriptionPart1_Nomel,
+        .description2 = gBerryDescriptionPart2_Nomel,
+        .stageDuration = 6,
+        .spicy = 10,
+        .dry = 0,
+        .sweet = 0,
+        .bitter = 0,
+        .sour = 20,
+        .smoothness = 30,
+    },
+    {
+        .name = NAME_SPELON_BERRY,
+        .firmness = BERRY_FIRMNESS_SOFT,
+        .size = 133,
+        .maxYield = 2,
+        .minYield = 1,
+        .description1 = gBerryDescriptionPart1_Spelon,
+        .description2 = gBerryDescriptionPart2_Spelon,
+        .stageDuration = 18,
+        .spicy = 40,
+        .dry = 10,
+        .sweet = 0,
+        .bitter = 0,
+        .sour = 0,
+        .smoothness = 70,
+    },
+    {
+        .name = NAME_PAMTRE_BERRY,
+        .firmness = BERRY_FIRMNESS_VERY_SOFT,
+        .size = 244,
+        .maxYield = 2,
+        .minYield = 1,
+        .description1 = gBerryDescriptionPart1_Pamtre,
+        .description2 = gBerryDescriptionPart2_Pamtre,
+        .stageDuration = 18,
+        .spicy = 0,
+        .dry = 40,
+        .sweet = 10,
+        .bitter = 0,
+        .sour = 0,
+        .smoothness = 70,
+    },
+    {
+        .name = NAME_WATMEL_BERRY,
+        .firmness = BERRY_FIRMNESS_SOFT,
+        .size = 250,
+        .maxYield = 2,
+        .minYield = 1,
+        .description1 = gBerryDescriptionPart1_Watmel,
+        .description2 = gBerryDescriptionPart2_Watmel,
+        .stageDuration = 18,
+        .spicy = 0,
+        .dry = 0,
+        .sweet = 40,
+        .bitter = 10,
+        .sour = 0,
+        .smoothness = 70,
+    },
+    {
+        .name = NAME_DURIN_BERRY,
+        .firmness = BERRY_FIRMNESS_HARD,
+        .size = 280,
+        .maxYield = 2,
+        .minYield = 1,
+        .description1 = gBerryDescriptionPart1_Durin,
+        .description2 = gBerryDescriptionPart2_Durin,
+        .stageDuration = 18,
+        .spicy = 0,
+        .dry = 0,
+        .sweet = 0,
+        .bitter = 40,
+        .sour = 10,
+        .smoothness = 70,
+    },
+    {
+        .name = NAME_BELUE_BERRY,
+        .firmness = BERRY_FIRMNESS_VERY_SOFT,
+        .size = 300,
+        .maxYield = 2,
+        .minYield = 1,
+        .description1 = gBerryDescriptionPart1_Belue,
+        .description2 = gBerryDescriptionPart2_Belue,
+        .stageDuration = 18,
+        .spicy = 10,
+        .dry = 0,
+        .sweet = 0,
+        .bitter = 0,
+        .sour = 40,
+        .smoothness = 70,
+    },
+    {
+        .name = NAME_LIECHI_BERRY,
+        .firmness = BERRY_FIRMNESS_VERY_HARD,
+        .size = 111,
+        .maxYield = 2,
+        .minYield = 1,
+        .description1 = gBerryDescriptionPart1_Liechi,
+        .description2 = gBerryDescriptionPart2_Liechi,
+        .stageDuration = 24,
+        .spicy = 40,
+        .dry = 0,
+        .sweet = 40,
+        .bitter = 0,
+        .sour = 10,
+        .smoothness = 80,
+    },
+    {
+        .name = NAME_GANLON_BERRY,
+        .firmness = BERRY_FIRMNESS_VERY_HARD,
+        .size = 33,
+        .maxYield = 2,
+        .minYield = 1,
+        .description1 = gBerryDescriptionPart1_Ganlon,
+        .description2 = gBerryDescriptionPart2_Ganlon,
+        .stageDuration = 24,
+        .spicy = 0,
+        .dry = 40,
+        .sweet = 0,
+        .bitter = 40,
+        .sour = 0,
+        .smoothness = 80,
+    },
+    {
+        .name = NAME_SALAC_BERRY,
+        .firmness = BERRY_FIRMNESS_VERY_HARD,
+        .size = 95,
+        .maxYield = 2,
+        .minYield = 1,
+        .description1 = gBerryDescriptionPart1_Salac,
+        .description2 = gBerryDescriptionPart2_Salac,
+        .stageDuration = 24,
+        .spicy = 0,
+        .dry = 0,
+        .sweet = 40,
+        .bitter = 0,
+        .sour = 40,
+        .smoothness = 80,
+    },
+    {
+        .name = NAME_PETAYA_BERRY,
+        .firmness = BERRY_FIRMNESS_VERY_HARD,
+        .size = 237,
+        .maxYield = 2,
+        .minYield = 1,
+        .description1 = gBerryDescriptionPart1_Petaya,
+        .description2 = gBerryDescriptionPart2_Petaya,
+        .stageDuration = 24,
+        .spicy = 40,
+        .dry = 0,
+        .sweet = 0,
+        .bitter = 40,
+        .sour = 0,
+        .smoothness = 80,
+    },
+    {
+        .name = NAME_APICOT_BERRY,
+        .firmness = BERRY_FIRMNESS_HARD,
+        .size = 75,
+        .maxYield = 2,
+        .minYield = 1,
+        .description1 = gBerryDescriptionPart1_Apicot,
+        .description2 = gBerryDescriptionPart2_Apicot,
+        .stageDuration = 24,
+        .spicy = 0,
+        .dry = 40,
+        .sweet = 0,
+        .bitter = 0,
+        .sour = 40,
+        .smoothness = 80,
+    },
+    {
+        .name = NAME_LANSAT_BERRY,
+        .firmness = BERRY_FIRMNESS_SOFT,
+        .size = 97,
+        .maxYield = 2,
+        .minYield = 1,
+        .description1 = gBerryDescriptionPart1_Lansat,
+        .description2 = gBerryDescriptionPart2_Lansat,
+        .stageDuration = 24,
+        .spicy = 10,
+        .dry = 10,
+        .sweet = 10,
+        .bitter = 10,
+        .sour = 10,
+        .smoothness = 30,
+    },
+    {
+        .name = NAME_STARF_BERRY,
+        .firmness = BERRY_FIRMNESS_SUPER_HARD,
+        .size = 153,
+        .maxYield = 2,
+        .minYield = 1,
+        .description1 = gBerryDescriptionPart1_Starf,
+        .description2 = gBerryDescriptionPart2_Starf,
+        .stageDuration = 24,
+        .spicy = 10,
+        .dry = 10,
+        .sweet = 10,
+        .bitter = 10,
+        .sour = 10,
+        .smoothness = 30,
+    },
+    {
+        .name = NAME_ENIGMA_BERRY,
+        .firmness = BERRY_FIRMNESS_UNKNOWN,
+        .size = 0,
+        .maxYield = 2,
+        .minYield = 1,
+        .description1 = gBerryDescriptionPart1_Enigma,
+        .description2 = gBerryDescriptionPart2_Enigma,
+        .stageDuration = 24,
+        .spicy = 40,
+        .dry = 40,
+        .sweet = 40,
+        .bitter = 40,
+        .sour = 40,
+        .smoothness = 40,
+    },
+};
+
+const struct BerryTree gBlankBerryTree = {0};
 
-extern struct Berry gBerries[];
 extern u8 BerryTreeScript;
-extern struct BerryTree gUnknown_083CD780;
 extern u16 gScriptItemId;
 extern u16 gScriptLastTalked;
 extern u16 gSpecialVar_0x8004;
 extern u16 gSpecialVar_0x8005;
 extern u16 gSpecialVar_0x8006;
 
-void unref_sub_80B4884(void)
+// unused
+void ClearEnigmaBerries(void)
 {
     CpuFill16(0, &gSaveBlock1.enigmaBerry, sizeof(gSaveBlock1.enigmaBerry));
 }
 
-// setEnigmaBerry
-void sub_80B48A8(u8 *src)
+void SetEnigmaBerry(u8 *src)
 {
-    unsigned int i;
+    u32 i;
     u8 *dest = (u8*)&gSaveBlock1.enigmaBerry;
-    
+
     for (i = 0; i < sizeof(gSaveBlock1.enigmaBerry); i++)
         dest[i] = src[i];
+
     gSaveBlock1.enigmaBerry.berry.description1 = gSaveBlock1.enigmaBerry.description1;
     gSaveBlock1.enigmaBerry.berry.description2 = gSaveBlock1.enigmaBerry.description2;
 }
 
-// checksum
-u32 sub_80B48F8(struct EnigmaBerry *enigmaBerry)
+u32 GetEnigmaBerryChecksum(struct EnigmaBerry *enigmaBerry)
 {
-    u8 *description1;
-    u8 *description2;
-    unsigned int i;
+    const u8 *description1;
+    const u8 *description2;
+    u32 i;
     u32 checksum;
     u8 *dest;
 
@@ -51,7 +1013,7 @@ u32 sub_80B48F8(struct EnigmaBerry *enigmaBerry)
 
     dest = (u8*)enigmaBerry;
     checksum = 0;
-    for (i = 0; i < ((int)&gSaveBlock1.enigmaBerry.checksum - (int)&gSaveBlock1.enigmaBerry); i++)
+    for (i = 0; i < ((u32)&gSaveBlock1.enigmaBerry.checksum - (u32)&gSaveBlock1.enigmaBerry); i++)
     {
         checksum += dest[i];
     }
@@ -62,20 +1024,20 @@ u32 sub_80B48F8(struct EnigmaBerry *enigmaBerry)
     return checksum;
 }
 
-bool32 sub_80B4940(void)
+bool32 IsEnigmaBerryValid(void)
 {
     if (!gSaveBlock1.enigmaBerry.berry.stageDuration)
         return FALSE;
     if (!gSaveBlock1.enigmaBerry.berry.maxYield)
         return FALSE;
-    if (sub_80B48F8(&gSaveBlock1.enigmaBerry) != gSaveBlock1.enigmaBerry.checksum)
+    if (GetEnigmaBerryChecksum(&gSaveBlock1.enigmaBerry) != gSaveBlock1.enigmaBerry.checksum)
         return FALSE;
     return TRUE;
 }
 
-struct Berry *GetBerryInfo(u8 berry)
+const struct Berry *GetBerryInfo(u8 berry)
 {
-    if (berry == 0x2B && sub_80B4940())
+    if (berry == 0x2B && IsEnigmaBerryValid())
         return &gSaveBlock1.enigmaBerry.berry;
     else
     {
@@ -93,7 +1055,7 @@ struct BerryTree *GetBerryTreeInfo(u8 id)
 bool32 FieldObjectInteractionWaterBerryTree(void)
 {
     struct BerryTree *tree = GetBerryTreeInfo(FieldObjectGetBerryTreeId(gSelectedMapObject));
-    
+
     switch (tree->stage)
     {
     case 1:
@@ -114,7 +1076,7 @@ bool32 FieldObjectInteractionWaterBerryTree(void)
     return TRUE;
 }
 
-bool32 IsPlayerFacingPlantedBerryTree(void)
+bool8 IsPlayerFacingPlantedBerryTree(void)
 {
     if (GetFieldObjectScriptPointerForComparison() == &BerryTreeScript
      && GetStageByBerryTreeId(FieldObjectGetBerryTreeId(gSelectedMapObject)) == 0)
@@ -123,21 +1085,21 @@ bool32 IsPlayerFacingPlantedBerryTree(void)
         return FALSE;
 }
 
-u8 WaterBerryTree(void)
+bool8 TryToWaterBerryTree(void)
 {
     if (GetFieldObjectScriptPointerForComparison() != &BerryTreeScript)
-        return 0;
+        return FALSE;
     else
         return FieldObjectInteractionWaterBerryTree();
 }
 
-void sub_80B4A90(void)
+void ClearBerryTrees(void)
 {
     int i;
     struct SaveBlock1 *saveBlock1 = &gSaveBlock1;
-    struct BerryTree berryTree = gUnknown_083CD780;
-    
-    for (i = 0; i < 128; i++)
+    struct BerryTree berryTree = gBlankBerryTree;
+
+    for (i = 0; i < (u8)ARRAY_COUNT(saveBlock1->berryTrees); i++) // casting to u8 fixes a mismatched signed compare. what
         saveBlock1->berryTrees[i] = berryTree;
 }
 
@@ -164,44 +1126,44 @@ bool32 BerryTreeGrow(struct BerryTree *tree)
         tree->berryYield = 0;
         tree->stage = 2;
         if (++tree->regrowthCount == 10)
-            *tree = gUnknown_083CD780;
+            *tree = gBlankBerryTree;
         break;
     }
     return TRUE;
 }
 
-void BerryTreeTimeUpdate(int time)
+void BerryTreeTimeUpdate(s32 minutes)
 {
     int i;
     struct BerryTree *tree;
-    
-    for (i = 0; i < 128; i++)
+
+    for (i = 0; i < (u8)ARRAY_COUNT(gSaveBlock1.berryTrees); i++)
     {
         tree = &gSaveBlock1.berryTrees[i];
 
         if (tree->berry && tree->stage && !tree->growthSparkle)
         {
-            if (time >= GetStageDurationByBerryType(tree->berry) * 71)
+            if (minutes >= GetStageDurationByBerryType(tree->berry) * 71)
             {
-                *tree = gUnknown_083CD780;
+                *tree = gBlankBerryTree;
             }
             else
             {
-                int time2 = time;
-                
-                while (time2 != 0)
+                s32 time = minutes;
+
+                while (time != 0)
                 {
-                    if (tree->secondsUntilNextStage > time2)
+                    if (tree->minutesUntilNextStage > time)
                     {
-                        tree->secondsUntilNextStage -= time2;
+                        tree->minutesUntilNextStage -= time;
                         break;
                     }
-                    time2 -= tree->secondsUntilNextStage;
-                    tree->secondsUntilNextStage = GetStageDurationByBerryType(tree->berry);
+                    time -= tree->minutesUntilNextStage;
+                    tree->minutesUntilNextStage = GetStageDurationByBerryType(tree->berry);
                     if (!BerryTreeGrow(tree))
                         break;
                     if (tree->stage == 5)
-                        tree->secondsUntilNextStage *= 4;
+                        tree->minutesUntilNextStage *= 4;
                 }
             }
         }
@@ -211,15 +1173,15 @@ void BerryTreeTimeUpdate(int time)
 void PlantBerryTree(u8 id, u8 berry, u8 stage, bool8 sparkle)
 {
     struct BerryTree *tree = GetBerryTreeInfo(id);
-    
-    *tree = gUnknown_083CD780;
+
+    *tree = gBlankBerryTree;
     tree->berry = berry;
-    tree->secondsUntilNextStage = GetStageDurationByBerryType(berry);
+    tree->minutesUntilNextStage = GetStageDurationByBerryType(berry);
     tree->stage = stage;
     if (stage == 5)
     {
         tree->berryYield = CalcBerryYield(tree);
-        tree->secondsUntilNextStage *= 4;
+        tree->minutesUntilNextStage *= 4;
     }
     if (!sparkle)
     {
@@ -229,7 +1191,7 @@ void PlantBerryTree(u8 id, u8 berry, u8 stage, bool8 sparkle)
 
 void RemoveBerryTree(u8 id)
 {
-    gSaveBlock1.berryTrees[id] = gUnknown_083CD780;
+    gSaveBlock1.berryTrees[id] = gBlankBerryTree;
 }
 
 u8 GetBerryTypeByBerryTreeId(u8 id)
@@ -245,7 +1207,7 @@ u8 GetStageByBerryTreeId(u8 id)
 u8 ItemIdToBerryType(u16 item)
 {
     u16 berry = item - FIRST_BERRY;
-    
+
     if (berry > LAST_BERRY - FIRST_BERRY)
         return 1;
     else
@@ -255,7 +1217,7 @@ u8 ItemIdToBerryType(u16 item)
 u16 BerryTypeToItemId(u16 berry)
 {
     u16 item = berry - 1;
-    
+
     if (item > LAST_BERRY - FIRST_BERRY)
         return FIRST_BERRY;
     else
@@ -264,8 +1226,8 @@ u16 BerryTypeToItemId(u16 berry)
 
 void GetBerryNameByBerryType(u8 berry, u8 *string)
 {
-    memcpy(string, GetBerryInfo(berry)->name, 6);
-    string[6] = EOS;
+    memcpy(string, GetBerryInfo(berry)->name, BERRY_NAME_LENGTH);
+    string[BERRY_NAME_LENGTH] = EOS;
 }
 
 void ResetBerryTreeSparkleFlag(u8 id)
@@ -276,7 +1238,7 @@ void ResetBerryTreeSparkleFlag(u8 id)
 u8 BerryTreeGetNumStagesWatered(struct BerryTree *tree)
 {
     u8 count = 0;
-    
+
     if (tree->watered1)
         count++;
     if (tree->watered2)
@@ -299,7 +1261,7 @@ u8 CalcBerryYieldInternal(u16 max, u16 min, u8 water)
     u32 randMax;
     u32 rand;
     u32 extraYield;
-    
+
     if (water == 0)
         return min;
     else
@@ -307,7 +1269,7 @@ u8 CalcBerryYieldInternal(u16 max, u16 min, u8 water)
         randMin = (max - min) * (water - 1);
         randMax = (max - min) * (water);
         rand = randMin + Random() % (randMax - randMin + 1);
-        
+
         if ((rand & 3) > 1)
             extraYield = rand / 4 + 1;
         else
@@ -318,10 +1280,10 @@ u8 CalcBerryYieldInternal(u16 max, u16 min, u8 water)
 
 u8 CalcBerryYield(struct BerryTree *tree)
 {
-    struct Berry *berry = GetBerryInfo(tree->berry);
+    const struct Berry *berry = GetBerryInfo(tree->berry);
     u8 min = berry->minYield;
     u8 max = berry->maxYield;
-    
+
     return CalcBerryYieldInternal(max, min, BerryTreeGetNumStagesWatered(tree));
 }
 
@@ -342,7 +1304,7 @@ void FieldObjectInteractionGetBerryTreeData(void)
     u8 unk;
     u8 group;
     u8 num;
-    
+
     id = FieldObjectGetBerryTreeId(gSelectedMapObject);
     berry = GetBerryTypeByBerryTreeId(id);
     ResetBerryTreeSparkleFlag(id);
@@ -366,7 +1328,7 @@ void sub_80B4EE4(void)
 void FieldObjectInteractionPlantBerryTree(void)
 {
     u8 berry = ItemIdToBerryType(gScriptItemId);
-    
+
     PlantBerryTree(FieldObjectGetBerryTreeId(gSelectedMapObject), berry, 1, TRUE);
     FieldObjectInteractionGetBerryTreeData();
 }
@@ -375,7 +1337,7 @@ void FieldObjectInteractionPickBerryTree(void)
 {
     u8 id = FieldObjectGetBerryTreeId(gSelectedMapObject);
     u8 berry = GetBerryTypeByBerryTreeId(id);
-    
+
     gSpecialVar_0x8004 = AddBagItem(BerryTypeToItemId(berry), GetBerryCountByBerryTreeId(id));
 }
 
@@ -387,7 +1349,7 @@ void FieldObjectInteractionRemoveBerryTree(void)
 
 u8 PlayerHasBerries(void)
 {
-    return IsBagPocketNonEmpty(4);
+    return IsBagPocketNonEmpty(BAG_BERRIES);
 }
 
 void ResetBerryTreeSparkleFlags(void)
@@ -405,7 +1367,7 @@ void ResetBerryTreeSparkleFlags(void)
     top = cam_top + 3;
     right = cam_left + 14;
     bottom = top + 8;
-    for (i = 0; i < 16; i++)
+    for (i = 0; i < (u8)ARRAY_COUNT(gSaveBlock1.mapObjects); i++)
     {
         if (gMapObjects[i].active && gMapObjects[i].animPattern == 12)
         {