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/StormySea/floor_id.json | 730 +++++++++++++++++------------------
 1 file changed, 365 insertions(+), 365 deletions(-)

(limited to 'data/dungeon/StormySea')

diff --git a/data/dungeon/StormySea/floor_id.json b/data/dungeon/StormySea/floor_id.json
index 0828d7b..c740654 100644
--- a/data/dungeon/StormySea/floor_id.json
+++ b/data/dungeon/StormySea/floor_id.json
@@ -1,365 +1,365 @@
-{
-    "name": "StormySeaFloorID",
-    "tables": [
-    {
-        "MainData": 187,
-        "Pokemon": 112,
-        "Traps": 4,
-        "Items": 45,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 188,
-        "Pokemon": 112,
-        "Traps": 4,
-        "Items": 45,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 189,
-        "Pokemon": 112,
-        "Traps": 4,
-        "Items": 45,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 190,
-        "Pokemon": 112,
-        "Traps": 4,
-        "Items": 45,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 191,
-        "Pokemon": 112,
-        "Traps": 4,
-        "Items": 45,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 192,
-        "Pokemon": 113,
-        "Traps": 4,
-        "Items": 45,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 193,
-        "Pokemon": 113,
-        "Traps": 4,
-        "Items": 45,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 194,
-        "Pokemon": 113,
-        "Traps": 4,
-        "Items": 45,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 195,
-        "Pokemon": 114,
-        "Traps": 4,
-        "Items": 45,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 196,
-        "Pokemon": 115,
-        "Traps": 4,
-        "Items": 47,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 197,
-        "Pokemon": 116,
-        "Traps": 4,
-        "Items": 47,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 198,
-        "Pokemon": 116,
-        "Traps": 4,
-        "Items": 47,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 199,
-        "Pokemon": 116,
-        "Traps": 4,
-        "Items": 47,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 200,
-        "Pokemon": 116,
-        "Traps": 4,
-        "Items": 47,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 201,
-        "Pokemon": 117,
-        "Traps": 4,
-        "Items": 47,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 202,
-        "Pokemon": 117,
-        "Traps": 4,
-        "Items": 47,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 203,
-        "Pokemon": 117,
-        "Traps": 4,
-        "Items": 47,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 204,
-        "Pokemon": 118,
-        "Traps": 4,
-        "Items": 47,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 205,
-        "Pokemon": 118,
-        "Traps": 4,
-        "Items": 47,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 206,
-        "Pokemon": 119,
-        "Traps": 4,
-        "Items": 47,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 207,
-        "Pokemon": 119,
-        "Traps": 4,
-        "Items": 48,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 208,
-        "Pokemon": 119,
-        "Traps": 4,
-        "Items": 48,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 209,
-        "Pokemon": 119,
-        "Traps": 4,
-        "Items": 48,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 210,
-        "Pokemon": 119,
-        "Traps": 4,
-        "Items": 48,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 211,
-        "Pokemon": 120,
-        "Traps": 4,
-        "Items": 48,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 212,
-        "Pokemon": 120,
-        "Traps": 4,
-        "Items": 48,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 213,
-        "Pokemon": 121,
-        "Traps": 4,
-        "Items": 48,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 214,
-        "Pokemon": 122,
-        "Traps": 4,
-        "Items": 48,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 215,
-        "Pokemon": 122,
-        "Traps": 4,
-        "Items": 48,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 216,
-        "Pokemon": 123,
-        "Traps": 4,
-        "Items": 48,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 217,
-        "Pokemon": 124,
-        "Traps": 4,
-        "Items": 49,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 218,
-        "Pokemon": 124,
-        "Traps": 4,
-        "Items": 49,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 219,
-        "Pokemon": 124,
-        "Traps": 4,
-        "Items": 49,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 220,
-        "Pokemon": 125,
-        "Traps": 4,
-        "Items": 49,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 221,
-        "Pokemon": 126,
-        "Traps": 4,
-        "Items": 49,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 222,
-        "Pokemon": 126,
-        "Traps": 4,
-        "Items": 49,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 223,
-        "Pokemon": 126,
-        "Traps": 4,
-        "Items": 49,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 224,
-        "Pokemon": 126,
-        "Traps": 4,
-        "Items": 49,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 225,
-        "Pokemon": 126,
-        "Traps": 4,
-        "Items": 49,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 226,
-        "Pokemon": 127,
-        "Traps": 4,
-        "Items": 49,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 3
-    }
-    ]
-}
+{
+    "name": "StormySeaFloorID",
+    "tables": [
+    {
+        "MainData": 187,
+        "Pokemon": 112,
+        "Traps": 4,
+        "Items": 45,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 188,
+        "Pokemon": 112,
+        "Traps": 4,
+        "Items": 45,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 189,
+        "Pokemon": 112,
+        "Traps": 4,
+        "Items": 45,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 190,
+        "Pokemon": 112,
+        "Traps": 4,
+        "Items": 45,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 191,
+        "Pokemon": 112,
+        "Traps": 4,
+        "Items": 45,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 192,
+        "Pokemon": 113,
+        "Traps": 4,
+        "Items": 45,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 193,
+        "Pokemon": 113,
+        "Traps": 4,
+        "Items": 45,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 194,
+        "Pokemon": 113,
+        "Traps": 4,
+        "Items": 45,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 195,
+        "Pokemon": 114,
+        "Traps": 4,
+        "Items": 45,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 196,
+        "Pokemon": 115,
+        "Traps": 4,
+        "Items": 47,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 197,
+        "Pokemon": 116,
+        "Traps": 4,
+        "Items": 47,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 198,
+        "Pokemon": 116,
+        "Traps": 4,
+        "Items": 47,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 199,
+        "Pokemon": 116,
+        "Traps": 4,
+        "Items": 47,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 200,
+        "Pokemon": 116,
+        "Traps": 4,
+        "Items": 47,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 201,
+        "Pokemon": 117,
+        "Traps": 4,
+        "Items": 47,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 202,
+        "Pokemon": 117,
+        "Traps": 4,
+        "Items": 47,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 203,
+        "Pokemon": 117,
+        "Traps": 4,
+        "Items": 47,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 204,
+        "Pokemon": 118,
+        "Traps": 4,
+        "Items": 47,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 205,
+        "Pokemon": 118,
+        "Traps": 4,
+        "Items": 47,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 206,
+        "Pokemon": 119,
+        "Traps": 4,
+        "Items": 47,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 207,
+        "Pokemon": 119,
+        "Traps": 4,
+        "Items": 48,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 208,
+        "Pokemon": 119,
+        "Traps": 4,
+        "Items": 48,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 209,
+        "Pokemon": 119,
+        "Traps": 4,
+        "Items": 48,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 210,
+        "Pokemon": 119,
+        "Traps": 4,
+        "Items": 48,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 211,
+        "Pokemon": 120,
+        "Traps": 4,
+        "Items": 48,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 212,
+        "Pokemon": 120,
+        "Traps": 4,
+        "Items": 48,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 213,
+        "Pokemon": 121,
+        "Traps": 4,
+        "Items": 48,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 214,
+        "Pokemon": 122,
+        "Traps": 4,
+        "Items": 48,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 215,
+        "Pokemon": 122,
+        "Traps": 4,
+        "Items": 48,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 216,
+        "Pokemon": 123,
+        "Traps": 4,
+        "Items": 48,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 217,
+        "Pokemon": 124,
+        "Traps": 4,
+        "Items": 49,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 218,
+        "Pokemon": 124,
+        "Traps": 4,
+        "Items": 49,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 219,
+        "Pokemon": 124,
+        "Traps": 4,
+        "Items": 49,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 220,
+        "Pokemon": 125,
+        "Traps": 4,
+        "Items": 49,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 221,
+        "Pokemon": 126,
+        "Traps": 4,
+        "Items": 49,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 222,
+        "Pokemon": 126,
+        "Traps": 4,
+        "Items": 49,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 223,
+        "Pokemon": 126,
+        "Traps": 4,
+        "Items": 49,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 224,
+        "Pokemon": 126,
+        "Traps": 4,
+        "Items": 49,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 225,
+        "Pokemon": 126,
+        "Traps": 4,
+        "Items": 49,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 226,
+        "Pokemon": 127,
+        "Traps": 4,
+        "Items": 49,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    }
+    ]
+}
-- 
cgit v1.2.3