From a43d6d4a53717d26480872ed5e0c1e806170091a Mon Sep 17 00:00:00 2001
From: ProjectRevoTPP <projectrevotpp@hotmail.com>
Date: Sat, 21 Oct 2017 23:20:50 -0400
Subject: [PATCH] review changes

---
 include/menu.h               |  2 ++
 src/clear_save_data_screen.c | 27 ++++++++++++---------------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/include/menu.h b/include/menu.h
index 480ffd1cef..48dd391585 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -23,5 +23,7 @@ void reset_temp_tile_data_buffers(void);
 int decompress_and_copy_tile_data_to_vram(u8 bg_id, const void *src, int size, u16 offset, u8 mode);
 bool8 free_temp_tile_data_buffers_if_possible(void);
 u64 sub_8198A50(struct WindowTemplate*, u8, u8, u8, u8, u8, u8, u16); // returns something but it isn't used, fix when menu.s is decomp'd
+void CreateYesNoMenu(const struct WindowTemplate *windowTemplate, u16 borderFirstTileNum, u8 borderPalette, u8 initialCursorPos); // menu.s
+s8 sub_8198C58(void); // menu.s
 
 #endif // GUARD_MENU_H
diff --git a/src/clear_save_data_screen.c b/src/clear_save_data_screen.c
index 4e3b129926..3192e0e116 100755
--- a/src/clear_save_data_screen.c
+++ b/src/clear_save_data_screen.c
@@ -11,9 +11,6 @@
 #include "text_window.h"
 #include "songs.h"
 
-extern void CreateYesNoMenu(const struct WindowTemplate *windowTemplate, u16 borderFirstTileNum, u8 borderPalette, u8 initialCursorPos); // menu.s
-extern s8 sub_8198C58(void); // menu.s
-
 extern u8 gText_ClearAllSaveData[];
 extern u8 gText_ClearingData[];
 
@@ -134,17 +131,17 @@ static bool8 SetupClearSaveDataScreen(void)
         default:
             SetVBlankCallback(NULL);
             SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_MODE_0);
-            SetGpuReg(REG_OFFSET_BG0HOFS, DISPCNT_MODE_0);
-            SetGpuReg(REG_OFFSET_BG0VOFS, DISPCNT_MODE_0);
-            SetGpuReg(REG_OFFSET_BG3HOFS, DISPCNT_MODE_0);
-            SetGpuReg(REG_OFFSET_BG3VOFS, DISPCNT_MODE_0);
-            SetGpuReg(REG_OFFSET_WIN0H, DISPCNT_MODE_0);
-            SetGpuReg(REG_OFFSET_WIN0V, DISPCNT_MODE_0);
-            SetGpuReg(REG_OFFSET_WININ, DISPCNT_MODE_0);
-            SetGpuReg(REG_OFFSET_WINOUT, DISPCNT_MODE_0);
-            SetGpuReg(REG_OFFSET_BLDCNT, DISPCNT_MODE_0);
-            SetGpuReg(REG_OFFSET_BLDALPHA, DISPCNT_MODE_0);
-            SetGpuReg(REG_OFFSET_BLDY, DISPCNT_MODE_0);
+            SetGpuReg(REG_OFFSET_BG0HOFS, 0);
+            SetGpuReg(REG_OFFSET_BG0VOFS, 0);
+            SetGpuReg(REG_OFFSET_BG3HOFS, 0);
+            SetGpuReg(REG_OFFSET_BG3VOFS, 0);
+            SetGpuReg(REG_OFFSET_WIN0H, 0);
+            SetGpuReg(REG_OFFSET_WIN0V, 0);
+            SetGpuReg(REG_OFFSET_WININ, 0);
+            SetGpuReg(REG_OFFSET_WINOUT, 0);
+            SetGpuReg(REG_OFFSET_BLDCNT, 0);
+            SetGpuReg(REG_OFFSET_BLDALPHA, 0);
+            SetGpuReg(REG_OFFSET_BLDY, 0);
             DmaFill16(3, 0, (void *)VRAM, VRAM_SIZE);
             DmaFill32(3, 0, (void *)OAM, OAM_SIZE);
             DmaFill16(3, 0, (void *)(PLTT + 2), PLTT_SIZE - 2);
@@ -165,7 +162,7 @@ static bool8 SetupClearSaveDataScreen(void)
             SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP);
             ShowBg(0);
             ShowBg(3);
-            SetGpuReg(REG_OFFSET_BLDCNT, DISPCNT_MODE_0);
+            SetGpuReg(REG_OFFSET_BLDCNT, 0);
             InitClearSaveDataScreenWindows();
             BeginNormalPaletteFade(0x0000FFFF, 0, 0x10, 0, 0xFFFF);
             EnableInterrupts(1);