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

(limited to 'data/dungeon/WaterfallPond')

diff --git a/data/dungeon/WaterfallPond/floor_id.json b/data/dungeon/WaterfallPond/floor_id.json
index f8994f8..7c039c8 100644
--- a/data/dungeon/WaterfallPond/floor_id.json
+++ b/data/dungeon/WaterfallPond/floor_id.json
@@ -1,176 +1,176 @@
-{
-    "name": "WaterfallPondFloorID",
-    "tables": [
-    {
-        "MainData": 1321,
-        "Pokemon": 585,
-        "Traps": 93,
-        "Items": 151,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1322,
-        "Pokemon": 585,
-        "Traps": 93,
-        "Items": 151,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1323,
-        "Pokemon": 586,
-        "Traps": 93,
-        "Items": 151,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1324,
-        "Pokemon": 587,
-        "Traps": 93,
-        "Items": 152,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1325,
-        "Pokemon": 587,
-        "Traps": 93,
-        "Items": 152,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1326,
-        "Pokemon": 588,
-        "Traps": 93,
-        "Items": 152,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1327,
-        "Pokemon": 589,
-        "Traps": 93,
-        "Items": 152,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1328,
-        "Pokemon": 590,
-        "Traps": 93,
-        "Items": 152,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1329,
-        "Pokemon": 591,
-        "Traps": 93,
-        "Items": 152,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1330,
-        "Pokemon": 591,
-        "Traps": 93,
-        "Items": 152,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1331,
-        "Pokemon": 592,
-        "Traps": 93,
-        "Items": 152,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1332,
-        "Pokemon": 593,
-        "Traps": 93,
-        "Items": 152,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1333,
-        "Pokemon": 594,
-        "Traps": 93,
-        "Items": 152,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1334,
-        "Pokemon": 595,
-        "Traps": 93,
-        "Items": 152,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1335,
-        "Pokemon": 596,
-        "Traps": 93,
-        "Items": 152,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1336,
-        "Pokemon": 597,
-        "Traps": 93,
-        "Items": 152,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1337,
-        "Pokemon": 598,
-        "Traps": 93,
-        "Items": 152,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1338,
-        "Pokemon": 598,
-        "Traps": 93,
-        "Items": 153,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1339,
-        "Pokemon": 599,
-        "Traps": 93,
-        "Items": 153,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    }
-    ]
-}
+{
+    "name": "WaterfallPondFloorID",
+    "tables": [
+    {
+        "MainData": 1321,
+        "Pokemon": 585,
+        "Traps": 93,
+        "Items": 151,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1322,
+        "Pokemon": 585,
+        "Traps": 93,
+        "Items": 151,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1323,
+        "Pokemon": 586,
+        "Traps": 93,
+        "Items": 151,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1324,
+        "Pokemon": 587,
+        "Traps": 93,
+        "Items": 152,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1325,
+        "Pokemon": 587,
+        "Traps": 93,
+        "Items": 152,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1326,
+        "Pokemon": 588,
+        "Traps": 93,
+        "Items": 152,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1327,
+        "Pokemon": 589,
+        "Traps": 93,
+        "Items": 152,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1328,
+        "Pokemon": 590,
+        "Traps": 93,
+        "Items": 152,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1329,
+        "Pokemon": 591,
+        "Traps": 93,
+        "Items": 152,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1330,
+        "Pokemon": 591,
+        "Traps": 93,
+        "Items": 152,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1331,
+        "Pokemon": 592,
+        "Traps": 93,
+        "Items": 152,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1332,
+        "Pokemon": 593,
+        "Traps": 93,
+        "Items": 152,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1333,
+        "Pokemon": 594,
+        "Traps": 93,
+        "Items": 152,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1334,
+        "Pokemon": 595,
+        "Traps": 93,
+        "Items": 152,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1335,
+        "Pokemon": 596,
+        "Traps": 93,
+        "Items": 152,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1336,
+        "Pokemon": 597,
+        "Traps": 93,
+        "Items": 152,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1337,
+        "Pokemon": 598,
+        "Traps": 93,
+        "Items": 152,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1338,
+        "Pokemon": 598,
+        "Traps": 93,
+        "Items": 153,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1339,
+        "Pokemon": 599,
+        "Traps": 93,
+        "Items": 153,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    }
+    ]
+}
-- 
cgit v1.2.3