diff --git a/Source/drlg_l1.cpp b/Source/drlg_l1.cpp
index f550cb675..caa3a3557 100644
--- a/Source/drlg_l1.cpp
+++ b/Source/drlg_l1.cpp
@@ -2050,24 +2050,19 @@ void LoadPreL1Dungeon(const char *path)
 	memcpy(pdungeon, dungeon, sizeof(pdungeon));
 }
 
-void LoadL1Dungeon(const char *path, int vx, int vy)
+void LoadL1Dungeon(const char *path, Point spawn)
 {
-	ViewPosition = { vx, vy };
-
-	DRLG_Init_Globals();
-
-	memset(dungeon, 22, sizeof(dungeon));
-
-	auto dunData = LoadFileInMem<uint16_t>(path);
-	PlaceDunTiles(dunData.get(), { 0, 0 }, Tile::Floor);
+	LoadDungeonBase(path, spawn, Tile::Floor, 22);
 
 	if (leveltype == DTYPE_CATHEDRAL)
 		FillFloor();
 
 	Pass3();
 
-	SetMapMonsters(dunData.get(), Point(0, 0).megaToWorld());
-	SetMapObjects(dunData.get(), 0, 0);
+	if (leveltype == DTYPE_CRYPT)
+		AddCryptObjects(0, 0, MAXDUNX, MAXDUNY);
+	else
+		AddL1Objs(0, 0, MAXDUNX, MAXDUNY);
 }
 
 } // namespace devilution
diff --git a/Source/drlg_l1.h b/Source/drlg_l1.h
index 86e5580b5..efc951123 100644
--- a/Source/drlg_l1.h
+++ b/Source/drlg_l1.h
@@ -15,8 +15,8 @@ extern bool IsUberRoomOpened;
 extern bool IsUberLeverActivated;
 extern int UberDiabloMonsterIndex;
 
-void LoadL1Dungeon(const char *path, int vx, int vy);
-void LoadPreL1Dungeon(const char *path);
 void CreateL5Dungeon(uint32_t rseed, lvl_entry entry);
+void LoadPreL1Dungeon(const char *path);
+void LoadL1Dungeon(const char *path, Point spawn);
 
 } // namespace devilution
diff --git a/Source/drlg_l2.cpp b/Source/drlg_l2.cpp
index eb783845c..669dab876 100644
--- a/Source/drlg_l2.cpp
+++ b/Source/drlg_l2.cpp
@@ -2876,21 +2876,13 @@ void LoadPreL2Dungeon(const char *path)
 	memcpy(pdungeon, dungeon, sizeof(pdungeon));
 }
 
-void LoadL2Dungeon(const char *path, int vx, int vy)
+void LoadL2Dungeon(const char *path, Point spawn)
 {
-	ViewPosition = { vx, vy };
-
-	DRLG_Init_Globals();
-
-	memset(dungeon, 12, sizeof(dungeon));
-
-	auto dunData = LoadFileInMem<uint16_t>(path);
-	PlaceDunTiles(dunData.get(), { 0, 0 }, 3);
+	LoadDungeonBase(path, spawn, 3, 12);
 
 	Pass3();
 
-	SetMapMonsters(dunData.get(), Point(0, 0).megaToWorld());
-	SetMapObjects(dunData.get(), 0, 0);
+	AddL2Objs(0, 0, MAXDUNX, MAXDUNY);
 }
 
 } // namespace devilution
diff --git a/Source/drlg_l2.h b/Source/drlg_l2.h
index 707c207cd..e2d310930 100644
--- a/Source/drlg_l2.h
+++ b/Source/drlg_l2.h
@@ -26,8 +26,8 @@ struct ROOMNODE {
 
 extern BYTE predungeon[DMAXX][DMAXY];
 
-void LoadL2Dungeon(const char *path, int vx, int vy);
-void LoadPreL2Dungeon(const char *path);
 void CreateL2Dungeon(uint32_t rseed, lvl_entry entry);
+void LoadPreL2Dungeon(const char *path);
+void LoadL2Dungeon(const char *path, Point spawn);
 
 } // namespace devilution
diff --git a/Source/drlg_l3.cpp b/Source/drlg_l3.cpp
index 1b0bfedd8..5b2f949d9 100644
--- a/Source/drlg_l3.cpp
+++ b/Source/drlg_l3.cpp
@@ -2250,22 +2250,15 @@ void LoadPreL3Dungeon(const char *path)
 	memcpy(pdungeon, dungeon, sizeof(pdungeon));
 }
 
-void LoadL3Dungeon(const char *path, int vx, int vy)
+void LoadL3Dungeon(const char *path, Point spawn)
 {
-	ViewPosition = { vx, vy };
-
-	DRLG_Init_Globals();
-
-	memset(dungeon, 8, sizeof(dungeon));
-
-	auto dunData = LoadFileInMem<uint16_t>(path);
-	PlaceDunTiles(dunData.get(), { 0, 0 }, 7);
+	LoadDungeonBase(path, spawn, 7, 8);
 
 	Pass3();
 	PlaceLights();
 
-	SetMapMonsters(dunData.get(), Point(0, 0).megaToWorld());
-	SetMapObjects(dunData.get(), 0, 0);
+	if (leveltype == DTYPE_CAVES)
+		AddL3Objs(0, 0, MAXDUNX, MAXDUNY);
 }
 
 } // namespace devilution
diff --git a/Source/drlg_l3.h b/Source/drlg_l3.h
index 6be5e7572..880c8ddb6 100644
--- a/Source/drlg_l3.h
+++ b/Source/drlg_l3.h
@@ -10,7 +10,8 @@
 namespace devilution {
 
 void CreateL3Dungeon(uint32_t rseed, lvl_entry entry);
-void LoadL3Dungeon(const char *sFileName, int vx, int vy);
 void LoadPreL3Dungeon(const char *sFileName);
+void LoadL3Dungeon(const char *sFileName, Point spawn);
+;
 
 } // namespace devilution
diff --git a/Source/drlg_l4.cpp b/Source/drlg_l4.cpp
index 63d47e2ba..afbcd063c 100644
--- a/Source/drlg_l4.cpp
+++ b/Source/drlg_l4.cpp
@@ -1293,21 +1293,11 @@ void LoadPreL4Dungeon(const char *path)
 	memcpy(pdungeon, dungeon, sizeof(pdungeon));
 }
 
-void LoadL4Dungeon(const char *path, int vx, int vy)
+void LoadL4Dungeon(const char *path, Point spawn)
 {
-	ViewPosition = { vx, vy };
-
-	DRLG_Init_Globals();
-
-	memset(dungeon, 30, sizeof(dungeon));
-
-	auto dunData = LoadFileInMem<uint16_t>(path);
-	PlaceDunTiles(dunData.get(), { 0, 0 }, 6);
+	LoadDungeonBase(path, spawn, 6, 30);
 
 	Pass3();
-
-	SetMapMonsters(dunData.get(), Point(0, 0).megaToWorld());
-	SetMapObjects(dunData.get(), 0, 0);
 }
 
 } // namespace devilution
diff --git a/Source/drlg_l4.h b/Source/drlg_l4.h
index 2a55e588e..1e8235235 100644
--- a/Source/drlg_l4.h
+++ b/Source/drlg_l4.h
@@ -13,8 +13,9 @@ extern Point DiabloQuad1;
 extern Point DiabloQuad2;
 extern Point DiabloQuad3;
 extern Point DiabloQuad4;
+
 void CreateL4Dungeon(uint32_t rseed, lvl_entry entry);
-void LoadL4Dungeon(const char *path, int vx, int vy);
 void LoadPreL4Dungeon(const char *path);
+void LoadL4Dungeon(const char *path, Point spawn);
 
 } // namespace devilution
diff --git a/Source/gendung.cpp b/Source/gendung.cpp
index f489b0787..d32ddda3a 100644
--- a/Source/gendung.cpp
+++ b/Source/gendung.cpp
@@ -373,6 +373,25 @@ void FindTransparencyValues(Point floor, uint8_t floorID)
 	}
 }
 
+void InitGlobals()
+{
+	memset(dFlags, 0, sizeof(dFlags));
+	memset(dPlayer, 0, sizeof(dPlayer));
+	memset(dMonster, 0, sizeof(dMonster));
+	memset(dCorpse, 0, sizeof(dCorpse));
+	memset(dItem, 0, sizeof(dItem));
+	memset(dObject, 0, sizeof(dObject));
+	memset(dSpecial, 0, sizeof(dSpecial));
+	memset(dLight, DisableLighting ? 0 : 15, sizeof(dLight));
+
+	DRLG_InitTrans();
+
+	dminPosition = Point(0, 0).megaToWorld();
+	dmaxPosition = Point(40, 40).megaToWorld();
+	SetPieceRoom = { { -1, -1 }, { -1, -1 } };
+	SetPiece = { { 0, 0 }, { 0, 0 } };
+}
+
 } // namespace
 
 dungeon_type GetLevelType(int level)
@@ -397,7 +416,7 @@ dungeon_type GetLevelType(int level)
 
 void CreateDungeon(uint32_t rseed, lvl_entry entry)
 {
-	DRLG_Init_Globals();
+	InitGlobals();
 
 	switch (leveltype) {
 	case DTYPE_TOWN:
@@ -509,10 +528,41 @@ void DRLG_CopyTrans(int sx, int sy, int dx, int dy)
 	dTransVal[dx][dy] = dTransVal[sx][sy];
 }
 
-void DRLG_InitSetPC()
+void LoadTransparency(const uint16_t *dunData)
 {
-	SetPieceRoom = { { -1, -1 }, { -1, -1 } };
-	SetPiece = { { 0, 0 }, { 0, 0 } };
+	int width = SDL_SwapLE16(dunData[0]);
+	int height = SDL_SwapLE16(dunData[1]);
+
+	int layer2Offset = 2 + width * height;
+
+	// The rest of the layers are at dPiece scale
+	width *= 2;
+	height *= 2;
+
+	const uint16_t *transparentLayer = &dunData[layer2Offset + width * height * 3];
+
+	for (int j = 0; j < height; j++) {
+		for (int i = 0; i < width; i++) {
+			dTransVal[16 + i][16 + j] = SDL_SwapLE16(*transparentLayer);
+			transparentLayer++;
+		}
+	}
+}
+
+void LoadDungeonBase(const char *path, Point spawn, int floorId, int dirtId)
+{
+	ViewPosition = spawn;
+
+	InitGlobals();
+
+	memset(dungeon, dirtId, sizeof(dungeon));
+
+	auto dunData = LoadFileInMem<uint16_t>(path);
+	PlaceDunTiles(dunData.get(), { 0, 0 }, floorId);
+	LoadTransparency(dunData.get());
+
+	SetMapMonsters(dunData.get(), Point(0, 0).megaToWorld());
+	SetMapObjects(dunData.get(), 0, 0);
 }
 
 void Make_SetPC(Rectangle area)
@@ -700,23 +750,6 @@ void DRLG_LPass3(int lv)
 	}
 }
 
-void DRLG_Init_Globals()
-{
-	dminPosition = Point(0, 0).megaToWorld();
-	dmaxPosition = Point(40, 40).megaToWorld();
-	memset(dItem, 0, sizeof(dItem));
-	memset(dFlags, 0, sizeof(dFlags));
-	memset(dPlayer, 0, sizeof(dPlayer));
-	memset(dMonster, 0, sizeof(dMonster));
-	memset(dCorpse, 0, sizeof(dCorpse));
-	memset(dObject, 0, sizeof(dObject));
-	memset(dSpecial, 0, sizeof(dSpecial));
-	int8_t c = DisableLighting ? 0 : 15;
-	memset(dLight, c, sizeof(dLight));
-	DRLG_InitTrans();
-	DRLG_InitSetPC();
-}
-
 bool SkipThemeRoom(int x, int y)
 {
 	for (int i = 0; i < themeCount; i++) {
diff --git a/Source/gendung.h b/Source/gendung.h
index f92306645..a756cc28f 100644
--- a/Source/gendung.h
+++ b/Source/gendung.h
@@ -185,7 +185,7 @@ extern DVL_API_FOR_TEST int dPiece[MAXDUNX][MAXDUNY];
 extern MICROS dpiece_defs_map_2[MAXDUNX][MAXDUNY];
 /** Specifies the transparency at each coordinate of the map. */
 extern DVL_API_FOR_TEST int8_t dTransVal[MAXDUNX][MAXDUNY];
-extern DVL_API_FOR_TEST char dLight[MAXDUNX][MAXDUNY];
+extern char dLight[MAXDUNX][MAXDUNY];
 extern char dPreLight[MAXDUNX][MAXDUNY];
 /** Holds various information about dungeon tiles, @see DungeonFlag */
 extern DungeonFlag dFlags[MAXDUNX][MAXDUNY];
@@ -323,7 +323,8 @@ void DRLG_MRectTrans(Point origin, Point extent);
 void DRLG_MRectTrans(Rectangle area);
 void DRLG_RectTrans(Rectangle area);
 void DRLG_CopyTrans(int sx, int sy, int dx, int dy);
-void DRLG_InitSetPC();
+void LoadTransparency(const uint16_t *dunData);
+void LoadDungeonBase(const char *path, Point spawn, int floorId, int dirtId);
 void Make_SetPC(Rectangle area);
 /**
  * @param tries Tiles to try, 1600 will scan the full map
@@ -336,7 +337,6 @@ void DRLG_HoldThemeRooms();
 void SetSetPieceRoom(Point position, int floorId);
 void FreeQuestSetPieces();
 void DRLG_LPass3(int lv);
-void DRLG_Init_Globals();
 bool SkipThemeRoom(int x, int y);
 void InitLevels();
 void FloodTransparencyValues(uint8_t floorID);
diff --git a/Source/lighting.h b/Source/lighting.h
index a4a80ca58..af003a718 100644
--- a/Source/lighting.h
+++ b/Source/lighting.h
@@ -47,7 +47,7 @@ extern uint8_t ActiveLights[MAXLIGHTS];
 extern int ActiveLightCount;
 constexpr char LightsMax = 15;
 extern std::array<uint8_t, LIGHTSIZE> LightTables;
-extern DVL_API_FOR_TEST bool DisableLighting;
+extern bool DisableLighting;
 extern bool UpdateLighting;
 
 void DoLighting(Point position, int nRadius, int Lnum);
diff --git a/Source/setmaps.cpp b/Source/setmaps.cpp
index d7943b99b..ffdb189dd 100644
--- a/Source/setmaps.cpp
+++ b/Source/setmaps.cpp
@@ -13,6 +13,7 @@
 #include "drlg_l3.h"
 #include "drlg_l4.h"
 #include "engine/load_file.hpp"
+#include "gendung.h"
 #include "objdat.h"
 #include "objects.h"
 #include "palette.h"
@@ -65,24 +66,7 @@ void AddVileObjs()
 void SetMapTransparency(const char *path)
 {
 	auto dunData = LoadFileInMem<uint16_t>(path);
-
-	int width = SDL_SwapLE16(dunData[0]);
-	int height = SDL_SwapLE16(dunData[1]);
-
-	int layer2Offset = 2 + width * height;
-
-	// The rest of the layers are at dPiece scale
-	width *= 2;
-	height *= 2;
-
-	const uint16_t *transparentLayer = &dunData[layer2Offset + width * height * 3];
-
-	for (int j = 0; j < height; j++) {
-		for (int i = 0; i < width; i++) {
-			dTransVal[16 + i][16 + j] = SDL_SwapLE16(*transparentLayer);
-			transparentLayer++;
-		}
-	}
+	LoadTransparency(dunData.get());
 }
 
 } // namespace
@@ -96,19 +80,17 @@ void LoadSetMap()
 			Quests[Q_SKELKING]._qvar1 = 1;
 		}
 		LoadPreL1Dungeon("Levels\\L1Data\\SklKng1.DUN");
-		LoadL1Dungeon("Levels\\L1Data\\SklKng2.DUN", 83, 45);
-		LoadPalette("Levels\\L1Data\\L1_2.pal");
+		LoadL1Dungeon("Levels\\L1Data\\SklKng2.DUN", { 83, 45 });
 		SetMapTransparency("Levels\\L1Data\\SklKngT.dun");
-		AddL1Objs(0, 0, MAXDUNX, MAXDUNY);
+		LoadPalette("Levels\\L1Data\\L1_2.pal");
 		AddSKingObjs();
 		InitSKingTriggers();
 		break;
 	case SL_BONECHAMB:
 		LoadPreL2Dungeon("Levels\\L2Data\\Bonecha2.DUN");
-		LoadL2Dungeon("Levels\\L2Data\\Bonecha1.DUN", 69, 39);
-		LoadPalette("Levels\\L2Data\\L2_2.pal");
+		LoadL2Dungeon("Levels\\L2Data\\Bonecha1.DUN", { 69, 39 });
 		SetMapTransparency("Levels\\L2Data\\BonechaT.dun");
-		AddL2Objs(0, 0, MAXDUNX, MAXDUNY);
+		LoadPalette("Levels\\L2Data\\L2_2.pal");
 		AddSChamObjs();
 		InitSChambTriggers();
 		break;
@@ -117,7 +99,7 @@ void LoadSetMap()
 	case SL_POISONWATER:
 		if (Quests[Q_PWATER]._qactive == QUEST_INIT)
 			Quests[Q_PWATER]._qactive = QUEST_ACTIVE;
-		LoadL3Dungeon("Levels\\L3Data\\Foulwatr.DUN", 31, 83);
+		LoadL3Dungeon("Levels\\L3Data\\Foulwatr.DUN", { 31, 83 });
 		LoadPalette("Levels\\L3Data\\L3pfoul.pal");
 		InitPWaterTriggers();
 		break;
@@ -128,50 +110,34 @@ void LoadSetMap()
 			Quests[Q_BETRAYER]._qvar2 = 3;
 		}
 		LoadPreL1Dungeon("Levels\\L1Data\\Vile1.DUN");
-		LoadL1Dungeon("Levels\\L1Data\\Vile2.DUN", 35, 36);
+		LoadL1Dungeon("Levels\\L1Data\\Vile2.DUN", { 35, 36 });
+		SetMapTransparency("Levels\\L1Data\\Vile1.DUN");
 		LoadPalette("Levels\\L1Data\\L1_2.pal");
-		AddL1Objs(0, 0, MAXDUNX, MAXDUNY);
 		AddVileObjs();
-		SetMapTransparency("Levels\\L1Data\\Vile1.DUN");
 		InitNoTriggers();
 		break;
 	case SL_NONE:
 #ifdef _DEBUG
 		switch (setlvltype) {
 		case DTYPE_CATHEDRAL:
-			LoadPreL1Dungeon(TestMapPath.c_str());
-			LoadL1Dungeon(TestMapPath.c_str(), ViewPosition.x, ViewPosition.y);
-			AddL1Objs(0, 0, MAXDUNX, MAXDUNY);
+		case DTYPE_CRYPT:
+			LoadL1Dungeon(TestMapPath.c_str(), ViewPosition);
 			break;
 		case DTYPE_CATACOMBS:
-			LoadPreL2Dungeon(TestMapPath.c_str());
-			LoadL2Dungeon(TestMapPath.c_str(), ViewPosition.x, ViewPosition.y);
-			AddL2Objs(0, 0, MAXDUNX, MAXDUNY);
+			LoadL2Dungeon(TestMapPath.c_str(), ViewPosition);
 			break;
 		case DTYPE_CAVES:
-			LoadPreL3Dungeon(TestMapPath.c_str());
-			LoadL3Dungeon(TestMapPath.c_str(), ViewPosition.x, ViewPosition.y);
-			AddL3Objs(0, 0, MAXDUNX, MAXDUNY);
-			break;
-		case DTYPE_HELL:
-			LoadPreL4Dungeon(TestMapPath.c_str());
-			LoadL4Dungeon(TestMapPath.c_str(), ViewPosition.x, ViewPosition.y);
-			break;
 		case DTYPE_NEST:
-			LoadPreL3Dungeon(TestMapPath.c_str());
-			LoadL3Dungeon(TestMapPath.c_str(), ViewPosition.x, ViewPosition.y);
+			LoadL3Dungeon(TestMapPath.c_str(), ViewPosition);
 			break;
-		case DTYPE_CRYPT:
-			LoadPreL1Dungeon(TestMapPath.c_str());
-			LoadL1Dungeon(TestMapPath.c_str(), ViewPosition.x, ViewPosition.y);
-			AddCryptObjects(0, 0, MAXDUNX, MAXDUNY);
+		case DTYPE_HELL:
+			LoadL4Dungeon(TestMapPath.c_str(), ViewPosition);
 			break;
 		case DTYPE_TOWN:
 		case DTYPE_NONE:
 			break;
 		}
 		LoadRndLvlPal(setlvltype);
-		SetMapTransparency(TestMapPath.c_str());
 		InitNoTriggers();
 #endif
 		break;
diff --git a/test/drlg_l1_test.cpp b/test/drlg_l1_test.cpp
index 72cfd66b2..93bf8b6cf 100644
--- a/test/drlg_l1_test.cpp
+++ b/test/drlg_l1_test.cpp
@@ -1,8 +1,6 @@
 #include <gtest/gtest.h>
 
 #include "drlg_test.hpp"
-#include "gendung.h"
-#include "lighting.h"
 #include "player.h"
 #include "quests.h"
 
@@ -10,20 +8,6 @@ using namespace devilution;
 
 namespace {
 
-TEST(Drlg_l1, DRLG_Init_Globals_noflag)
-{
-	DisableLighting = false;
-	DRLG_Init_Globals();
-	EXPECT_EQ(dLight[0][0], 15);
-}
-
-TEST(Drlg_l1, DRLG_Init_Globals)
-{
-	DisableLighting = true;
-	DRLG_Init_Globals();
-	EXPECT_EQ(dLight[0][0], 0);
-}
-
 TEST(Drlg_l1, CreateL5Dungeon_diablo_1_2588)
 {
 	LoadExpectedLevelData("diablo/1-2588.dun");