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/FantasyStraitAlt/floor_id.json | 352 ++++++++++++++--------------
 1 file changed, 176 insertions(+), 176 deletions(-)

(limited to 'data/dungeon/FantasyStraitAlt')

diff --git a/data/dungeon/FantasyStraitAlt/floor_id.json b/data/dungeon/FantasyStraitAlt/floor_id.json
index c7945af..b3a4e2d 100644
--- a/data/dungeon/FantasyStraitAlt/floor_id.json
+++ b/data/dungeon/FantasyStraitAlt/floor_id.json
@@ -1,176 +1,176 @@
-{
-    "name": "FantasyStraitAltFloorID",
-    "tables": [
-    {
-        "MainData": 1302,
-        "Pokemon": 526,
-        "Traps": 87,
-        "Items": 87,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1303,
-        "Pokemon": 526,
-        "Traps": 87,
-        "Items": 87,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1304,
-        "Pokemon": 527,
-        "Traps": 87,
-        "Items": 87,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1305,
-        "Pokemon": 528,
-        "Traps": 87,
-        "Items": 88,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1306,
-        "Pokemon": 529,
-        "Traps": 87,
-        "Items": 88,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1307,
-        "Pokemon": 529,
-        "Traps": 87,
-        "Items": 88,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1308,
-        "Pokemon": 530,
-        "Traps": 87,
-        "Items": 88,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1309,
-        "Pokemon": 530,
-        "Traps": 87,
-        "Items": 88,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1310,
-        "Pokemon": 530,
-        "Traps": 87,
-        "Items": 88,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1311,
-        "Pokemon": 531,
-        "Traps": 87,
-        "Items": 88,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1312,
-        "Pokemon": 531,
-        "Traps": 87,
-        "Items": 88,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1313,
-        "Pokemon": 531,
-        "Traps": 87,
-        "Items": 88,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1314,
-        "Pokemon": 531,
-        "Traps": 87,
-        "Items": 88,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1315,
-        "Pokemon": 534,
-        "Traps": 87,
-        "Items": 88,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1316,
-        "Pokemon": 534,
-        "Traps": 87,
-        "Items": 88,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1317,
-        "Pokemon": 535,
-        "Traps": 87,
-        "Items": 88,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1318,
-        "Pokemon": 535,
-        "Traps": 87,
-        "Items": 88,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1319,
-        "Pokemon": 535,
-        "Traps": 87,
-        "Items": 88,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1320,
-        "Pokemon": 535,
-        "Traps": 92,
-        "Items": 88,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    }
-    ]
-}
+{
+    "name": "FantasyStraitAltFloorID",
+    "tables": [
+    {
+        "MainData": 1302,
+        "Pokemon": 526,
+        "Traps": 87,
+        "Items": 87,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1303,
+        "Pokemon": 526,
+        "Traps": 87,
+        "Items": 87,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1304,
+        "Pokemon": 527,
+        "Traps": 87,
+        "Items": 87,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1305,
+        "Pokemon": 528,
+        "Traps": 87,
+        "Items": 88,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1306,
+        "Pokemon": 529,
+        "Traps": 87,
+        "Items": 88,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1307,
+        "Pokemon": 529,
+        "Traps": 87,
+        "Items": 88,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1308,
+        "Pokemon": 530,
+        "Traps": 87,
+        "Items": 88,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1309,
+        "Pokemon": 530,
+        "Traps": 87,
+        "Items": 88,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1310,
+        "Pokemon": 530,
+        "Traps": 87,
+        "Items": 88,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1311,
+        "Pokemon": 531,
+        "Traps": 87,
+        "Items": 88,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1312,
+        "Pokemon": 531,
+        "Traps": 87,
+        "Items": 88,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1313,
+        "Pokemon": 531,
+        "Traps": 87,
+        "Items": 88,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1314,
+        "Pokemon": 531,
+        "Traps": 87,
+        "Items": 88,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1315,
+        "Pokemon": 534,
+        "Traps": 87,
+        "Items": 88,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1316,
+        "Pokemon": 534,
+        "Traps": 87,
+        "Items": 88,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1317,
+        "Pokemon": 535,
+        "Traps": 87,
+        "Items": 88,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1318,
+        "Pokemon": 535,
+        "Traps": 87,
+        "Items": 88,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1319,
+        "Pokemon": 535,
+        "Traps": 87,
+        "Items": 88,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1320,
+        "Pokemon": 535,
+        "Traps": 92,
+        "Items": 88,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    }
+    ]
+}
-- 
cgit v1.2.3