Merge remote-tracking branch 'origin/master'

Conflicts:
	Makefile

1 files changed, 17 insertions, 13 deletions

diff --git a/src/new_game.c b/src/new_game.c
index 4f93e4e3c..82a26b52b 100644
--- a/src/new_game.c
+++ b/src/new_game.c
@@ -2,17 +2,18 @@
 #include "new_game.h"
 #include "asm.h"
 #include "berry.h"
+#include "event_data.h"
+#include "lottery_corner.h"
 #include "play_time.h"
-#include "pokemon_size_record.h"
-#include "script.h"
-#include "rom4.h"
 #include "pokedex.h"
-#include "lottery_corner.h"
+#include "pokemon_size_record.h"
 #include "rng.h"
+#include "rom4.h"
 #include "rtc.h"
-#include "event_data.h"
+#include "script.h"
+#include "dewford_trend.h"
 
-extern u8 gUnknown_020297EC;
+extern u8 gDifferentSaveFile;
 
 extern u8 gPlayerPartyCount;
 extern u8 gUnknown_03005CE8;
@@ -22,8 +23,9 @@ extern u8 gUnknown_0819FA81[];
 
 const struct SB1_2EFC_Struct gUnknown_08216604 =
 {
-    {
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,
+    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,
     }
@@ -70,9 +72,10 @@ void ClearPokedexFlags(void)
 void sub_8052DA8(void)
 {
     s32 i;
+
     sub_80B2D1C();
     for (i = 0; i < 5; i++)
-        gSaveBlock1.sb1_2EFC_struct[i] = gUnknown_08216604;
+        gSaveBlock1.sbStruct.unkSB1.sb1_2EFC_struct[i] = gUnknown_08216604;
 }
 
 void sub_8052DE4(void)
@@ -94,7 +97,7 @@ void ClearSav2(void)
 
 void sub_8052E4C(void)
 {
-    gUnknown_020297EC = 0;
+    gDifferentSaveFile = 0;
     sub_808C0A0();
     ZeroPlayerPartyMons();
     ZeroEnemyPartyMons();
@@ -103,9 +106,10 @@ void sub_8052E4C(void)
 
 void NewGameInitData(void)
 {
-    if (!gSaveFileStatus || gSaveFileStatus == 2)
+    if (gSaveFileStatus == 0 || gSaveFileStatus == 2)
         RtcReset();
-    gUnknown_020297EC = 1;
+
+    gDifferentSaveFile = 1;
     ZeroPlayerPartyMons();
     ZeroEnemyPartyMons();
     sub_808C02C();
@@ -139,7 +143,7 @@ void NewGameInitData(void)
     sub_810C994();
     sub_8133F80();
     sub_80E6764();
-    sub_80F7AA4();
+    SetMauvilleOldMan();
     sub_80FA17C();
     sub_810FA54();
     ResetLotteryCorner();