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/Boss4/floor_id.json | 208 +++++++++++++++++++--------------------
 1 file changed, 104 insertions(+), 104 deletions(-)

(limited to 'data/dungeon/Boss4')

diff --git a/data/dungeon/Boss4/floor_id.json b/data/dungeon/Boss4/floor_id.json
index 86bf269..8653db9 100644
--- a/data/dungeon/Boss4/floor_id.json
+++ b/data/dungeon/Boss4/floor_id.json
@@ -1,104 +1,104 @@
-{
-    "name": "Boss4FloorID",
-    "tables": [
-    {
-        "MainData": 469,
-        "Pokemon": 207,
-        "Traps": 22,
-        "Items": 70,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 66
-    },
-    {
-        "MainData": 470,
-        "Pokemon": 207,
-        "Traps": 23,
-        "Items": 70,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 66
-    },
-    {
-        "MainData": 471,
-        "Pokemon": 207,
-        "Traps": 24,
-        "Items": 70,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 66
-    },
-    {
-        "MainData": 472,
-        "Pokemon": 208,
-        "Traps": 25,
-        "Items": 71,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 66
-    },
-    {
-        "MainData": 473,
-        "Pokemon": 209,
-        "Traps": 26,
-        "Items": 71,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 66
-    },
-    {
-        "MainData": 474,
-        "Pokemon": 210,
-        "Traps": 27,
-        "Items": 71,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 66
-    },
-    {
-        "MainData": 475,
-        "Pokemon": 210,
-        "Traps": 28,
-        "Items": 72,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 66
-    },
-    {
-        "MainData": 476,
-        "Pokemon": 211,
-        "Traps": 28,
-        "Items": 72,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 66
-    },
-    {
-        "MainData": 477,
-        "Pokemon": 212,
-        "Traps": 28,
-        "Items": 72,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 66
-    },
-    {
-        "MainData": 478,
-        "Pokemon": 213,
-        "Traps": 28,
-        "Items": 73,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 66
-    },
-    {
-        "MainData": 479,
-        "Pokemon": 214,
-        "Traps": 29,
-        "Items": 73,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 66
-    }
-    ]
-}
+{
+    "name": "Boss4FloorID",
+    "tables": [
+    {
+        "MainData": 469,
+        "Pokemon": 207,
+        "Traps": 22,
+        "Items": 70,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 66
+    },
+    {
+        "MainData": 470,
+        "Pokemon": 207,
+        "Traps": 23,
+        "Items": 70,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 66
+    },
+    {
+        "MainData": 471,
+        "Pokemon": 207,
+        "Traps": 24,
+        "Items": 70,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 66
+    },
+    {
+        "MainData": 472,
+        "Pokemon": 208,
+        "Traps": 25,
+        "Items": 71,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 66
+    },
+    {
+        "MainData": 473,
+        "Pokemon": 209,
+        "Traps": 26,
+        "Items": 71,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 66
+    },
+    {
+        "MainData": 474,
+        "Pokemon": 210,
+        "Traps": 27,
+        "Items": 71,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 66
+    },
+    {
+        "MainData": 475,
+        "Pokemon": 210,
+        "Traps": 28,
+        "Items": 72,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 66
+    },
+    {
+        "MainData": 476,
+        "Pokemon": 211,
+        "Traps": 28,
+        "Items": 72,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 66
+    },
+    {
+        "MainData": 477,
+        "Pokemon": 212,
+        "Traps": 28,
+        "Items": 72,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 66
+    },
+    {
+        "MainData": 478,
+        "Pokemon": 213,
+        "Traps": 28,
+        "Items": 73,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 66
+    },
+    {
+        "MainData": 479,
+        "Pokemon": 214,
+        "Traps": 29,
+        "Items": 73,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 66
+    }
+    ]
+}
-- 
cgit v1.2.3