diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-28 16:32:23 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-28 16:32:23 +0200 |
| commit | 14fcc9ec209a0a910dd0cf870dc835e7b7408e4c (patch) | |
| tree | 9f36acaa5a718f110f200603038b2942caabf30c /src/berry.c | |
| parent | bc3b4b4d9ae6ab59c9ce3892b7d287ebd0ee13fa (diff) | |
| parent | 3c8091393ca12b8eeb26f236a997b70eea5688c6 (diff) | |
merge with master and move to C
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) { |