From 0a060ae254c48f7cbee99974b1c7bffd378d9c38 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sun, 29 Oct 2017 10:38:25 -0400
Subject: Start decompiling field_region_map

---
 src/field_region_map.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 84 insertions(+)
 create mode 100644 src/field_region_map.c

(limited to 'src/field_region_map.c')

diff --git a/src/field_region_map.c b/src/field_region_map.c
new file mode 100644
index 000000000..4923f2069
--- /dev/null
+++ b/src/field_region_map.c
@@ -0,0 +1,84 @@
+
+// Includes
+#include "global.h"
+#include "main.h"
+#include "malloc.h"
+#include "gpu_regs.h"
+#include "bg.h"
+#include "text.h"
+#include "window.h"
+#include "text_window.h"
+#include "palette.h"
+#include "menu.h"
+
+// Static type declarations
+
+// Static RAM declarations
+
+EWRAM_DATA struct {
+    MainCallback callback;
+    u8 filler_004[0x888];
+    u16 unk_88c;
+} *gUnknown_0203BCD0 = NULL;
+
+// Static ROM declarations
+
+static void sub_81701C4(void);
+static void sub_8170260(void);
+static void sub_8170274(void);
+void sub_8170290(void);
+
+// .rodata
+
+extern const struct BgTemplate gUnknown_085E5068[];
+extern const struct WindowTemplate gUnknown_085E5070[];
+
+// .text
+
+void sub_817018C(MainCallback callback)
+{
+    SetVBlankCallback(NULL);
+    gUnknown_0203BCD0 = malloc(sizeof(*gUnknown_0203BCD0));
+    gUnknown_0203BCD0->unk_88c = 0;
+    gUnknown_0203BCD0->callback = callback;
+    SetMainCallback2(sub_81701C4);
+}
+
+static void sub_81701C4(void)
+{
+    SetGpuReg(REG_OFFSET_DISPCNT, 0);
+    SetGpuReg(REG_OFFSET_BG0HOFS, 0);
+    SetGpuReg(REG_OFFSET_BG0VOFS, 0);
+    SetGpuReg(REG_OFFSET_BG1HOFS, 0);
+    SetGpuReg(REG_OFFSET_BG1VOFS, 0);
+    SetGpuReg(REG_OFFSET_BG2HOFS, 0);
+    SetGpuReg(REG_OFFSET_BG2VOFS, 0);
+    SetGpuReg(REG_OFFSET_BG3HOFS, 0);
+    SetGpuReg(REG_OFFSET_BG3VOFS, 0);
+    ResetSpriteData();
+    FreeAllSpritePalettes();
+    ResetBgsAndClearDma3BusyFlags(0);
+    InitBgsFromTemplates(1, gUnknown_085E5068, 2);
+    InitWindows(gUnknown_085E5070);
+    DeactivateAllTextPrinters();
+    sub_809882C(0, 0x27, 0xd0);
+    clear_scheduled_bg_copies_to_vram();
+    SetMainCallback2(sub_8170274);
+    SetVBlankCallback(sub_8170260);
+}
+
+static void sub_8170260(void)
+{
+    LoadOam();
+    ProcessSpriteCopyRequests();
+    TransferPlttBuffer();
+}
+
+static void sub_8170274(void)
+{
+    sub_8170290();
+    AnimateSprites();
+    BuildOamBuffer();
+    UpdatePaletteFade();
+    do_scheduled_bg_tilemap_copies_to_vram();
+}
-- 
cgit v1.2.3


From 929638f572ceba01ffd528eb024a2f124ca4224e Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sun, 29 Oct 2017 10:58:33 -0400
Subject: sub_8170290

---
 src/field_region_map.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 75 insertions(+), 4 deletions(-)

(limited to 'src/field_region_map.c')

diff --git a/src/field_region_map.c b/src/field_region_map.c
index 4923f2069..399ae9070 100644
--- a/src/field_region_map.c
+++ b/src/field_region_map.c
@@ -10,6 +10,9 @@
 #include "text_window.h"
 #include "palette.h"
 #include "menu.h"
+#include "strings.h"
+#include "international_string_util.h"
+#include "region_map.h"
 
 // Static type declarations
 
@@ -17,8 +20,9 @@
 
 EWRAM_DATA struct {
     MainCallback callback;
-    u8 filler_004[0x888];
-    u16 unk_88c;
+    u8 filler_004[0x4];
+    u8 filler_008[0x884];
+    u16 state;
 } *gUnknown_0203BCD0 = NULL;
 
 // Static ROM declarations
@@ -26,7 +30,8 @@ EWRAM_DATA struct {
 static void sub_81701C4(void);
 static void sub_8170260(void);
 static void sub_8170274(void);
-void sub_8170290(void);
+static void sub_8170290(void);
+void sub_8170428(void);
 
 // .rodata
 
@@ -39,7 +44,7 @@ void sub_817018C(MainCallback callback)
 {
     SetVBlankCallback(NULL);
     gUnknown_0203BCD0 = malloc(sizeof(*gUnknown_0203BCD0));
-    gUnknown_0203BCD0->unk_88c = 0;
+    gUnknown_0203BCD0->state = 0;
     gUnknown_0203BCD0->callback = callback;
     SetMainCallback2(sub_81701C4);
 }
@@ -82,3 +87,69 @@ static void sub_8170274(void)
     UpdatePaletteFade();
     do_scheduled_bg_tilemap_copies_to_vram();
 }
+
+void sub_8170290(void)
+{
+    u8 offset;
+
+    switch (gUnknown_0203BCD0->state)
+    {
+        case 0:
+            sub_8122CDC(gUnknown_0203BCD0->filler_008, 0);
+            sub_8124288(0, 0);
+            sub_81240D4(1, 1);
+            gUnknown_0203BCD0->state ++;
+            break;
+        case 1:
+            SetWindowBorderStyle(1, 0, 0x27, 0xd);
+            offset = GetStringCenterAlignXOffset(1, gText_Hoenn, 0x38);
+            PrintTextOnWindow(1, 1, gText_Hoenn, offset, 1, 0, 0);
+            schedule_bg_copy_tilemap_to_vram(0);
+            SetWindowBorderStyle(0, 0, 0x27, 0xd);
+            sub_8170428();
+            BeginNormalPaletteFade(-1, 0, 16, 0, 0);
+            gUnknown_0203BCD0->state ++;
+            break;
+        case 2:
+            SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_OBJ_1D_MAP | DISPCNT_OBJ_ON);
+            ShowBg(0);
+            ShowBg(2);
+            gUnknown_0203BCD0->state ++;
+            break;
+        case 3:
+            if (!gPaletteFade.active)
+            {
+                gUnknown_0203BCD0->state ++;
+            }
+            break;
+        case 4:
+            switch (sub_81230AC())
+            {
+                case 3:
+                    sub_8170428();
+                    break;
+                case 4:
+                case 5:
+                    gUnknown_0203BCD0->state ++;
+                    break;
+            }
+            break;
+        case 5:
+            BeginNormalPaletteFade(-1, 0, 0, 16, 0);
+            gUnknown_0203BCD0->state ++;
+            break;
+        case 6:
+            if (!gPaletteFade.active)
+            {
+                sub_812305C();
+                SetMainCallback2(gUnknown_0203BCD0->callback);
+                if (gUnknown_0203BCD0 != NULL)
+                {
+                    free(gUnknown_0203BCD0);
+                    gUnknown_0203BCD0 = NULL;
+                }
+                FreeAllWindowBuffers();
+            }
+            break;
+    }
+}
-- 
cgit v1.2.3


From 6e10e8caad9d6920c6a1451c0ec63edf529ce17a Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sun, 29 Oct 2017 11:05:42 -0400
Subject: sub_8170428

---
 src/field_region_map.c | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

(limited to 'src/field_region_map.c')

diff --git a/src/field_region_map.c b/src/field_region_map.c
index 399ae9070..f78268018 100644
--- a/src/field_region_map.c
+++ b/src/field_region_map.c
@@ -20,8 +20,8 @@
 
 EWRAM_DATA struct {
     MainCallback callback;
-    u8 filler_004[0x4];
-    u8 filler_008[0x884];
+    u32 filler_004;
+    struct RegionMap regionMap;
     u16 state;
 } *gUnknown_0203BCD0 = NULL;
 
@@ -31,7 +31,7 @@ static void sub_81701C4(void);
 static void sub_8170260(void);
 static void sub_8170274(void);
 static void sub_8170290(void);
-void sub_8170428(void);
+static void sub_8170428(void);
 
 // .rodata
 
@@ -95,7 +95,7 @@ void sub_8170290(void)
     switch (gUnknown_0203BCD0->state)
     {
         case 0:
-            sub_8122CDC(gUnknown_0203BCD0->filler_008, 0);
+            sub_8122CDC(&gUnknown_0203BCD0->regionMap, 0);
             sub_8124288(0, 0);
             sub_81240D4(1, 1);
             gUnknown_0203BCD0->state ++;
@@ -103,7 +103,7 @@ void sub_8170290(void)
         case 1:
             SetWindowBorderStyle(1, 0, 0x27, 0xd);
             offset = GetStringCenterAlignXOffset(1, gText_Hoenn, 0x38);
-            PrintTextOnWindow(1, 1, gText_Hoenn, offset, 1, 0, 0);
+            PrintTextOnWindow(1, 1, gText_Hoenn, offset, 1, 0, NULL);
             schedule_bg_copy_tilemap_to_vram(0);
             SetWindowBorderStyle(0, 0, 0x27, 0xd);
             sub_8170428();
@@ -153,3 +153,18 @@ void sub_8170290(void)
             break;
     }
 }
+
+static void sub_8170428(void)
+{
+    if (gUnknown_0203BCD0->regionMap.unk_02)
+    {
+        FillWindowPixelBuffer(0, 0x11);
+        PrintTextOnWindow(0, 1, gUnknown_0203BCD0->regionMap.mapSecName, 0, 1, 0, NULL);
+        schedule_bg_copy_tilemap_to_vram(0);
+    }
+    else
+    {
+        FillWindowPixelBuffer(0, 0x11);
+        CopyWindowToVram(0, 3);
+    }
+}
-- 
cgit v1.2.3


From c0a229f10834785a709c40035dab6da03b8a30ff Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sun, 29 Oct 2017 11:12:28 -0400
Subject: Decompile field region map bg and window templates

---
 src/field_region_map.c | 31 ++++++++++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)

(limited to 'src/field_region_map.c')

diff --git a/src/field_region_map.c b/src/field_region_map.c
index f78268018..c2a14d04e 100644
--- a/src/field_region_map.c
+++ b/src/field_region_map.c
@@ -18,7 +18,7 @@
 
 // Static RAM declarations
 
-EWRAM_DATA struct {
+static EWRAM_DATA struct {
     MainCallback callback;
     u32 filler_004;
     struct RegionMap regionMap;
@@ -35,8 +35,33 @@ static void sub_8170428(void);
 
 // .rodata
 
-extern const struct BgTemplate gUnknown_085E5068[];
-extern const struct WindowTemplate gUnknown_085E5070[];
+static const struct BgTemplate gUnknown_085E5068[] = {
+    {
+        .bg = 0,
+        .charBaseIndex = 0,
+        .mapBaseIndex = 31,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 0,
+        .baseTile = 0
+    }, {
+        .bg = 2,
+        .charBaseIndex = 2,
+        .mapBaseIndex = 28,
+        .screenSize = 2,
+        .paletteMode = 1,
+        .priority = 2,
+        .baseTile = 0
+    }
+};
+
+static const struct WindowTemplate gUnknown_085E5070[] = {
+    {
+        0, 17, 17, 12,  2, 15, 0x0001
+    }, {
+        0, 22,  1,  7,  2, 15, 0x0019
+    }, DUMMY_WIN_TEMPLATE
+};
 
 // .text
 
-- 
cgit v1.2.3


From 76bb397e83ca5d8b4f7a501f2517e83e4a9eccec Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sun, 29 Oct 2017 19:33:53 -0400
Subject: region_map.c through sub_8122CF8

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

(limited to 'src/field_region_map.c')

diff --git a/src/field_region_map.c b/src/field_region_map.c
index c2a14d04e..e8c52de77 100644
--- a/src/field_region_map.c
+++ b/src/field_region_map.c
@@ -120,7 +120,7 @@ void sub_8170290(void)
     switch (gUnknown_0203BCD0->state)
     {
         case 0:
-            sub_8122CDC(&gUnknown_0203BCD0->regionMap, 0);
+            sub_8122CDC(&gUnknown_0203BCD0->regionMap, FALSE);
             sub_8124288(0, 0);
             sub_81240D4(1, 1);
             gUnknown_0203BCD0->state ++;
-- 
cgit v1.2.3


From 6f68e5af95295d10b8dc956d6c621999002377de Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sun, 29 Oct 2017 20:49:49 -0400
Subject: sub_8122DB0

---
 src/field_region_map.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/field_region_map.c')

diff --git a/src/field_region_map.c b/src/field_region_map.c
index e8c52de77..74b62bbc7 100644
--- a/src/field_region_map.c
+++ b/src/field_region_map.c
@@ -120,7 +120,7 @@ void sub_8170290(void)
     switch (gUnknown_0203BCD0->state)
     {
         case 0:
-            sub_8122CDC(&gUnknown_0203BCD0->regionMap, FALSE);
+            sub_8122CDC(&gUnknown_0203BCD0->regionMap, 0);
             sub_8124288(0, 0);
             sub_81240D4(1, 1);
             gUnknown_0203BCD0->state ++;
@@ -181,7 +181,7 @@ void sub_8170290(void)
 
 static void sub_8170428(void)
 {
-    if (gUnknown_0203BCD0->regionMap.unk_02)
+    if (gUnknown_0203BCD0->regionMap.unk_002 != 0)
     {
         FillWindowPixelBuffer(0, 0x11);
         PrintTextOnWindow(0, 1, gUnknown_0203BCD0->regionMap.mapSecName, 0, 1, 0, NULL);
-- 
cgit v1.2.3


From 8d35bf1c9e93c11f0e8d6e4d7933e3b1761072a6 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sun, 29 Oct 2017 21:31:38 -0400
Subject: _swiopen

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

(limited to 'src/field_region_map.c')

diff --git a/src/field_region_map.c b/src/field_region_map.c
index 74b62bbc7..2f73179d9 100644
--- a/src/field_region_map.c
+++ b/src/field_region_map.c
@@ -150,11 +150,11 @@ void sub_8170290(void)
         case 4:
             switch (sub_81230AC())
             {
-                case 3:
+                case INPUT_EVENT_MOVE_END:
                     sub_8170428();
                     break;
-                case 4:
-                case 5:
+                case INPUT_EVENT_A_BUTTON:
+                case INPUT_EVENT_B_BUTTON:
                     gUnknown_0203BCD0->state ++;
                     break;
             }
-- 
cgit v1.2.3


From 474df271368917b79071ab101c36857fcab72c4b Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 30 Oct 2017 08:39:39 -0400
Subject: through CalcZoomScrollParams

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

(limited to 'src/field_region_map.c')

diff --git a/src/field_region_map.c b/src/field_region_map.c
index 2f73179d9..d70d44d58 100644
--- a/src/field_region_map.c
+++ b/src/field_region_map.c
@@ -120,9 +120,9 @@ void sub_8170290(void)
     switch (gUnknown_0203BCD0->state)
     {
         case 0:
-            sub_8122CDC(&gUnknown_0203BCD0->regionMap, 0);
+            InitRegionMap(&gUnknown_0203BCD0->regionMap, 0);
             sub_8124288(0, 0);
-            sub_81240D4(1, 1);
+            CreateRegionMapCursor(1, 1);
             gUnknown_0203BCD0->state ++;
             break;
         case 1:
@@ -166,7 +166,7 @@ void sub_8170290(void)
         case 6:
             if (!gPaletteFade.active)
             {
-                sub_812305C();
+                FreeRegionMapIconResources();
                 SetMainCallback2(gUnknown_0203BCD0->callback);
                 if (gUnknown_0203BCD0 != NULL)
                 {
-- 
cgit v1.2.3


From 7b6792230a770dd67c94a3b34aecba87ad9a05db Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 30 Oct 2017 21:34:19 -0400
Subject: sub_8123EB4

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

(limited to 'src/field_region_map.c')

diff --git a/src/field_region_map.c b/src/field_region_map.c
index d70d44d58..6c483c6b6 100644
--- a/src/field_region_map.c
+++ b/src/field_region_map.c
@@ -181,7 +181,7 @@ void sub_8170290(void)
 
 static void sub_8170428(void)
 {
-    if (gUnknown_0203BCD0->regionMap.unk_002 != 0)
+    if (gUnknown_0203BCD0->regionMap.iconDrawType != 0)
     {
         FillWindowPixelBuffer(0, 0x11);
         PrintTextOnWindow(0, 1, gUnknown_0203BCD0->regionMap.mapSecName, 0, 1, 0, NULL);
-- 
cgit v1.2.3


From 968ff8c3c8d6b5ee4b5af4b60489d8bf42bfd56f Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Tue, 31 Oct 2017 20:58:47 -0400
Subject: through UnhideRegionMapPlayerIcon

---
 src/field_region_map.c | 70 +++++++++++++++++++++++++-------------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

(limited to 'src/field_region_map.c')

diff --git a/src/field_region_map.c b/src/field_region_map.c
index 6c483c6b6..776ca6934 100644
--- a/src/field_region_map.c
+++ b/src/field_region_map.c
@@ -23,15 +23,15 @@ static EWRAM_DATA struct {
     u32 filler_004;
     struct RegionMap regionMap;
     u16 state;
-} *gUnknown_0203BCD0 = NULL;
+} *sFieldRegionMapHandler = NULL;
 
 // Static ROM declarations
 
-static void sub_81701C4(void);
-static void sub_8170260(void);
-static void sub_8170274(void);
-static void sub_8170290(void);
-static void sub_8170428(void);
+static void MCB2_InitRegionMapRegisters(void);
+static void VBCB_FieldUpdateRegionMap(void);
+static void MCB2_FieldUpdateRegionMap(void);
+static void FieldUpdateRegionMap(void);
+static void PrintRegionMapSecName(void);
 
 // .rodata
 
@@ -68,13 +68,13 @@ static const struct WindowTemplate gUnknown_085E5070[] = {
 void sub_817018C(MainCallback callback)
 {
     SetVBlankCallback(NULL);
-    gUnknown_0203BCD0 = malloc(sizeof(*gUnknown_0203BCD0));
-    gUnknown_0203BCD0->state = 0;
-    gUnknown_0203BCD0->callback = callback;
-    SetMainCallback2(sub_81701C4);
+    sFieldRegionMapHandler = malloc(sizeof(*sFieldRegionMapHandler));
+    sFieldRegionMapHandler->state = 0;
+    sFieldRegionMapHandler->callback = callback;
+    SetMainCallback2(MCB2_InitRegionMapRegisters);
 }
 
-static void sub_81701C4(void)
+static void MCB2_InitRegionMapRegisters(void)
 {
     SetGpuReg(REG_OFFSET_DISPCNT, 0);
     SetGpuReg(REG_OFFSET_BG0HOFS, 0);
@@ -93,37 +93,37 @@ static void sub_81701C4(void)
     DeactivateAllTextPrinters();
     sub_809882C(0, 0x27, 0xd0);
     clear_scheduled_bg_copies_to_vram();
-    SetMainCallback2(sub_8170274);
-    SetVBlankCallback(sub_8170260);
+    SetMainCallback2(MCB2_FieldUpdateRegionMap);
+    SetVBlankCallback(VBCB_FieldUpdateRegionMap);
 }
 
-static void sub_8170260(void)
+static void VBCB_FieldUpdateRegionMap(void)
 {
     LoadOam();
     ProcessSpriteCopyRequests();
     TransferPlttBuffer();
 }
 
-static void sub_8170274(void)
+static void MCB2_FieldUpdateRegionMap(void)
 {
-    sub_8170290();
+    FieldUpdateRegionMap();
     AnimateSprites();
     BuildOamBuffer();
     UpdatePaletteFade();
     do_scheduled_bg_tilemap_copies_to_vram();
 }
 
-void sub_8170290(void)
+static void FieldUpdateRegionMap(void)
 {
     u8 offset;
 
-    switch (gUnknown_0203BCD0->state)
+    switch (sFieldRegionMapHandler->state)
     {
         case 0:
-            InitRegionMap(&gUnknown_0203BCD0->regionMap, 0);
-            sub_8124288(0, 0);
+            InitRegionMap(&sFieldRegionMapHandler->regionMap, 0);
+            CreateRegionMapPlayerIcon(0, 0);
             CreateRegionMapCursor(1, 1);
-            gUnknown_0203BCD0->state ++;
+            sFieldRegionMapHandler->state ++;
             break;
         case 1:
             SetWindowBorderStyle(1, 0, 0x27, 0xd);
@@ -131,47 +131,47 @@ void sub_8170290(void)
             PrintTextOnWindow(1, 1, gText_Hoenn, offset, 1, 0, NULL);
             schedule_bg_copy_tilemap_to_vram(0);
             SetWindowBorderStyle(0, 0, 0x27, 0xd);
-            sub_8170428();
+            PrintRegionMapSecName();
             BeginNormalPaletteFade(-1, 0, 16, 0, 0);
-            gUnknown_0203BCD0->state ++;
+            sFieldRegionMapHandler->state ++;
             break;
         case 2:
             SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_OBJ_1D_MAP | DISPCNT_OBJ_ON);
             ShowBg(0);
             ShowBg(2);
-            gUnknown_0203BCD0->state ++;
+            sFieldRegionMapHandler->state ++;
             break;
         case 3:
             if (!gPaletteFade.active)
             {
-                gUnknown_0203BCD0->state ++;
+                sFieldRegionMapHandler->state ++;
             }
             break;
         case 4:
             switch (sub_81230AC())
             {
                 case INPUT_EVENT_MOVE_END:
-                    sub_8170428();
+                    PrintRegionMapSecName();
                     break;
                 case INPUT_EVENT_A_BUTTON:
                 case INPUT_EVENT_B_BUTTON:
-                    gUnknown_0203BCD0->state ++;
+                    sFieldRegionMapHandler->state ++;
                     break;
             }
             break;
         case 5:
             BeginNormalPaletteFade(-1, 0, 0, 16, 0);
-            gUnknown_0203BCD0->state ++;
+            sFieldRegionMapHandler->state ++;
             break;
         case 6:
             if (!gPaletteFade.active)
             {
                 FreeRegionMapIconResources();
-                SetMainCallback2(gUnknown_0203BCD0->callback);
-                if (gUnknown_0203BCD0 != NULL)
+                SetMainCallback2(sFieldRegionMapHandler->callback);
+                if (sFieldRegionMapHandler != NULL)
                 {
-                    free(gUnknown_0203BCD0);
-                    gUnknown_0203BCD0 = NULL;
+                    free(sFieldRegionMapHandler);
+                    sFieldRegionMapHandler = NULL;
                 }
                 FreeAllWindowBuffers();
             }
@@ -179,12 +179,12 @@ void sub_8170290(void)
     }
 }
 
-static void sub_8170428(void)
+static void PrintRegionMapSecName(void)
 {
-    if (gUnknown_0203BCD0->regionMap.iconDrawType != 0)
+    if (sFieldRegionMapHandler->regionMap.iconDrawType != MAPSECTYPE_NONE)
     {
         FillWindowPixelBuffer(0, 0x11);
-        PrintTextOnWindow(0, 1, gUnknown_0203BCD0->regionMap.mapSecName, 0, 1, 0, NULL);
+        PrintTextOnWindow(0, 1, sFieldRegionMapHandler->regionMap.mapSecName, 0, 1, 0, NULL);
         schedule_bg_copy_tilemap_to_vram(0);
     }
     else
-- 
cgit v1.2.3


From 1ca032c6ff72bb52c9b16d4a42ac7913521216f9 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sun, 12 Nov 2017 21:13:18 -0500
Subject: Address review items, 1

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

(limited to 'src/field_region_map.c')

diff --git a/src/field_region_map.c b/src/field_region_map.c
index 776ca6934..9d530258d 100644
--- a/src/field_region_map.c
+++ b/src/field_region_map.c
@@ -56,11 +56,9 @@ static const struct BgTemplate gUnknown_085E5068[] = {
 };
 
 static const struct WindowTemplate gUnknown_085E5070[] = {
-    {
-        0, 17, 17, 12,  2, 15, 0x0001
-    }, {
-        0, 22,  1,  7,  2, 15, 0x0019
-    }, DUMMY_WIN_TEMPLATE
+    { 0, 17, 17, 12,  2, 15, 0x0001 },
+    { 0, 22,  1,  7,  2, 15, 0x0019 },
+    DUMMY_WIN_TEMPLATE
 };
 
 // .text
-- 
cgit v1.2.3


From a7f72e7da1aee75e57649e0864c2bcde06cc24c9 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Thu, 16 Nov 2017 00:01:47 -0500
Subject: Remove spaces between incrementor and incrementee

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

(limited to 'src/field_region_map.c')

diff --git a/src/field_region_map.c b/src/field_region_map.c
index 9d530258d..b7d677c90 100644
--- a/src/field_region_map.c
+++ b/src/field_region_map.c
@@ -121,7 +121,7 @@ static void FieldUpdateRegionMap(void)
             InitRegionMap(&sFieldRegionMapHandler->regionMap, 0);
             CreateRegionMapPlayerIcon(0, 0);
             CreateRegionMapCursor(1, 1);
-            sFieldRegionMapHandler->state ++;
+            sFieldRegionMapHandler->state++;
             break;
         case 1:
             SetWindowBorderStyle(1, 0, 0x27, 0xd);
@@ -131,18 +131,18 @@ static void FieldUpdateRegionMap(void)
             SetWindowBorderStyle(0, 0, 0x27, 0xd);
             PrintRegionMapSecName();
             BeginNormalPaletteFade(-1, 0, 16, 0, 0);
-            sFieldRegionMapHandler->state ++;
+            sFieldRegionMapHandler->state++;
             break;
         case 2:
             SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_OBJ_1D_MAP | DISPCNT_OBJ_ON);
             ShowBg(0);
             ShowBg(2);
-            sFieldRegionMapHandler->state ++;
+            sFieldRegionMapHandler->state++;
             break;
         case 3:
             if (!gPaletteFade.active)
             {
-                sFieldRegionMapHandler->state ++;
+                sFieldRegionMapHandler->state++;
             }
             break;
         case 4:
@@ -153,13 +153,13 @@ static void FieldUpdateRegionMap(void)
                     break;
                 case INPUT_EVENT_A_BUTTON:
                 case INPUT_EVENT_B_BUTTON:
-                    sFieldRegionMapHandler->state ++;
+                    sFieldRegionMapHandler->state++;
                     break;
             }
             break;
         case 5:
             BeginNormalPaletteFade(-1, 0, 0, 16, 0);
-            sFieldRegionMapHandler->state ++;
+            sFieldRegionMapHandler->state++;
             break;
         case 6:
             if (!gPaletteFade.active)
-- 
cgit v1.2.3