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/Boss3/floor_id.json | 370 +++++++++++++++++++--------------------
 1 file changed, 185 insertions(+), 185 deletions(-)

(limited to 'data/dungeon/Boss3')

diff --git a/data/dungeon/Boss3/floor_id.json b/data/dungeon/Boss3/floor_id.json
index d7ab2ae..8e9c4a5 100644
--- a/data/dungeon/Boss3/floor_id.json
+++ b/data/dungeon/Boss3/floor_id.json
@@ -1,185 +1,185 @@
-{
-    "name": "Boss3FloorID",
-    "tables": [
-    {
-        "MainData": 449,
-        "Pokemon": 206,
-        "Traps": 12,
-        "Items": 65,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 66
-    },
-    {
-        "MainData": 450,
-        "Pokemon": 206,
-        "Traps": 13,
-        "Items": 65,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 66
-    },
-    {
-        "MainData": 451,
-        "Pokemon": 206,
-        "Traps": 14,
-        "Items": 65,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 66
-    },
-    {
-        "MainData": 452,
-        "Pokemon": 206,
-        "Traps": 15,
-        "Items": 67,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 66
-    },
-    {
-        "MainData": 453,
-        "Pokemon": 206,
-        "Traps": 16,
-        "Items": 67,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 66
-    },
-    {
-        "MainData": 454,
-        "Pokemon": 206,
-        "Traps": 17,
-        "Items": 67,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 66
-    },
-    {
-        "MainData": 455,
-        "Pokemon": 206,
-        "Traps": 18,
-        "Items": 68,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 66
-    },
-    {
-        "MainData": 456,
-        "Pokemon": 206,
-        "Traps": 18,
-        "Items": 68,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 66
-    },
-    {
-        "MainData": 457,
-        "Pokemon": 206,
-        "Traps": 18,
-        "Items": 68,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 66
-    },
-    {
-        "MainData": 458,
-        "Pokemon": 206,
-        "Traps": 18,
-        "Items": 69,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 66
-    },
-    {
-        "MainData": 459,
-        "Pokemon": 206,
-        "Traps": 19,
-        "Items": 69,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 66
-    },
-    {
-        "MainData": 460,
-        "Pokemon": 206,
-        "Traps": 19,
-        "Items": 69,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 66
-    },
-    {
-        "MainData": 461,
-        "Pokemon": 206,
-        "Traps": 19,
-        "Items": 69,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 66
-    },
-    {
-        "MainData": 462,
-        "Pokemon": 206,
-        "Traps": 19,
-        "Items": 69,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 66
-    },
-    {
-        "MainData": 463,
-        "Pokemon": 206,
-        "Traps": 19,
-        "Items": 69,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 66
-    },
-    {
-        "MainData": 464,
-        "Pokemon": 206,
-        "Traps": 20,
-        "Items": 69,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 66
-    },
-    {
-        "MainData": 465,
-        "Pokemon": 206,
-        "Traps": 20,
-        "Items": 69,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 66
-    },
-    {
-        "MainData": 466,
-        "Pokemon": 206,
-        "Traps": 20,
-        "Items": 69,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 66
-    },
-    {
-        "MainData": 467,
-        "Pokemon": 206,
-        "Traps": 20,
-        "Items": 69,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 66
-    },
-    {
-        "MainData": 468,
-        "Pokemon": 206,
-        "Traps": 21,
-        "Items": 69,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 66
-    }
-    ]
-}
+{
+    "name": "Boss3FloorID",
+    "tables": [
+    {
+        "MainData": 449,
+        "Pokemon": 206,
+        "Traps": 12,
+        "Items": 65,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 66
+    },
+    {
+        "MainData": 450,
+        "Pokemon": 206,
+        "Traps": 13,
+        "Items": 65,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 66
+    },
+    {
+        "MainData": 451,
+        "Pokemon": 206,
+        "Traps": 14,
+        "Items": 65,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 66
+    },
+    {
+        "MainData": 452,
+        "Pokemon": 206,
+        "Traps": 15,
+        "Items": 67,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 66
+    },
+    {
+        "MainData": 453,
+        "Pokemon": 206,
+        "Traps": 16,
+        "Items": 67,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 66
+    },
+    {
+        "MainData": 454,
+        "Pokemon": 206,
+        "Traps": 17,
+        "Items": 67,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 66
+    },
+    {
+        "MainData": 455,
+        "Pokemon": 206,
+        "Traps": 18,
+        "Items": 68,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 66
+    },
+    {
+        "MainData": 456,
+        "Pokemon": 206,
+        "Traps": 18,
+        "Items": 68,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 66
+    },
+    {
+        "MainData": 457,
+        "Pokemon": 206,
+        "Traps": 18,
+        "Items": 68,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 66
+    },
+    {
+        "MainData": 458,
+        "Pokemon": 206,
+        "Traps": 18,
+        "Items": 69,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 66
+    },
+    {
+        "MainData": 459,
+        "Pokemon": 206,
+        "Traps": 19,
+        "Items": 69,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 66
+    },
+    {
+        "MainData": 460,
+        "Pokemon": 206,
+        "Traps": 19,
+        "Items": 69,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 66
+    },
+    {
+        "MainData": 461,
+        "Pokemon": 206,
+        "Traps": 19,
+        "Items": 69,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 66
+    },
+    {
+        "MainData": 462,
+        "Pokemon": 206,
+        "Traps": 19,
+        "Items": 69,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 66
+    },
+    {
+        "MainData": 463,
+        "Pokemon": 206,
+        "Traps": 19,
+        "Items": 69,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 66
+    },
+    {
+        "MainData": 464,
+        "Pokemon": 206,
+        "Traps": 20,
+        "Items": 69,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 66
+    },
+    {
+        "MainData": 465,
+        "Pokemon": 206,
+        "Traps": 20,
+        "Items": 69,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 66
+    },
+    {
+        "MainData": 466,
+        "Pokemon": 206,
+        "Traps": 20,
+        "Items": 69,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 66
+    },
+    {
+        "MainData": 467,
+        "Pokemon": 206,
+        "Traps": 20,
+        "Items": 69,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 66
+    },
+    {
+        "MainData": 468,
+        "Pokemon": 206,
+        "Traps": 21,
+        "Items": 69,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 66
+    }
+    ]
+}
-- 
cgit v1.2.3