Decomped InSameRoom_2()

1 files changed, 50 insertions, 0 deletions

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;
+    }
+}