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/WondrousSea/floor_id.json | 226 ++++++++++++++++-----------------
 1 file changed, 113 insertions(+), 113 deletions(-)

(limited to 'data/dungeon/WondrousSea')

diff --git a/data/dungeon/WondrousSea/floor_id.json b/data/dungeon/WondrousSea/floor_id.json
index 93274a2..6c47397 100644
--- a/data/dungeon/WondrousSea/floor_id.json
+++ b/data/dungeon/WondrousSea/floor_id.json
@@ -1,113 +1,113 @@
-{
-    "name": "WondrousSeaFloorID",
-    "tables": [
-    {
-        "MainData": 965,
-        "Pokemon": 448,
-        "Traps": 63,
-        "Items": 87,
-        "KecleonShop": 19,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 66
-    },
-    {
-        "MainData": 966,
-        "Pokemon": 448,
-        "Traps": 63,
-        "Items": 87,
-        "KecleonShop": 19,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 66
-    },
-    {
-        "MainData": 967,
-        "Pokemon": 448,
-        "Traps": 63,
-        "Items": 87,
-        "KecleonShop": 19,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 66
-    },
-    {
-        "MainData": 968,
-        "Pokemon": 448,
-        "Traps": 63,
-        "Items": 88,
-        "KecleonShop": 19,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 66
-    },
-    {
-        "MainData": 969,
-        "Pokemon": 448,
-        "Traps": 63,
-        "Items": 88,
-        "KecleonShop": 19,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 66
-    },
-    {
-        "MainData": 970,
-        "Pokemon": 448,
-        "Traps": 63,
-        "Items": 88,
-        "KecleonShop": 19,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 66
-    },
-    {
-        "MainData": 971,
-        "Pokemon": 448,
-        "Traps": 63,
-        "Items": 88,
-        "KecleonShop": 19,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 66
-    },
-    {
-        "MainData": 972,
-        "Pokemon": 448,
-        "Traps": 63,
-        "Items": 88,
-        "KecleonShop": 19,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 66
-    },
-    {
-        "MainData": 973,
-        "Pokemon": 448,
-        "Traps": 63,
-        "Items": 88,
-        "KecleonShop": 19,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 66
-    },
-    {
-        "MainData": 974,
-        "Pokemon": 448,
-        "Traps": 63,
-        "Items": 88,
-        "KecleonShop": 19,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 66
-    },
-    {
-        "MainData": 975,
-        "Pokemon": 448,
-        "Traps": 63,
-        "Items": 88,
-        "KecleonShop": 19,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 66
-    },
-    {
-        "MainData": 976,
-        "Pokemon": 448,
-        "Traps": 85,
-        "Items": 88,
-        "KecleonShop": 19,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 66
-    }
-    ]
-}
+{
+    "name": "WondrousSeaFloorID",
+    "tables": [
+    {
+        "MainData": 965,
+        "Pokemon": 448,
+        "Traps": 63,
+        "Items": 87,
+        "KecleonShop": 19,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 66
+    },
+    {
+        "MainData": 966,
+        "Pokemon": 448,
+        "Traps": 63,
+        "Items": 87,
+        "KecleonShop": 19,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 66
+    },
+    {
+        "MainData": 967,
+        "Pokemon": 448,
+        "Traps": 63,
+        "Items": 87,
+        "KecleonShop": 19,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 66
+    },
+    {
+        "MainData": 968,
+        "Pokemon": 448,
+        "Traps": 63,
+        "Items": 88,
+        "KecleonShop": 19,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 66
+    },
+    {
+        "MainData": 969,
+        "Pokemon": 448,
+        "Traps": 63,
+        "Items": 88,
+        "KecleonShop": 19,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 66
+    },
+    {
+        "MainData": 970,
+        "Pokemon": 448,
+        "Traps": 63,
+        "Items": 88,
+        "KecleonShop": 19,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 66
+    },
+    {
+        "MainData": 971,
+        "Pokemon": 448,
+        "Traps": 63,
+        "Items": 88,
+        "KecleonShop": 19,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 66
+    },
+    {
+        "MainData": 972,
+        "Pokemon": 448,
+        "Traps": 63,
+        "Items": 88,
+        "KecleonShop": 19,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 66
+    },
+    {
+        "MainData": 973,
+        "Pokemon": 448,
+        "Traps": 63,
+        "Items": 88,
+        "KecleonShop": 19,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 66
+    },
+    {
+        "MainData": 974,
+        "Pokemon": 448,
+        "Traps": 63,
+        "Items": 88,
+        "KecleonShop": 19,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 66
+    },
+    {
+        "MainData": 975,
+        "Pokemon": 448,
+        "Traps": 63,
+        "Items": 88,
+        "KecleonShop": 19,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 66
+    },
+    {
+        "MainData": 976,
+        "Pokemon": 448,
+        "Traps": 85,
+        "Items": 88,
+        "KecleonShop": 19,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 66
+    }
+    ]
+}
-- 
cgit v1.2.3