sub_8123334

1 files changed, 108 insertions, 70 deletions

diff --git a/src/region_map.c b/src/region_map.c
index a75d68854..caf6b32a1 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -31,6 +31,7 @@ void sub_8123FB0(void);
 u8 _swiopen(void);
 u8 sub_8123334(void);
 u16 sub_812386C(u16 x, u16 y);
+void sub_812378C(s16 x, s16 y);
 
 // .rodata
 
@@ -51,19 +52,19 @@ void sub_8122CDC(struct RegionMap *regionMap, u8 argument)
 void sub_8122CF8(struct RegionMap *regionMap, struct UnkStruct_8122CF8 *arg1, u8 arg2)
 {
     gUnknown_0203A144 = regionMap;
-    gUnknown_0203A144->unk_079 = 0;
-    gUnknown_0203A144->unk_078 = arg2;
+    gUnknown_0203A144->initStep = 0;
+    gUnknown_0203A144->zoomed = arg2;
     gUnknown_0203A144->inputCallback = arg2 == TRUE ? sub_8123254 : sub_81230C4;
     if (arg1 != NULL)
     {
-        gUnknown_0203A144->unk_080 = arg1->unk_0_0;
+        gUnknown_0203A144->bgNum = arg1->unk_0_0;
         gUnknown_0203A144->unk_081 = arg1->unk_0_2;
         gUnknown_0203A144->unk_082 = arg1->unk_0_4;
         gUnknown_0203A144->unk_083 = TRUE;
     }
     else
     {
-        gUnknown_0203A144->unk_080 = 2;
+        gUnknown_0203A144->bgNum = 2;
         gUnknown_0203A144->unk_081 = 2;
         gUnknown_0203A144->unk_082 = 28;
         gUnknown_0203A144->unk_083 = FALSE;
@@ -74,18 +75,18 @@ void sub_8122D88(struct RegionMap *regionMap)
 {
     gUnknown_0203A144 = regionMap;
     sub_81238AC();
-    gUnknown_0203A144->unk_074 = gUnknown_0203A144->unk_054;
-    gUnknown_0203A144->unk_076 = gUnknown_0203A144->unk_056;
+    gUnknown_0203A144->unk_074 = gUnknown_0203A144->cursorPosX;
+    gUnknown_0203A144->unk_076 = gUnknown_0203A144->cursorPosY;
 }
 
 bool8 sub_8122DB0(void)
 {
-    switch (gUnknown_0203A144->unk_079)
+    switch (gUnknown_0203A144->initStep)
     {
         case 0:
             if (gUnknown_0203A144->unk_083)
             {
-                decompress_and_copy_tile_data_to_vram(gUnknown_0203A144->unk_080, gUnknown_0859F77C, 0, 0, 0);
+                decompress_and_copy_tile_data_to_vram(gUnknown_0203A144->bgNum, gUnknown_0859F77C, 0, 0, 0);
             }
             else
             {
@@ -97,7 +98,7 @@ bool8 sub_8122DB0(void)
             {
                 if (!free_temp_tile_data_buffers_if_possible())
                 {
-                    decompress_and_copy_tile_data_to_vram(gUnknown_0203A144->unk_080, gUnknown_085A04E0, 0, 0, 1);
+                    decompress_and_copy_tile_data_to_vram(gUnknown_0203A144->bgNum, gUnknown_085A04E0, 0, 0, 1);
                 }
             }
             else
@@ -112,54 +113,54 @@ bool8 sub_8122DB0(void)
             }
             break;
         case 3:
-            LZ77UnCompWram(gUnknown_0859F60C, gUnknown_0203A144->unk_184);
+            LZ77UnCompWram(gUnknown_0859F60C, gUnknown_0203A144->cursorSmallImage);
             break;
         case 4:
-            LZ77UnCompWram(gUnknown_0859F650, gUnknown_0203A144->unk_284);
+            LZ77UnCompWram(gUnknown_0859F650, gUnknown_0203A144->cursorLargeImage);
             break;
         case 5:
             sub_81238AC();
-            gUnknown_0203A144->unk_074 = gUnknown_0203A144->unk_054;
-            gUnknown_0203A144->unk_076 = gUnknown_0203A144->unk_056;
+            gUnknown_0203A144->unk_074 = gUnknown_0203A144->cursorPosX;
+            gUnknown_0203A144->unk_076 = gUnknown_0203A144->cursorPosY;
             gUnknown_0203A144->mapSecId = sub_8123EB4(gUnknown_0203A144->mapSecId);
             gUnknown_0203A144->unk_002 = get_flagnr_blue_points(gUnknown_0203A144->mapSecId);
             GetMapName(gUnknown_0203A144->mapSecName, gUnknown_0203A144->mapSecId, 16);
             break;
         case 6:
-            if (gUnknown_0203A144->unk_078 == 0)
+            if (gUnknown_0203A144->zoomed == FALSE)
             {
                 sub_81236C4(0, 0, 0, 0, 0x100, 0x100, 0);
             }
             else
             {
-                gUnknown_0203A144->unk_05c = gUnknown_0203A144->unk_054 * 8 - 0x34;
-                gUnknown_0203A144->unk_05e = gUnknown_0203A144->unk_056 * 8 - 0x44;
-                gUnknown_0203A144->unk_064 = gUnknown_0203A144->unk_054;
-                gUnknown_0203A144->unk_066 = gUnknown_0203A144->unk_056;
-                sub_81236C4(gUnknown_0203A144->unk_05c, gUnknown_0203A144->unk_05e, 0x38, 0x48, 0x80, 0x80, 0);
+                gUnknown_0203A144->scrollX = gUnknown_0203A144->cursorPosX * 8 - 0x34;
+                gUnknown_0203A144->scrollY = gUnknown_0203A144->cursorPosY * 8 - 0x44;
+                gUnknown_0203A144->unk_064 = gUnknown_0203A144->cursorPosX;
+                gUnknown_0203A144->unk_066 = gUnknown_0203A144->cursorPosY;
+                sub_81236C4(gUnknown_0203A144->scrollX, gUnknown_0203A144->scrollY, 0x38, 0x48, 0x80, 0x80, 0);
             }
             break;
         case 7:
             sub_8123FB0();
             sub_81237B4();
-            gUnknown_0203A144->unk_01c = NULL;
-            gUnknown_0203A144->unk_020 = NULL;
-            gUnknown_0203A144->unk_07a = 0;
-            gUnknown_0203A144->unk_07e = 0;
+            gUnknown_0203A144->cursorSprite = NULL;
+            gUnknown_0203A144->playerIconSprite = NULL;
+            gUnknown_0203A144->cursorMovementFrameCounter = 0;
+            gUnknown_0203A144->blinkPlayerIcon = FALSE;
             if (gUnknown_0203A144->unk_083)
             {
-                SetBgAttribute(gUnknown_0203A144->unk_080, BG_CTRL_ATTR_MAPBASEINDEX, 2);
-                SetBgAttribute(gUnknown_0203A144->unk_080, BG_CTRL_ATTR_VISIBLE, gUnknown_0203A144->unk_081);
-                SetBgAttribute(gUnknown_0203A144->unk_080, BG_CTRL_ATTR_CHARBASEINDEX, gUnknown_0203A144->unk_082);
-                SetBgAttribute(gUnknown_0203A144->unk_080, BG_CTRL_ATTR_PRIORITY, 1);
-                SetBgAttribute(gUnknown_0203A144->unk_080, BG_CTRL_ATTR_SCREENSIZE, 1);
+                SetBgAttribute(gUnknown_0203A144->bgNum, BG_CTRL_ATTR_MAPBASEINDEX, 2);
+                SetBgAttribute(gUnknown_0203A144->bgNum, BG_CTRL_ATTR_VISIBLE, gUnknown_0203A144->unk_081);
+                SetBgAttribute(gUnknown_0203A144->bgNum, BG_CTRL_ATTR_CHARBASEINDEX, gUnknown_0203A144->unk_082);
+                SetBgAttribute(gUnknown_0203A144->bgNum, BG_CTRL_ATTR_PRIORITY, 1);
+                SetBgAttribute(gUnknown_0203A144->bgNum, BG_CTRL_ATTR_SCREENSIZE, 1);
             }
-            gUnknown_0203A144->unk_079 ++;
+            gUnknown_0203A144->initStep ++;
             return FALSE;
         default:
             return FALSE;
     }
-    gUnknown_0203A144->unk_079 ++;
+    gUnknown_0203A144->initStep ++;
     return TRUE;
 }
 
@@ -171,17 +172,17 @@ void sub_8123030(u16 a0, u32 a1)
 
 void sub_812305C(void)
 {
-    if (gUnknown_0203A144->unk_01c != NULL)
+    if (gUnknown_0203A144->cursorSprite != NULL)
     {
-        DestroySprite(gUnknown_0203A144->unk_01c);
-        FreeSpriteTilesByTag(gUnknown_0203A144->unk_058);
-        FreeSpritePaletteByTag(gUnknown_0203A144->unk_05a);
+        DestroySprite(gUnknown_0203A144->cursorSprite);
+        FreeSpriteTilesByTag(gUnknown_0203A144->cursorTileTag);
+        FreeSpritePaletteByTag(gUnknown_0203A144->cursorPaletteTag);
     }
-    if (gUnknown_0203A144->unk_020 != NULL)
+    if (gUnknown_0203A144->playerIconSprite != NULL)
     {
-        DestroySprite(gUnknown_0203A144->unk_020);
-        FreeSpriteTilesByTag(gUnknown_0203A144->unk_070);
-        FreeSpritePaletteByTag(gUnknown_0203A144->unk_072);
+        DestroySprite(gUnknown_0203A144->playerIconSprite);
+        FreeSpriteTilesByTag(gUnknown_0203A144->playerIconTileTag);
+        FreeSpritePaletteByTag(gUnknown_0203A144->playerIconPaletteTag);
     }
 }
 
@@ -195,26 +196,26 @@ u8 sub_81230C4(void)
     u8 input;
 
     input = INPUT_EVENT_NONE;
-    gUnknown_0203A144->unk_07b = 0;
-    gUnknown_0203A144->unk_07c = 0;
-    if (gMain.heldKeys & DPAD_UP && gUnknown_0203A144->unk_056 > 2)
+    gUnknown_0203A144->cursorDeltaX = 0;
+    gUnknown_0203A144->cursorDeltaY = 0;
+    if (gMain.heldKeys & DPAD_UP && gUnknown_0203A144->cursorPosY > 2)
     {
-        gUnknown_0203A144->unk_07c = -1;
+        gUnknown_0203A144->cursorDeltaY = -1;
         input = INPUT_EVENT_MOVE_START;
     }
-    if (gMain.heldKeys & DPAD_DOWN && gUnknown_0203A144->unk_056 < 16)
+    if (gMain.heldKeys & DPAD_DOWN && gUnknown_0203A144->cursorPosY < 16)
     {
-        gUnknown_0203A144->unk_07c = +1;
+        gUnknown_0203A144->cursorDeltaY = +1;
         input = INPUT_EVENT_MOVE_START;
     }
-    if (gMain.heldKeys & DPAD_LEFT && gUnknown_0203A144->unk_054 > 1)
+    if (gMain.heldKeys & DPAD_LEFT && gUnknown_0203A144->cursorPosX > 1)
     {
-        gUnknown_0203A144->unk_07b = -1;
+        gUnknown_0203A144->cursorDeltaX = -1;
         input = INPUT_EVENT_MOVE_START;
     }
-    if (gMain.heldKeys & DPAD_RIGHT && gUnknown_0203A144->unk_054 < 28)
+    if (gMain.heldKeys & DPAD_RIGHT && gUnknown_0203A144->cursorPosX < 28)
     {
-        gUnknown_0203A144->unk_07b = +1;
+        gUnknown_0203A144->cursorDeltaX = +1;
         input = INPUT_EVENT_MOVE_START;
     }
     if (gMain.newKeys & A_BUTTON)
@@ -227,7 +228,7 @@ u8 sub_81230C4(void)
     }
     if (input == INPUT_EVENT_MOVE_START)
     {
-        gUnknown_0203A144->unk_07a = 4;
+        gUnknown_0203A144->cursorMovementFrameCounter = 4;
         gUnknown_0203A144->inputCallback = _swiopen;
     }
     return input;
@@ -237,27 +238,27 @@ u8 _swiopen(void)
 {
     u16 mapSecId;
 
-    if (gUnknown_0203A144->unk_07a != 0)
+    if (gUnknown_0203A144->cursorMovementFrameCounter != 0)
     {
         return INPUT_EVENT_MOVE_CONT;
     }
-    if (gUnknown_0203A144->unk_07b > 0)
+    if (gUnknown_0203A144->cursorDeltaX > 0)
     {
-        gUnknown_0203A144->unk_054 ++;
+        gUnknown_0203A144->cursorPosX ++;
     }
-    if (gUnknown_0203A144->unk_07b < 0)
+    if (gUnknown_0203A144->cursorDeltaX < 0)
     {
-        gUnknown_0203A144->unk_054 --;
+        gUnknown_0203A144->cursorPosX --;
     }
-    if (gUnknown_0203A144->unk_07c > 0)
+    if (gUnknown_0203A144->cursorDeltaY > 0)
     {
-        gUnknown_0203A144->unk_056 ++;
+        gUnknown_0203A144->cursorPosY ++;
     }
-    if (gUnknown_0203A144->unk_07c < 0)
+    if (gUnknown_0203A144->cursorDeltaY < 0)
     {
-        gUnknown_0203A144->unk_056 --;
+        gUnknown_0203A144->cursorPosY --;
     }
-    mapSecId = sub_812386C(gUnknown_0203A144->unk_054, gUnknown_0203A144->unk_056);
+    mapSecId = sub_812386C(gUnknown_0203A144->cursorPosX, gUnknown_0203A144->cursorPosY);
     gUnknown_0203A144->unk_002 = get_flagnr_blue_points(mapSecId);
     if (mapSecId != gUnknown_0203A144->mapSecId)
     {
@@ -274,26 +275,26 @@ u8 sub_8123254(void)
     u8 input;
 
     input = INPUT_EVENT_NONE;
-    gUnknown_0203A144->unk_06a = 0;
-    gUnknown_0203A144->unk_068 = 0;
-    if (gMain.heldKeys & DPAD_UP && gUnknown_0203A144->unk_05e > -0x34)
+    gUnknown_0203A144->zoomedCursorDeltaX = 0;
+    gUnknown_0203A144->zoomedCursorDeltaY = 0;
+    if (gMain.heldKeys & DPAD_UP && gUnknown_0203A144->scrollY > -0x34)
     {
-        gUnknown_0203A144->unk_068 = -1;
+        gUnknown_0203A144->zoomedCursorDeltaY = -1;
         input = INPUT_EVENT_MOVE_START;
     }
-    if (gMain.heldKeys & DPAD_DOWN && gUnknown_0203A144->unk_05e < 0x3c)
+    if (gMain.heldKeys & DPAD_DOWN && gUnknown_0203A144->scrollY < 0x3c)
     {
-        gUnknown_0203A144->unk_068 = +1;
+        gUnknown_0203A144->zoomedCursorDeltaY = +1;
         input = INPUT_EVENT_MOVE_START;
     }
-    if (gMain.heldKeys & DPAD_LEFT && gUnknown_0203A144->unk_05c > -0x2c)
+    if (gMain.heldKeys & DPAD_LEFT && gUnknown_0203A144->scrollX > -0x2c)
     {
-        gUnknown_0203A144->unk_06a = -1;
+        gUnknown_0203A144->zoomedCursorDeltaX = -1;
         input = INPUT_EVENT_MOVE_START;
     }
-    if (gMain.heldKeys & DPAD_RIGHT && gUnknown_0203A144->unk_05c < 0xac)
+    if (gMain.heldKeys & DPAD_RIGHT && gUnknown_0203A144->scrollX < 0xac)
     {
-        gUnknown_0203A144->unk_06a = +1;
+        gUnknown_0203A144->zoomedCursorDeltaX = +1;
         input = INPUT_EVENT_MOVE_START;
     }
     if (gMain.newKeys & A_BUTTON)
@@ -307,7 +308,44 @@ u8 sub_8123254(void)
     if (input == INPUT_EVENT_MOVE_START)
     {
         gUnknown_0203A144->inputCallback = sub_8123334;
-        gUnknown_0203A144->unk_06c = 0;
+        gUnknown_0203A144->zoomedCursorMovementFrameCounter = 0;
     }
     return input;
 }
+
+u8 sub_8123334(void)
+{
+    u16 x;
+    u16 y;
+    u16 mapSecId;
+
+    gUnknown_0203A144->scrollY += gUnknown_0203A144->zoomedCursorDeltaY;
+    gUnknown_0203A144->scrollX += gUnknown_0203A144->zoomedCursorDeltaX;
+    sub_812378C(gUnknown_0203A144->scrollX, gUnknown_0203A144->scrollY);
+    gUnknown_0203A144->zoomedCursorMovementFrameCounter ++;
+    if (gUnknown_0203A144->zoomedCursorMovementFrameCounter == 8)
+    {
+        x = (gUnknown_0203A144->scrollX + 0x2c) / 8 + 1;
+        y = (gUnknown_0203A144->scrollY + 0x34) / 8 + 2;
+        if (x != gUnknown_0203A144->unk_064 || y != gUnknown_0203A144->unk_066)
+        {
+            gUnknown_0203A144->unk_064 = x;
+            gUnknown_0203A144->unk_066 = y;
+            mapSecId = sub_812386C(x, y);
+            gUnknown_0203A144->unk_002 = get_flagnr_blue_points(mapSecId);
+            if (mapSecId != gUnknown_0203A144->mapSecId)
+            {
+                gUnknown_0203A144->mapSecId = mapSecId;
+                GetMapName(gUnknown_0203A144->mapSecName, gUnknown_0203A144->mapSecId, 16);
+            }
+            sub_8123FB0();
+        }
+        gUnknown_0203A144->zoomedCursorMovementFrameCounter = 0;
+        gUnknown_0203A144->inputCallback = sub_8123254;
+        return INPUT_EVENT_MOVE_END;
+    }
+    else
+    {
+        return INPUT_EVENT_MOVE_CONT;
+    }
+}