From 8237e29a164211eb2ec4cd161eb4183cc1947fee Mon Sep 17 00:00:00 2001
From: Cheng Hann Gan <chenghanngan.us@gmail.com>
Date: Thu, 9 Sep 2021 19:22:48 -0400
Subject: Defined more in-dungeon structs and enums (#53)

* Defined DungeonEntity

* Rename EntityType enums

* Revert EntityType rename

* Defined more in-dungeon structs and enums

* Added more dungeon global structs/enums

* Prefixed dungeonGlobalData with g

* Fixed compile errors

* Removed some CRLFs

* Fixed compile after merge

* Revert Makefile

* Rename DungeonEntityData.entityType

Co-authored-by: Seth Barberee <seth.barberee@gmail.com>

* Renamed symbols per PR comments

Co-authored-by: Cheng Hann Gan <chenghann_gan@ultimatesoftware.com>
Co-authored-by: Seth Barberee <seth.barberee@gmail.com>
---
 data/dungeon/D54/floor_id.json | 550 ++++++++++++++++++++---------------------
 1 file changed, 275 insertions(+), 275 deletions(-)

(limited to 'data/dungeon/D54')

diff --git a/data/dungeon/D54/floor_id.json b/data/dungeon/D54/floor_id.json
index 8c217eb..df03c60 100644
--- a/data/dungeon/D54/floor_id.json
+++ b/data/dungeon/D54/floor_id.json
@@ -1,275 +1,275 @@
-{
-    "name": "D54FloorID",
-    "tables": [
-    {
-        "MainData": 1272,
-        "Pokemon": 526,
-        "Traps": 10,
-        "Items": 87,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1273,
-        "Pokemon": 526,
-        "Traps": 10,
-        "Items": 87,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1274,
-        "Pokemon": 527,
-        "Traps": 10,
-        "Items": 87,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1275,
-        "Pokemon": 528,
-        "Traps": 10,
-        "Items": 88,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1276,
-        "Pokemon": 529,
-        "Traps": 10,
-        "Items": 88,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1277,
-        "Pokemon": 529,
-        "Traps": 10,
-        "Items": 88,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1278,
-        "Pokemon": 530,
-        "Traps": 10,
-        "Items": 88,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1279,
-        "Pokemon": 530,
-        "Traps": 10,
-        "Items": 88,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1280,
-        "Pokemon": 530,
-        "Traps": 10,
-        "Items": 88,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1281,
-        "Pokemon": 531,
-        "Traps": 10,
-        "Items": 88,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1282,
-        "Pokemon": 531,
-        "Traps": 10,
-        "Items": 88,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1283,
-        "Pokemon": 531,
-        "Traps": 10,
-        "Items": 88,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1284,
-        "Pokemon": 531,
-        "Traps": 10,
-        "Items": 88,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1285,
-        "Pokemon": 534,
-        "Traps": 10,
-        "Items": 88,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1286,
-        "Pokemon": 534,
-        "Traps": 10,
-        "Items": 88,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1287,
-        "Pokemon": 535,
-        "Traps": 10,
-        "Items": 88,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1288,
-        "Pokemon": 535,
-        "Traps": 10,
-        "Items": 88,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1289,
-        "Pokemon": 535,
-        "Traps": 10,
-        "Items": 88,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1290,
-        "Pokemon": 535,
-        "Traps": 10,
-        "Items": 88,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1291,
-        "Pokemon": 536,
-        "Traps": 10,
-        "Items": 88,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1292,
-        "Pokemon": 536,
-        "Traps": 10,
-        "Items": 88,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1293,
-        "Pokemon": 537,
-        "Traps": 10,
-        "Items": 88,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1294,
-        "Pokemon": 537,
-        "Traps": 10,
-        "Items": 88,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1295,
-        "Pokemon": 537,
-        "Traps": 10,
-        "Items": 88,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1296,
-        "Pokemon": 537,
-        "Traps": 10,
-        "Items": 88,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1297,
-        "Pokemon": 538,
-        "Traps": 10,
-        "Items": 88,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1298,
-        "Pokemon": 538,
-        "Traps": 10,
-        "Items": 88,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1299,
-        "Pokemon": 538,
-        "Traps": 10,
-        "Items": 88,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1300,
-        "Pokemon": 538,
-        "Traps": 10,
-        "Items": 88,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1301,
-        "Pokemon": 538,
-        "Traps": 10,
-        "Items": 88,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    }
-    ]
-}
+{
+    "name": "D54FloorID",
+    "tables": [
+    {
+        "MainData": 1272,
+        "Pokemon": 526,
+        "Traps": 10,
+        "Items": 87,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1273,
+        "Pokemon": 526,
+        "Traps": 10,
+        "Items": 87,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1274,
+        "Pokemon": 527,
+        "Traps": 10,
+        "Items": 87,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1275,
+        "Pokemon": 528,
+        "Traps": 10,
+        "Items": 88,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1276,
+        "Pokemon": 529,
+        "Traps": 10,
+        "Items": 88,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1277,
+        "Pokemon": 529,
+        "Traps": 10,
+        "Items": 88,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1278,
+        "Pokemon": 530,
+        "Traps": 10,
+        "Items": 88,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1279,
+        "Pokemon": 530,
+        "Traps": 10,
+        "Items": 88,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1280,
+        "Pokemon": 530,
+        "Traps": 10,
+        "Items": 88,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1281,
+        "Pokemon": 531,
+        "Traps": 10,
+        "Items": 88,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1282,
+        "Pokemon": 531,
+        "Traps": 10,
+        "Items": 88,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1283,
+        "Pokemon": 531,
+        "Traps": 10,
+        "Items": 88,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1284,
+        "Pokemon": 531,
+        "Traps": 10,
+        "Items": 88,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1285,
+        "Pokemon": 534,
+        "Traps": 10,
+        "Items": 88,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1286,
+        "Pokemon": 534,
+        "Traps": 10,
+        "Items": 88,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1287,
+        "Pokemon": 535,
+        "Traps": 10,
+        "Items": 88,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1288,
+        "Pokemon": 535,
+        "Traps": 10,
+        "Items": 88,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1289,
+        "Pokemon": 535,
+        "Traps": 10,
+        "Items": 88,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1290,
+        "Pokemon": 535,
+        "Traps": 10,
+        "Items": 88,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1291,
+        "Pokemon": 536,
+        "Traps": 10,
+        "Items": 88,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1292,
+        "Pokemon": 536,
+        "Traps": 10,
+        "Items": 88,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1293,
+        "Pokemon": 537,
+        "Traps": 10,
+        "Items": 88,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1294,
+        "Pokemon": 537,
+        "Traps": 10,
+        "Items": 88,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1295,
+        "Pokemon": 537,
+        "Traps": 10,
+        "Items": 88,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1296,
+        "Pokemon": 537,
+        "Traps": 10,
+        "Items": 88,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1297,
+        "Pokemon": 538,
+        "Traps": 10,
+        "Items": 88,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1298,
+        "Pokemon": 538,
+        "Traps": 10,
+        "Items": 88,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1299,
+        "Pokemon": 538,
+        "Traps": 10,
+        "Items": 88,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1300,
+        "Pokemon": 538,
+        "Traps": 10,
+        "Items": 88,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1301,
+        "Pokemon": 538,
+        "Traps": 10,
+        "Items": 88,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    }
+    ]
+}
-- 
cgit v1.2.3