From 55bae5e8adb9418552c7bd8b75523c2c8a67052b Mon Sep 17 00:00:00 2001 From: scnorton Date: Mon, 25 Sep 2017 14:47:44 -0400 Subject: data/script_menu.s --- src/berry.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 51 insertions(+), 1 deletion(-) (limited to 'src/berry.c') diff --git a/src/berry.c b/src/berry.c index e9d6994f8..cf49d4dc4 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,57 @@ const struct Berry gBerries[] = }, }; +const struct { + u8 unk0; + u16 unk1; +} 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) { -- cgit v1.2.3 From bf9e2b7210361695a3ffdb8305c054c41ad18609 Mon Sep 17 00:00:00 2001 From: scnorton Date: Mon, 25 Sep 2017 15:03:52 -0400 Subject: split data3_a1 --- src/berry.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/berry.c') diff --git a/src/berry.c b/src/berry.c index cf49d4dc4..98cf7d932 100644 --- a/src/berry.c +++ b/src/berry.c @@ -803,10 +803,7 @@ const struct Berry gBerries[] = }, }; -const struct { - u8 unk0; - u16 unk1; -} gUnknown_0858AB24[] = { +const struct UnkStruct_0858AB24 gUnknown_0858AB24[] = { { 50, 20}, { 50, 20}, { 50, 20}, -- cgit v1.2.3