Merge branch 'master' into decompile_data

2 files changed, 14 insertions, 17 deletions

diff --git a/src/scene/berry_blender.c b/src/scene/berry_blender.c
index 47ed314a8..d147d11ce 100644
--- a/src/scene/berry_blender.c
+++ b/src/scene/berry_blender.c
@@ -208,7 +208,7 @@ extern void de_sub_8073110();
 
 extern struct MusicPlayerInfo gMPlay_SE2;
 extern struct MusicPlayerInfo gMPlay_BGM;
-extern u16 gScriptItemId;
+extern u16 gSpecialVar_ItemId;
 extern u8 gUnknown_020297ED;
 extern u8 byte_3002A68;
 
@@ -1192,7 +1192,7 @@ static void sub_804E9F8(void)
     case 8:
         gBerryBlenderData->field_0++;
         gBerryBlenderData->field_13C = 0;
-        Blender_CopyBerryData(&gBerryBlenderData->blendedBerries[0], gScriptItemId);
+        Blender_CopyBerryData(&gBerryBlenderData->blendedBerries[0], gSpecialVar_ItemId);
         memcpy(gBlockSendBuffer, &gBerryBlenderData->blendedBerries[0], sizeof(struct BlenderBerry));
         sub_80084A4();
         gBerryBlenderData->framesToWait = 0;
@@ -1438,9 +1438,9 @@ static void sub_804F378(void)
     {
     case 0:
         sub_804F0F4();
-        Blender_SetBankBerryData(0, gScriptItemId);
-        Blender_CopyBerryData(&gBerryBlenderData->blendedBerries[0], gScriptItemId);
-        sub_804F1BC(gScriptItemId, gBerryBlenderData->playersNo, &gBerryBlenderData->blendedBerries[0]);
+        Blender_SetBankBerryData(0, gSpecialVar_ItemId);
+        Blender_CopyBerryData(&gBerryBlenderData->blendedBerries[0], gSpecialVar_ItemId);
+        sub_804F1BC(gSpecialVar_ItemId, gBerryBlenderData->playersNo, &gBerryBlenderData->blendedBerries[0]);
         for (i = 0; i < BLENDER_MAX_PLAYERS; i++)
         {
             gBerryBlenderData->field_70[i] = 0;
@@ -3431,7 +3431,7 @@ static bool8 Blender_PrintBlendingResults(void)
         Blender_PrintMadePokeblockString(&pokeblock, gBerryBlenderData->stringVar);
         CreateTask(sub_8052BD0, 6);
         MenuPrintMessage(gBerryBlenderData->stringVar, 1, 15);
-        RemoveBagItem(gScriptItemId, 1);
+        RemoveBagItem(gSpecialVar_ItemId, 1);
         sub_810CA34(&pokeblock);
         gBerryBlenderData->field_0++;
         break;
diff --git a/src/scene/new_game.c b/src/scene/new_game.c
index ee042a0de..0279f99c6 100644
--- a/src/scene/new_game.c
+++ b/src/scene/new_game.c
@@ -24,6 +24,7 @@
 #include "rtc.h"
 #include "script.h"
 #include "secret_base.h"
+#include "text.h"
 #include "tv.h"
 
 EWRAM_DATA u8 gDifferentSaveFile = 0;
@@ -35,14 +36,10 @@ extern u16 gSaveFileStatus;
 
 extern u8 gUnknown_0819FA81[];
 
-const struct SB1_2EFC_Struct gUnknown_08216604 =
+static const struct ContestWinner sEmptyMuseumPortrait =
 {
-    0x0000,
-    {
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    }
+    .nickname = {EOS},
+    .trainerName = {EOS},
 };
 
 void write_word_to_mem(u32 var, u8 *dataPtr)
@@ -83,13 +80,13 @@ void ClearPokedexFlags(void)
     memset(&gSaveBlock2.pokedex.seen, 0, sizeof(gSaveBlock2.pokedex.seen));
 }
 
-void sub_8052DA8(void)
+void ResetContestAndMuseumWinners(void)
 {
     s32 i;
 
-    sub_80B2D1C();
+    Contest_ResetWinners();
     for (i = 0; i < 5; i++)
-        gSaveBlock1.sbStruct.unkSB1.sb1_2EFC_struct[i] = gUnknown_08216604;
+        gSaveBlock1.museumPortraits[i] = sEmptyMuseumPortrait;
 }
 
 void ZeroBattleTowerData(void)
@@ -142,7 +139,7 @@ void NewGameInitData(void)
     gSaveBlock1.money = 3000;
     ResetLinkContestBoolean();
     ResetGameStats();
-    sub_8052DA8();
+    ResetContestAndMuseumWinners();
     InitLinkBattleRecords();
     InitShroomishSizeRecord();
     InitBarboachSizeRecord();