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/HowlingForest/floor_id.json | 280 +++++++++++++++----------------
 1 file changed, 140 insertions(+), 140 deletions(-)

(limited to 'data/dungeon/HowlingForest')

diff --git a/data/dungeon/HowlingForest/floor_id.json b/data/dungeon/HowlingForest/floor_id.json
index 71262ba..e24db95 100644
--- a/data/dungeon/HowlingForest/floor_id.json
+++ b/data/dungeon/HowlingForest/floor_id.json
@@ -1,140 +1,140 @@
-{
-    "name": "HowlingForestFloorID",
-    "tables": [
-    {
-        "MainData": 1257,
-        "Pokemon": 576,
-        "Traps": 10,
-        "Items": 148,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1258,
-        "Pokemon": 576,
-        "Traps": 10,
-        "Items": 148,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1259,
-        "Pokemon": 576,
-        "Traps": 10,
-        "Items": 148,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1260,
-        "Pokemon": 577,
-        "Traps": 10,
-        "Items": 149,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1261,
-        "Pokemon": 578,
-        "Traps": 10,
-        "Items": 149,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1262,
-        "Pokemon": 578,
-        "Traps": 10,
-        "Items": 149,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1263,
-        "Pokemon": 579,
-        "Traps": 10,
-        "Items": 150,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1264,
-        "Pokemon": 579,
-        "Traps": 10,
-        "Items": 150,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1265,
-        "Pokemon": 580,
-        "Traps": 10,
-        "Items": 150,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1266,
-        "Pokemon": 580,
-        "Traps": 10,
-        "Items": 150,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1267,
-        "Pokemon": 581,
-        "Traps": 10,
-        "Items": 150,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1268,
-        "Pokemon": 582,
-        "Traps": 10,
-        "Items": 150,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1269,
-        "Pokemon": 582,
-        "Traps": 10,
-        "Items": 150,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1270,
-        "Pokemon": 583,
-        "Traps": 10,
-        "Items": 150,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1271,
-        "Pokemon": 584,
-        "Traps": 10,
-        "Items": 150,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    }
-    ]
-}
+{
+    "name": "HowlingForestFloorID",
+    "tables": [
+    {
+        "MainData": 1257,
+        "Pokemon": 576,
+        "Traps": 10,
+        "Items": 148,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1258,
+        "Pokemon": 576,
+        "Traps": 10,
+        "Items": 148,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1259,
+        "Pokemon": 576,
+        "Traps": 10,
+        "Items": 148,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1260,
+        "Pokemon": 577,
+        "Traps": 10,
+        "Items": 149,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1261,
+        "Pokemon": 578,
+        "Traps": 10,
+        "Items": 149,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1262,
+        "Pokemon": 578,
+        "Traps": 10,
+        "Items": 149,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1263,
+        "Pokemon": 579,
+        "Traps": 10,
+        "Items": 150,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1264,
+        "Pokemon": 579,
+        "Traps": 10,
+        "Items": 150,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1265,
+        "Pokemon": 580,
+        "Traps": 10,
+        "Items": 150,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1266,
+        "Pokemon": 580,
+        "Traps": 10,
+        "Items": 150,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1267,
+        "Pokemon": 581,
+        "Traps": 10,
+        "Items": 150,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1268,
+        "Pokemon": 582,
+        "Traps": 10,
+        "Items": 150,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1269,
+        "Pokemon": 582,
+        "Traps": 10,
+        "Items": 150,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1270,
+        "Pokemon": 583,
+        "Traps": 10,
+        "Items": 150,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1271,
+        "Pokemon": 584,
+        "Traps": 10,
+        "Items": 150,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    }
+    ]
+}
-- 
cgit v1.2.3