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/UnownRelic/floor_id.json | 208 +++++++++++++++++-----------------
 1 file changed, 104 insertions(+), 104 deletions(-)

(limited to 'data/dungeon/UnownRelic')

diff --git a/data/dungeon/UnownRelic/floor_id.json b/data/dungeon/UnownRelic/floor_id.json
index 4e57902..caa3d81 100644
--- a/data/dungeon/UnownRelic/floor_id.json
+++ b/data/dungeon/UnownRelic/floor_id.json
@@ -1,104 +1,104 @@
-{
-    "name": "UnownRelicFloorID",
-    "tables": [
-    {
-        "MainData": 1340,
-        "Pokemon": 600,
-        "Traps": 7,
-        "Items": 154,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 155
-    },
-    {
-        "MainData": 1341,
-        "Pokemon": 601,
-        "Traps": 7,
-        "Items": 154,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 155
-    },
-    {
-        "MainData": 1342,
-        "Pokemon": 602,
-        "Traps": 7,
-        "Items": 154,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 155
-    },
-    {
-        "MainData": 1343,
-        "Pokemon": 603,
-        "Traps": 7,
-        "Items": 156,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 155
-    },
-    {
-        "MainData": 1344,
-        "Pokemon": 604,
-        "Traps": 7,
-        "Items": 156,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 155
-    },
-    {
-        "MainData": 1345,
-        "Pokemon": 605,
-        "Traps": 7,
-        "Items": 156,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 155
-    },
-    {
-        "MainData": 1346,
-        "Pokemon": 606,
-        "Traps": 7,
-        "Items": 156,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 155
-    },
-    {
-        "MainData": 1347,
-        "Pokemon": 607,
-        "Traps": 7,
-        "Items": 156,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 155
-    },
-    {
-        "MainData": 1348,
-        "Pokemon": 608,
-        "Traps": 7,
-        "Items": 156,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 155
-    },
-    {
-        "MainData": 1349,
-        "Pokemon": 609,
-        "Traps": 9,
-        "Items": 156,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 155
-    },
-    {
-        "MainData": 1350,
-        "Pokemon": 610,
-        "Traps": 9,
-        "Items": 156,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 155
-    }
-    ]
-}
+{
+    "name": "UnownRelicFloorID",
+    "tables": [
+    {
+        "MainData": 1340,
+        "Pokemon": 600,
+        "Traps": 7,
+        "Items": 154,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 155
+    },
+    {
+        "MainData": 1341,
+        "Pokemon": 601,
+        "Traps": 7,
+        "Items": 154,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 155
+    },
+    {
+        "MainData": 1342,
+        "Pokemon": 602,
+        "Traps": 7,
+        "Items": 154,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 155
+    },
+    {
+        "MainData": 1343,
+        "Pokemon": 603,
+        "Traps": 7,
+        "Items": 156,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 155
+    },
+    {
+        "MainData": 1344,
+        "Pokemon": 604,
+        "Traps": 7,
+        "Items": 156,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 155
+    },
+    {
+        "MainData": 1345,
+        "Pokemon": 605,
+        "Traps": 7,
+        "Items": 156,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 155
+    },
+    {
+        "MainData": 1346,
+        "Pokemon": 606,
+        "Traps": 7,
+        "Items": 156,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 155
+    },
+    {
+        "MainData": 1347,
+        "Pokemon": 607,
+        "Traps": 7,
+        "Items": 156,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 155
+    },
+    {
+        "MainData": 1348,
+        "Pokemon": 608,
+        "Traps": 7,
+        "Items": 156,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 155
+    },
+    {
+        "MainData": 1349,
+        "Pokemon": 609,
+        "Traps": 9,
+        "Items": 156,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 155
+    },
+    {
+        "MainData": 1350,
+        "Pokemon": 610,
+        "Traps": 9,
+        "Items": 156,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 155
+    }
+    ]
+}
-- 
cgit v1.2.3