From 1ef1142628279a6a931cade6c8e9a89112d82024 Mon Sep 17 00:00:00 2001
From: YamaArashi <shadow962@live.com>
Date: Tue, 20 Dec 2016 02:59:46 -0800
Subject: split out more data

---
 src/new_game.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'src/new_game.c')

diff --git a/src/new_game.c b/src/new_game.c
index d63e50236..fa1894086 100644
--- a/src/new_game.c
+++ b/src/new_game.c
@@ -18,7 +18,15 @@ extern u8 gUnknown_03005CE8;
 extern u16 gSaveFileStatus;
 
 extern u8 gUnknown_0819FA81[];
-extern const struct SB1_2EFC_Struct gUnknown_08216604;
+
+const struct SB1_2EFC_Struct gUnknown_08216604 =
+{
+    {
+        0x00, 0x00, 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,
+    }
+};
 
 void write_word_to_mem(u32 a1, u8 *a2)
 {
-- 
cgit v1.2.3


From 145e90483b2a30698f917f62e585aa7fa4794588 Mon Sep 17 00:00:00 2001
From: YamaArashi <shadow962@live.com>
Date: Mon, 2 Jan 2017 00:41:28 -0800
Subject: event_data.c

---
 src/new_game.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/new_game.c')

diff --git a/src/new_game.c b/src/new_game.c
index fa1894086..00797806e 100644
--- a/src/new_game.c
+++ b/src/new_game.c
@@ -10,6 +10,7 @@
 #include "lottery_corner.h"
 #include "rng.h"
 #include "rtc.h"
+#include "event_data.h"
 
 extern u8 gUnknown_020297EC;
 
@@ -114,7 +115,7 @@ void NewGameInitData(void)
     set_player_trainer_id();
     PlayTimeCounter_Reset();
     sub_8052D78();
-    sub_8069030();
+    InitEventData();
     sub_80BD7A8();
     sub_80BDAB4();
     sub_80BB5B4();
-- 
cgit v1.2.3


From 98062c69d613fb1b9e2345924dd34d0bbdcfcc90 Mon Sep 17 00:00:00 2001
From: ProjectRevoTPP <projectrevotpp@hotmail.com>
Date: Mon, 2 Jan 2017 04:27:51 -0500
Subject: label and document berry.c, decompress.c, item_use.c and label
 gBattleTypeFlags (#146)

* make ROM match again

* clean up item_use.c labels and clarify functions.

* label and clarify some functions in decompress.c

* label and clarify berry.c

* rename 20239F8 to gBattleTypeFlags

* formatting
---
 src/new_game.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/new_game.c')

diff --git a/src/new_game.c b/src/new_game.c
index 00797806e..1ffb9c11d 100644
--- a/src/new_game.c
+++ b/src/new_game.c
@@ -119,7 +119,7 @@ void NewGameInitData(void)
     sub_80BD7A8();
     sub_80BDAB4();
     sub_80BB5B4();
-    sub_80B4A90();
+    ClearBerryTrees();
     gSaveBlock1.money = 3000;
     sub_80AB1B0();
     sub_80530AC();
-- 
cgit v1.2.3


From 370c7f78539698902907f262721fe60e606c774d Mon Sep 17 00:00:00 2001
From: ProjectRevoTPP <projectrevotpp@hotmail.com>
Date: Wed, 4 Jan 2017 17:31:44 -0500
Subject: more labels (#159)

* labels for tv.c and tv.s

* match function prologue a little bit better

* whoops

* label and document lottery_corner.c

* gSoftResetDisabled

* add labels for main_menu.c

* labels for metatile_behavior.c
---
 src/new_game.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/new_game.c')

diff --git a/src/new_game.c b/src/new_game.c
index 1ffb9c11d..aced10a47 100644
--- a/src/new_game.c
+++ b/src/new_game.c
@@ -141,7 +141,7 @@ void NewGameInitData(void)
     sub_80F7AA4();
     sub_80FA17C();
     sub_810FA54();
-    sub_8145A78();
+    ResetLotteryCorner();
     sub_8052E04();
     ScriptContext2_RunNewScript(gUnknown_0819FA81);
 }
-- 
cgit v1.2.3


From 94fb9ab2a9ed111c72a80693d8f29ea4bc531898 Mon Sep 17 00:00:00 2001
From: ProjectRevoTPP <projectrevotpp@hotmail.com>
Date: Thu, 5 Jan 2017 22:50:45 -0500
Subject: more labels (#165)

* more labels and match sub_810745C

* formatting

* move BattleStruct to battle.h and combine both loose structs

* oops

* more labels for rom4.c
---
 src/new_game.c | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

(limited to 'src/new_game.c')

diff --git a/src/new_game.c b/src/new_game.c
index aced10a47..4f93e4e3c 100644
--- a/src/new_game.c
+++ b/src/new_game.c
@@ -29,19 +29,19 @@ const struct SB1_2EFC_Struct gUnknown_08216604 =
     }
 };
 
-void write_word_to_mem(u32 a1, u8 *a2)
+void write_word_to_mem(u32 var, u8 *dataPtr)
 {
-    a2[0] = a1;
-    a2[1] = a1 >> 8;
-    a2[2] = a1 >> 16;
-    a2[3] = a1 >> 24;
+    dataPtr[0] = var;
+    dataPtr[1] = var >> 8;
+    dataPtr[2] = var >> 16;
+    dataPtr[3] = var >> 24;
 }
 
-void sub_8052D10(u8 *a1, u8 *a2)
+void copy_word_to_mem(u8 *copyTo, u8 *copyFrom)
 {
     s32 i;
     for (i = 0; i < 4; i++)
-        a1[i] = a2[i];
+        copyTo[i] = copyFrom[i];
 }
 
 void set_player_trainer_id(void)
@@ -49,6 +49,7 @@ void set_player_trainer_id(void)
     write_word_to_mem((Random() << 16) | Random(), gSaveBlock2.playerTrainerId);
 }
 
+// L=A isnt set here for some reason.
 void SetDefaultOptions(void)
 {
     gSaveBlock2.optionsTextSpeed = OPTIONS_TEXT_SPEED_MID;
@@ -59,7 +60,7 @@ void SetDefaultOptions(void)
     gSaveBlock2.regionMapZoom = FALSE;
 }
 
-void sub_8052D78(void)
+void ClearPokedexFlags(void)
 {
     gUnknown_03005CE8 = 0;
     memset(&gSaveBlock2.pokedex.owned, 0, sizeof(gSaveBlock2.pokedex.owned));
@@ -79,7 +80,7 @@ void sub_8052DE4(void)
     CpuFill32(0, &gSaveBlock2.filler_A8, sizeof(gSaveBlock2.filler_A8));
 }
 
-void sub_8052E04(void)
+void WarpToTruck(void)
 {
     warp1_set(25, 40, -1, -1, -1); // inside of truck
     warp_in();
@@ -114,7 +115,7 @@ void NewGameInitData(void)
     gSaveBlock2.specialSaveWarp = 0;
     set_player_trainer_id();
     PlayTimeCounter_Reset();
-    sub_8052D78();
+    ClearPokedexFlags();
     InitEventData();
     sub_80BD7A8();
     sub_80BDAB4();
@@ -122,7 +123,7 @@ void NewGameInitData(void)
     ClearBerryTrees();
     gSaveBlock1.money = 3000;
     sub_80AB1B0();
-    sub_80530AC();
+    ResetGameStats();
     sub_8052DA8();
     InitLinkBattleRecords();
     InitShroomishSizeRecord();
@@ -142,6 +143,6 @@ void NewGameInitData(void)
     sub_80FA17C();
     sub_810FA54();
     ResetLotteryCorner();
-    sub_8052E04();
+    WarpToTruck();
     ScriptContext2_RunNewScript(gUnknown_0819FA81);
 }
-- 
cgit v1.2.3


From c9722602cb47eb5b6ecbccddf13df5f286a8ef7b Mon Sep 17 00:00:00 2001
From: Marijn van der Werf <marijn.vanderwerf@gmail.com>
Date: Tue, 17 Jan 2017 14:13:04 +0100
Subject: Sort includes

---
 src/new_game.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/new_game.c')

diff --git a/src/new_game.c b/src/new_game.c
index 4f93e4e3c..ddc9ea403 100644
--- a/src/new_game.c
+++ b/src/new_game.c
@@ -2,15 +2,15 @@
 #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"
 
 extern u8 gUnknown_020297EC;
 
-- 
cgit v1.2.3


From 9813caaf5345ea28f8230d41461618673779c2fb Mon Sep 17 00:00:00 2001
From: ProjectRevoTPP <projectrevotpp@hotmail.com>
Date: Tue, 31 Jan 2017 03:08:44 -0500
Subject: make ROM match again (#227)

* some labels and enumerate player speeds

* clear up speed enums

* GetPlayerSpeed

* oops

* start decompiling mauville_old_man.c

* formatting

* decompile more of mauville_old_man.c

* someone fix this please

* formatting

* make ROM build again

* formatting again

* make ROM match again
---
 src/new_game.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/new_game.c')

diff --git a/src/new_game.c b/src/new_game.c
index ddc9ea403..99c7839eb 100644
--- a/src/new_game.c
+++ b/src/new_game.c
@@ -70,6 +70,7 @@ void ClearPokedexFlags(void)
 void sub_8052DA8(void)
 {
     s32 i;
+
     sub_80B2D1C();
     for (i = 0; i < 5; i++)
         gSaveBlock1.sb1_2EFC_struct[i] = gUnknown_08216604;
@@ -139,7 +140,7 @@ void NewGameInitData(void)
     sub_810C994();
     sub_8133F80();
     sub_80E6764();
-    sub_80F7AA4();
+    SetMauvilleOldMan();
     sub_80FA17C();
     sub_810FA54();
     ResetLotteryCorner();
-- 
cgit v1.2.3


From 6035511c139549a0291b6b3d43b9b080f792b2b6 Mon Sep 17 00:00:00 2001
From: ProjectRevoTPP <projectrevotpp@hotmail.com>
Date: Sat, 18 Mar 2017 04:00:15 +0100
Subject: reorganize and add new headers for many files

---
 src/new_game.c | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'src/new_game.c')

diff --git a/src/new_game.c b/src/new_game.c
index 99c7839eb..82a26b52b 100644
--- a/src/new_game.c
+++ b/src/new_game.c
@@ -11,8 +11,9 @@
 #include "rom4.h"
 #include "rtc.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,
     }
@@ -73,7 +75,7 @@ void sub_8052DA8(void)
 
     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)
@@ -95,7 +97,7 @@ void ClearSav2(void)
 
 void sub_8052E4C(void)
 {
-    gUnknown_020297EC = 0;
+    gDifferentSaveFile = 0;
     sub_808C0A0();
     ZeroPlayerPartyMons();
     ZeroEnemyPartyMons();
@@ -104,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();
-- 
cgit v1.2.3


From ddc846fa6a0d9a13cfba6f52488a66f6f4562a2d Mon Sep 17 00:00:00 2001
From: Marijn van der Werf <marijn.vanderwerf@gmail.com>
Date: Thu, 27 Apr 2017 15:43:31 +0200
Subject: Sort includes

---
 src/new_game.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/new_game.c')

diff --git a/src/new_game.c b/src/new_game.c
index 82a26b52b..fc8272f18 100644
--- a/src/new_game.c
+++ b/src/new_game.c
@@ -2,6 +2,7 @@
 #include "new_game.h"
 #include "asm.h"
 #include "berry.h"
+#include "dewford_trend.h"
 #include "event_data.h"
 #include "lottery_corner.h"
 #include "play_time.h"
@@ -11,7 +12,6 @@
 #include "rom4.h"
 #include "rtc.h"
 #include "script.h"
-#include "dewford_trend.h"
 
 extern u8 gDifferentSaveFile;
 
-- 
cgit v1.2.3


From 6b5f5b95bdac53ab4abd93302897d02118738561 Mon Sep 17 00:00:00 2001
From: Marijn van der Werf <marijn.vanderwerf@gmail.com>
Date: Fri, 5 May 2017 16:21:11 +0200
Subject: Convert tabs to spaces

---
 src/new_game.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/new_game.c')

diff --git a/src/new_game.c b/src/new_game.c
index fc8272f18..e058280af 100644
--- a/src/new_game.c
+++ b/src/new_game.c
@@ -24,7 +24,7 @@ extern u8 gUnknown_0819FA81[];
 const struct SB1_2EFC_Struct gUnknown_08216604 =
 {
     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,
-- 
cgit v1.2.3


From e6868bbdb2b9a0f00085029817d3a451781973cd Mon Sep 17 00:00:00 2001
From: YamaArashi <shadow962@live.com>
Date: Mon, 8 May 2017 13:55:31 -0700
Subject: decompile roamer.s

---
 src/new_game.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/new_game.c')

diff --git a/src/new_game.c b/src/new_game.c
index e058280af..3b93d37cc 100644
--- a/src/new_game.c
+++ b/src/new_game.c
@@ -9,6 +9,7 @@
 #include "pokedex.h"
 #include "pokemon_size_record.h"
 #include "rng.h"
+#include "roamer.h"
 #include "rom4.h"
 #include "rtc.h"
 #include "script.h"
@@ -135,8 +136,8 @@ void NewGameInitData(void)
     gPlayerPartyCount = 0;
     ZeroPlayerPartyMons();
     sub_80961D8();
-    sub_81341F8();
-    sub_813420C();
+    ClearRoamerData();
+    ClearRoamerLocationData();
     gSaveBlock1.registeredItem = 0;
     sub_80A3714();
     NewGameInitPCItems();
-- 
cgit v1.2.3


From 964b665d2a17295ae3a06be0439ef6ae5ccc3444 Mon Sep 17 00:00:00 2001
From: YamaArashi <shadow962@live.com>
Date: Tue, 9 May 2017 00:24:51 -0700
Subject: name mail_data.c functions

---
 src/new_game.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/new_game.c')

diff --git a/src/new_game.c b/src/new_game.c
index 3b93d37cc..ca53ff15f 100644
--- a/src/new_game.c
+++ b/src/new_game.c
@@ -116,7 +116,7 @@ void NewGameInitData(void)
     sub_808C02C();
     sub_8052DE4();
     memset(&gSaveBlock1, 0, sizeof(gSaveBlock1));
-    sub_80A2B18();
+    ClearMailData();
     gSaveBlock2.specialSaveWarp = 0;
     set_player_trainer_id();
     PlayTimeCounter_Reset();
-- 
cgit v1.2.3


From 60cf06cccacb692bbd2270b08ad0d583a8a76090 Mon Sep 17 00:00:00 2001
From: YamaArashi <shadow962@live.com>
Date: Tue, 9 May 2017 01:12:59 -0700
Subject: name new-game functions

---
 src/new_game.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'src/new_game.c')

diff --git a/src/new_game.c b/src/new_game.c
index ca53ff15f..8fa946748 100644
--- a/src/new_game.c
+++ b/src/new_game.c
@@ -47,7 +47,7 @@ void copy_word_to_mem(u8 *copyTo, u8 *copyFrom)
         copyTo[i] = copyFrom[i];
 }
 
-void set_player_trainer_id(void)
+void InitPlayerTrainerId(void)
 {
     write_word_to_mem((Random() << 16) | Random(), gSaveBlock2.playerTrainerId);
 }
@@ -113,21 +113,21 @@ void NewGameInitData(void)
     gDifferentSaveFile = 1;
     ZeroPlayerPartyMons();
     ZeroEnemyPartyMons();
-    sub_808C02C();
+    ResetPokedex();
     sub_8052DE4();
     memset(&gSaveBlock1, 0, sizeof(gSaveBlock1));
     ClearMailData();
     gSaveBlock2.specialSaveWarp = 0;
-    set_player_trainer_id();
+    InitPlayerTrainerId();
     PlayTimeCounter_Reset();
     ClearPokedexFlags();
     InitEventData();
-    sub_80BD7A8();
-    sub_80BDAB4();
-    sub_80BB5B4();
+    ClearTVShowData();
+    ResetGabbyAndTy();
+    ResetSecretBases();
     ClearBerryTrees();
     gSaveBlock1.money = 3000;
-    sub_80AB1B0();
+    ResetLinkContestBoolean();
     ResetGameStats();
     sub_8052DA8();
     InitLinkBattleRecords();
@@ -135,18 +135,18 @@ void NewGameInitData(void)
     InitBarboachSizeRecord();
     gPlayerPartyCount = 0;
     ZeroPlayerPartyMons();
-    sub_80961D8();
+    ResetPokemonStorageSystem();
     ClearRoamerData();
     ClearRoamerLocationData();
     gSaveBlock1.registeredItem = 0;
-    sub_80A3714();
+    ClearItems();
     NewGameInitPCItems();
     sub_810C994();
     sub_8133F80();
-    sub_80E6764();
+    InitEasyChatPhrases();
     SetMauvilleOldMan();
-    sub_80FA17C();
-    sub_810FA54();
+    InitDewfordTrends();
+    ResetFanClub();
     ResetLotteryCorner();
     WarpToTruck();
     ScriptContext2_RunNewScript(gUnknown_0819FA81);
-- 
cgit v1.2.3


From 3ee2e8ce97c33eb9bc837779c8a46b546d805367 Mon Sep 17 00:00:00 2001
From: YamaArashi <shadow962@live.com>
Date: Tue, 9 May 2017 01:56:49 -0700
Subject: name more functions

---
 src/new_game.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/new_game.c')

diff --git a/src/new_game.c b/src/new_game.c
index 8fa946748..6d2722c44 100644
--- a/src/new_game.c
+++ b/src/new_game.c
@@ -139,10 +139,10 @@ void NewGameInitData(void)
     ClearRoamerData();
     ClearRoamerLocationData();
     gSaveBlock1.registeredItem = 0;
-    ClearItems();
+    ClearBag();
     NewGameInitPCItems();
-    sub_810C994();
-    sub_8133F80();
+    ClearPokeblocks();
+    ClearDecorationInventories();
     InitEasyChatPhrases();
     SetMauvilleOldMan();
     InitDewfordTrends();
-- 
cgit v1.2.3


From b7efd72ac411800d709082dab220470544541c90 Mon Sep 17 00:00:00 2001
From: YamaArashi <shadow962@live.com>
Date: Tue, 9 May 2017 19:33:43 -0700
Subject: name daily event functions

---
 src/new_game.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/new_game.c')

diff --git a/src/new_game.c b/src/new_game.c
index 6d2722c44..12e04a4ef 100644
--- a/src/new_game.c
+++ b/src/new_game.c
@@ -145,7 +145,7 @@ void NewGameInitData(void)
     ClearDecorationInventories();
     InitEasyChatPhrases();
     SetMauvilleOldMan();
-    InitDewfordTrends();
+    InitDewfordTrend();
     ResetFanClub();
     ResetLotteryCorner();
     WarpToTruck();
-- 
cgit v1.2.3


From 4d2b22a899c11dfcacfec6889968ab01655a3fe3 Mon Sep 17 00:00:00 2001
From: Marijn van der Werf <marijn.vanderwerf@gmail.com>
Date: Fri, 26 May 2017 14:53:51 +0200
Subject: Add headers

---
 src/new_game.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'src/new_game.c')

diff --git a/src/new_game.c b/src/new_game.c
index 12e04a4ef..a1f949fdd 100644
--- a/src/new_game.c
+++ b/src/new_game.c
@@ -1,6 +1,18 @@
+#include "item_menu.h"
+#include "mail_data.h"
+#include "tv.h"
+#include "secret_base.h"
+#include "contest.h"
+#include "battle_records.h"
+#include "pokemon_storage_system.h"
+#include "player_pc.h"
+#include "decoration_inventory.h"
+#include "pokeblock.h.h"
+#include "mauville_old_man.h"
+#include "easy_chat.h"
+#include "field_specials.h"
 #include "global.h"
 #include "new_game.h"
-#include "asm.h"
 #include "berry.h"
 #include "dewford_trend.h"
 #include "event_data.h"
-- 
cgit v1.2.3


From f26daa3d6954d2db3a7c44b79d319a7a084462c2 Mon Sep 17 00:00:00 2001
From: Marijn van der Werf <marijn.vanderwerf@gmail.com>
Date: Fri, 26 May 2017 15:01:42 +0200
Subject: Sort includes

---
 src/new_game.c | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'src/new_game.c')

diff --git a/src/new_game.c b/src/new_game.c
index a1f949fdd..d22babb4a 100644
--- a/src/new_game.c
+++ b/src/new_game.c
@@ -1,30 +1,30 @@
-#include "item_menu.h"
-#include "mail_data.h"
-#include "tv.h"
-#include "secret_base.h"
-#include "contest.h"
-#include "battle_records.h"
-#include "pokemon_storage_system.h"
-#include "player_pc.h"
-#include "decoration_inventory.h"
-#include "pokeblock.h.h"
-#include "mauville_old_man.h"
-#include "easy_chat.h"
-#include "field_specials.h"
 #include "global.h"
 #include "new_game.h"
+#include "battle_records.h"
 #include "berry.h"
+#include "contest.h"
+#include "decoration_inventory.h"
 #include "dewford_trend.h"
+#include "easy_chat.h"
 #include "event_data.h"
+#include "field_specials.h"
+#include "item_menu.h"
 #include "lottery_corner.h"
+#include "mail_data.h"
+#include "mauville_old_man.h"
 #include "play_time.h"
+#include "player_pc.h"
+#include "pokeblock.h.h"
 #include "pokedex.h"
 #include "pokemon_size_record.h"
+#include "pokemon_storage_system.h"
 #include "rng.h"
 #include "roamer.h"
 #include "rom4.h"
 #include "rtc.h"
 #include "script.h"
+#include "secret_base.h"
+#include "tv.h"
 
 extern u8 gDifferentSaveFile;
 
-- 
cgit v1.2.3


From 93da3ddcd3ee11ffe25b194770cec7225db868cc Mon Sep 17 00:00:00 2001
From: Marijn van der Werf <marijn.vanderwerf@gmail.com>
Date: Fri, 26 May 2017 17:43:18 +0200
Subject: Rename pokeblock.h.h

---
 src/new_game.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/new_game.c')

diff --git a/src/new_game.c b/src/new_game.c
index d22babb4a..33aacd10a 100644
--- a/src/new_game.c
+++ b/src/new_game.c
@@ -14,7 +14,7 @@
 #include "mauville_old_man.h"
 #include "play_time.h"
 #include "player_pc.h"
-#include "pokeblock.h.h"
+#include "pokeblock.h"
 #include "pokedex.h"
 #include "pokemon_size_record.h"
 #include "pokemon_storage_system.h"
-- 
cgit v1.2.3