fix merge conflicts

1 files changed, 13 insertions, 1 deletions

diff --git a/src/new_game.c b/src/new_game.c
index 12e04a4ef..33aacd10a 100644
--- a/src/new_game.c
+++ b/src/new_game.c
@@ -1,18 +1,30 @@
 #include "global.h"
 #include "new_game.h"
-#include "asm.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"
 #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;