From a185f8a26dc5e5a04908c272ab54bede7af8a10c Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Tue, 12 Sep 2017 16:53:04 -0500
Subject: lots more relabeling

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

(limited to 'src/field_screen_effect.c')

diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c
index 79913e1c5..c6a442f39 100644
--- a/src/field_screen_effect.c
+++ b/src/field_screen_effect.c
@@ -21,7 +21,7 @@ extern u16 gUnknown_03004DE0[][0x3C0];
 
 const static u16 gUnknown_0839ACDC[] = { 0xC8, 0x48, 0x38, 0x28, 0x18, 0x0 };
 
-const s32 gUnknown_0839ACE8 = 4;
+const s32 gMaxFlashLevel = 4;
 
 const static u32 gUnknown_0839ACEC[3] =
 {
@@ -137,11 +137,11 @@ static u8 sub_8081534(s32 a1, s32 a2, s32 a3, s32 a4, s32 a5, u8 a6)
 
 void sub_8081594(u8 a1)
 {
-    u8 index = sav1_get_flash_used_on_map();
+    u8 flashLevel = Overworld_GetFlashLevel();
     u8 value = 0;
     if (!a1)
         value = 1;
-    sub_8081534(120, 80, gUnknown_0839ACDC[index], gUnknown_0839ACDC[a1], value, 1);
+    sub_8081534(120, 80, gUnknown_0839ACDC[flashLevel], gUnknown_0839ACDC[a1], value, 1);
     sub_8081510();
     ScriptContext2_Enable();
 }
-- 
cgit v1.2.3


From 637102683c6e4d0535966ab9b213b8c93c97945c Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Tue, 12 Sep 2017 16:59:12 -0500
Subject: rename rom_4.c to overworld.c

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

(limited to 'src/field_screen_effect.c')

diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c
index c6a442f39..dedd80237 100644
--- a/src/field_screen_effect.c
+++ b/src/field_screen_effect.c
@@ -3,7 +3,7 @@
 #include "field_camera.h"
 #include "menu.h"
 #include "palette.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "script.h"
 #include "task.h"
 #include "text.h"
-- 
cgit v1.2.3


From 2c87516ca3efa260b96b92ededb24d75edfe49e8 Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Tue, 12 Sep 2017 20:23:23 -0500
Subject: more labels and fix build

---
 src/field_screen_effect.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/field_screen_effect.c')

diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c
index dedd80237..1464a99b1 100644
--- a/src/field_screen_effect.c
+++ b/src/field_screen_effect.c
@@ -23,9 +23,9 @@ const static u16 gUnknown_0839ACDC[] = { 0xC8, 0x48, 0x38, 0x28, 0x18, 0x0 };
 
 const s32 gMaxFlashLevel = 4;
 
-const static u32 gUnknown_0839ACEC[3] =
+const static struct UnknownTaskStruct gUnknown_0839ACEC =
 {
-    REG_ADDR_WIN0H,
+    (void *)REG_ADDR_WIN0H,
     ((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1,
     1
 };
@@ -220,7 +220,8 @@ static void sub_80816A8(u8 taskId)
         REG_WINOUT = 30;
         sub_8081398(&gUnknown_03004DE0[0][0], data[2], data[3], 1);
         CpuFastSet(&gUnknown_03004DE0[0], &gUnknown_03004DE0[1], 480);
-        sub_80895F8(gUnknown_0839ACEC[0], gUnknown_0839ACEC[1], gUnknown_0839ACEC[2]);
+        //sub_80895F8(gUnknown_0839ACEC[0], gUnknown_0839ACEC[1], gUnknown_0839ACEC[2]);
+        sub_80895F8(gUnknown_0839ACEC);
         data[0] = 1;
         break;
     case 1:
-- 
cgit v1.2.3