diff options
author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-09-27 00:48:11 -0400 |
---|---|---|
committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-09-27 00:48:11 -0400 |
commit | 04c8eff8828c4bf60bea9832a550069f5f51ebe4 (patch) | |
tree | fd73ed82d66588405af4be2f60a5e069ea63d342 /src/berry.c | |
parent | d740eabb3c19bae406d184c6f29c81b2c5dc952f (diff) | |
parent | 3c8091393ca12b8eeb26f236a997b70eea5688c6 (diff) |
merge
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) { |