From b1fc911965c584f5af6522849162527f41461b7c Mon Sep 17 00:00:00 2001
From: AnonymousRandomPerson <chenghanngan.us@gmail.com>
Date: Tue, 14 Dec 2021 23:36:22 -0500
Subject: Decomped InSameRoom_2()

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

(limited to 'src/dungeon_range.c')

diff --git a/src/dungeon_range.c b/src/dungeon_range.c
new file mode 100644
index 0000000..d915677
--- /dev/null
+++ b/src/dungeon_range.c
@@ -0,0 +1,50 @@
+#include "global.h"
+#include "dungeon_range.h"
+
+#include "dungeon_global_data.h"
+#include "map.h"
+
+extern struct DungeonGlobalData *gDungeonGlobalData;
+extern struct MapTile* GetMapTileAtPosition(s16, s16);
+
+bool8 InSameRoom_2(struct Position *pos1, struct Position *pos2)
+{
+    u8 pos1RoomIndex;
+    u8 visibility = gDungeonGlobalData->visibility;
+    struct MapTile *tile1;
+    if (visibility == 0)
+    {
+        visibility = 2;
+    }
+    tile1 = GetMapTileAtPosition(pos1->x, pos1->y);
+    pos1RoomIndex = tile1->roomIndex;
+    if (pos1RoomIndex == CORRIDOR_ROOM_INDEX)
+    {
+        s32 xDiff = pos1->x - pos2->x;
+        s32 yDiff;
+        xDiff = xDiff < 0 ? -xDiff : xDiff;
+        if (xDiff > visibility)
+        {
+            return FALSE;
+        }
+
+        yDiff = pos1->y - pos2->y;
+        yDiff = yDiff < 0 ? -yDiff : yDiff;
+        if (yDiff > visibility)
+        {
+            return FALSE;
+        }
+        returnTrue:
+        return TRUE;
+    }
+    else
+    {
+        struct MapRoom *pos1Room = &gDungeonGlobalData->roomData[pos1RoomIndex];
+        if (pos1Room->startX - 1 > pos2->x || pos1Room->startY - 1 > pos2->y ||
+            pos1Room->endX + 1 <= pos2->x || pos1Room->endY + 1 <= pos2->y)
+        {
+            return FALSE;
+        }
+        goto returnTrue;
+    }
+}
-- 
cgit v1.2.3


From c033aea36e73365c28da1de93af29ec11b3945b2 Mon Sep 17 00:00:00 2001
From: AnonymousRandomPerson <chenghanngan.us@gmail.com>
Date: Fri, 17 Dec 2021 23:39:50 -0500
Subject: Moved gDungeonGlobalData definition to dungeon_global_data.h

---
 src/dungeon_range.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/dungeon_range.c')

diff --git a/src/dungeon_range.c b/src/dungeon_range.c
index d915677..86d0f7c 100644
--- a/src/dungeon_range.c
+++ b/src/dungeon_range.c
@@ -4,7 +4,6 @@
 #include "dungeon_global_data.h"
 #include "map.h"
 
-extern struct DungeonGlobalData *gDungeonGlobalData;
 extern struct MapTile* GetMapTileAtPosition(s16, s16);
 
 bool8 InSameRoom_2(struct Position *pos1, struct Position *pos2)
-- 
cgit v1.2.3


From 0369264407563b64d60c885f8bf79322b6f663c8 Mon Sep 17 00:00:00 2001
From: AnonymousRandomPerson <chenghanngan.us@gmail.com>
Date: Sat, 18 Dec 2021 00:22:03 -0500
Subject: Decomped GetMapTileAtPosition()

---
 src/dungeon_range.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/dungeon_range.c')

diff --git a/src/dungeon_range.c b/src/dungeon_range.c
index 86d0f7c..facd71d 100644
--- a/src/dungeon_range.c
+++ b/src/dungeon_range.c
@@ -2,10 +2,9 @@
 #include "dungeon_range.h"
 
 #include "dungeon_global_data.h"
+#include "dungeon_map_access.h"
 #include "map.h"
 
-extern struct MapTile* GetMapTileAtPosition(s16, s16);
-
 bool8 InSameRoom_2(struct Position *pos1, struct Position *pos2)
 {
     u8 pos1RoomIndex;
-- 
cgit v1.2.3