diff options
| author | scnorton <scnorton@biociphers.org> | 2017-09-26 18:24:39 -0400 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2017-09-26 18:24:39 -0400 |
| commit | d160ca467920d97245c012b8dd0cb8be6d06620a (patch) | |
| tree | 294fa7011b22853896dc622d291b0a5be08a752a /src/berry.c | |
| parent | 0e75d957d675564977b2e442c16822bab390aa2c (diff) | |
| parent | 3c8091393ca12b8eeb26f236a997b70eea5688c6 (diff) | |
Merge branch 'master' into easy_chat
Diffstat (limited to 'src/berry.c')
| -rw-r--r-- | src/berry.c | 49 |
1 files changed, 48 insertions, 1 deletions
diff --git a/src/berry.c b/src/berry.c index e9d6994f8..98cf7d932 100644 --- a/src/berry.c +++ b/src/berry.c @@ -17,7 +17,6 @@ extern bool8 sub_8092E9C(u8, u8, u8); extern u16 gScriptItemId; extern const u8 BerryTreeScript[]; -extern const struct BerryTree gBlankBerryTree; #define BERRY_NAME_LENGTH 6 @@ -804,6 +803,54 @@ const struct Berry gBerries[] = }, }; +const struct UnkStruct_0858AB24 gUnknown_0858AB24[] = { + { 50, 20}, + { 50, 20}, + { 50, 20}, + { 50, 20}, + { 50, 20}, + { 50, 30}, + { 50, 30}, + { 50, 30}, + { 50, 30}, + { 50, 30}, + { 60, 50}, + { 60, 50}, + { 60, 50}, + { 60, 50}, + { 60, 50}, + { 80, 70}, + { 80, 70}, + { 80, 70}, + { 80, 70}, + { 80, 70}, + {100, 100}, + {100, 100}, + {100, 100}, + {100, 100}, + {100, 100}, + {130, 150}, + {130, 150}, + {130, 150}, + {130, 150}, + {130, 150}, + {160, 250}, + {160, 250}, + {160, 250}, + {160, 250}, + {160, 250}, + {180, 500}, + {180, 500}, + {180, 500}, + {180, 500}, + {180, 500}, + {200, 750}, + {200, 750}, + {150, 200} +}; + +const struct BerryTree gBlankBerryTree = {}; + // unused void ClearEnigmaBerries(void) { |