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/UproarForest/floor_id.json | 190 ++++++++++++++++----------------
 1 file changed, 95 insertions(+), 95 deletions(-)

(limited to 'data/dungeon/UproarForest')

diff --git a/data/dungeon/UproarForest/floor_id.json b/data/dungeon/UproarForest/floor_id.json
index f9c5723..d09025d 100644
--- a/data/dungeon/UproarForest/floor_id.json
+++ b/data/dungeon/UproarForest/floor_id.json
@@ -1,95 +1,95 @@
-{
-    "name": "UproarForestFloorID",
-    "tables": [
-    {
-        "MainData": 1026,
-        "Pokemon": 475,
-        "Traps": 10,
-        "Items": 115,
-        "KecleonShop": 37,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 66
-    },
-    {
-        "MainData": 1027,
-        "Pokemon": 475,
-        "Traps": 10,
-        "Items": 115,
-        "KecleonShop": 37,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 66
-    },
-    {
-        "MainData": 1028,
-        "Pokemon": 475,
-        "Traps": 10,
-        "Items": 115,
-        "KecleonShop": 37,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 66
-    },
-    {
-        "MainData": 1029,
-        "Pokemon": 476,
-        "Traps": 10,
-        "Items": 116,
-        "KecleonShop": 37,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 66
-    },
-    {
-        "MainData": 1030,
-        "Pokemon": 477,
-        "Traps": 10,
-        "Items": 116,
-        "KecleonShop": 37,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 66
-    },
-    {
-        "MainData": 1031,
-        "Pokemon": 478,
-        "Traps": 10,
-        "Items": 116,
-        "KecleonShop": 37,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 66
-    },
-    {
-        "MainData": 1032,
-        "Pokemon": 479,
-        "Traps": 10,
-        "Items": 116,
-        "KecleonShop": 37,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 66
-    },
-    {
-        "MainData": 1033,
-        "Pokemon": 480,
-        "Traps": 10,
-        "Items": 116,
-        "KecleonShop": 37,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 66
-    },
-    {
-        "MainData": 1034,
-        "Pokemon": 480,
-        "Traps": 10,
-        "Items": 117,
-        "KecleonShop": 37,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 66
-    },
-    {
-        "MainData": 1035,
-        "Pokemon": 480,
-        "Traps": 10,
-        "Items": 118,
-        "KecleonShop": 37,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 66
-    }
-    ]
-}
+{
+    "name": "UproarForestFloorID",
+    "tables": [
+    {
+        "MainData": 1026,
+        "Pokemon": 475,
+        "Traps": 10,
+        "Items": 115,
+        "KecleonShop": 37,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 66
+    },
+    {
+        "MainData": 1027,
+        "Pokemon": 475,
+        "Traps": 10,
+        "Items": 115,
+        "KecleonShop": 37,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 66
+    },
+    {
+        "MainData": 1028,
+        "Pokemon": 475,
+        "Traps": 10,
+        "Items": 115,
+        "KecleonShop": 37,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 66
+    },
+    {
+        "MainData": 1029,
+        "Pokemon": 476,
+        "Traps": 10,
+        "Items": 116,
+        "KecleonShop": 37,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 66
+    },
+    {
+        "MainData": 1030,
+        "Pokemon": 477,
+        "Traps": 10,
+        "Items": 116,
+        "KecleonShop": 37,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 66
+    },
+    {
+        "MainData": 1031,
+        "Pokemon": 478,
+        "Traps": 10,
+        "Items": 116,
+        "KecleonShop": 37,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 66
+    },
+    {
+        "MainData": 1032,
+        "Pokemon": 479,
+        "Traps": 10,
+        "Items": 116,
+        "KecleonShop": 37,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 66
+    },
+    {
+        "MainData": 1033,
+        "Pokemon": 480,
+        "Traps": 10,
+        "Items": 116,
+        "KecleonShop": 37,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 66
+    },
+    {
+        "MainData": 1034,
+        "Pokemon": 480,
+        "Traps": 10,
+        "Items": 117,
+        "KecleonShop": 37,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 66
+    },
+    {
+        "MainData": 1035,
+        "Pokemon": 480,
+        "Traps": 10,
+        "Items": 118,
+        "KecleonShop": 37,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 66
+    }
+    ]
+}
-- 
cgit v1.2.3