merge

3 files changed, 56 insertions, 6 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)
 {
diff --git a/src/berry_fix_program.c b/src/berry_fix_program.c
index f04308ae8..eca20af9d 100644
--- a/src/berry_fix_program.c
+++ b/src/berry_fix_program.c
@@ -129,8 +129,7 @@ static const u8 *const gUnknown_08618178[][3] = {
     },
 };
 
-extern const u8 gUnknown_089A6550[0xC0];
-extern const u8 gMultiBootProgram_BerryGlitchFix_Start[0x3b34];
+extern const u8 gMultiBootProgram_BerryGlitchFix_Start[0x3BF4];
 extern const u8 gMultiBootProgram_BerryGlitchFix_End[];
 
 // .text
@@ -174,7 +173,7 @@ static void berry_fix_main(void)
         case 3:
             if (berry_fix_text_update(1) == 1)
             {
-                berry_fix_mb_manager->mb.masterp = gUnknown_089A6550;
+                berry_fix_mb_manager->mb.masterp = gMultiBootProgram_BerryGlitchFix_Start;
                 berry_fix_mb_manager->mb.server_type = 0;
                 MultiBootInit(&berry_fix_mb_manager->mb);
                 berry_fix_mb_manager->unk2 = 0;
@@ -189,7 +188,7 @@ static void berry_fix_main(void)
             }
             else if (++ berry_fix_mb_manager->unk2 > 180)
             {
-                MultiBootStartMaster(&berry_fix_mb_manager->mb, gMultiBootProgram_BerryGlitchFix_Start, (u32)(gMultiBootProgram_BerryGlitchFix_End - gMultiBootProgram_BerryGlitchFix_Start), 4, 1);
+                MultiBootStartMaster(&berry_fix_mb_manager->mb, gMultiBootProgram_BerryGlitchFix_Start + ROM_HEADER_SIZE, (u32)(gMultiBootProgram_BerryGlitchFix_End - (gMultiBootProgram_BerryGlitchFix_Start + ROM_HEADER_SIZE)), 4, 1);
                 berry_fix_mb_manager->state = 5;
             }
             break;
diff --git a/src/new_game.c b/src/new_game.c
index 2bf774c69..5a482c593 100644
--- a/src/new_game.c
+++ b/src/new_game.c
@@ -18,6 +18,7 @@
 #include "event_data.h"
 #include "money.h"
 #include "coins.h"
+#include "text.h"
 
 extern u8 gPlayerPartyCount;
 extern u8 gDifferentSaveFile;
@@ -104,7 +105,10 @@ void ClearPokedexFlags(void)
     memset(&gSaveBlock2Ptr->pokedex.seen, 0, sizeof(gSaveBlock2Ptr->pokedex.seen));
 }
 
-extern const struct ContestWinner gContestWinnerPicDummy;
+const struct ContestWinner gContestWinnerPicDummy = {
+    .monName = _(""),
+    .trainerName = _("")
+};
 
 void ClearAllContestWinnerPics(void)
 {