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

(limited to 'data/dungeon/MeteorCave')

diff --git a/data/dungeon/MeteorCave/floor_id.json b/data/dungeon/MeteorCave/floor_id.json
index 6d25001..7a5dc81 100644
--- a/data/dungeon/MeteorCave/floor_id.json
+++ b/data/dungeon/MeteorCave/floor_id.json
@@ -1,185 +1,185 @@
-{
-    "name": "MeteorCaveFloorID",
-    "tables": [
-    {
-        "MainData": 326,
-        "Pokemon": 161,
-        "Traps": 7,
-        "Items": 56,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 57
-    },
-    {
-        "MainData": 327,
-        "Pokemon": 161,
-        "Traps": 7,
-        "Items": 56,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 57
-    },
-    {
-        "MainData": 328,
-        "Pokemon": 161,
-        "Traps": 7,
-        "Items": 56,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 57
-    },
-    {
-        "MainData": 329,
-        "Pokemon": 161,
-        "Traps": 7,
-        "Items": 58,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 57
-    },
-    {
-        "MainData": 330,
-        "Pokemon": 161,
-        "Traps": 7,
-        "Items": 58,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 57
-    },
-    {
-        "MainData": 331,
-        "Pokemon": 161,
-        "Traps": 7,
-        "Items": 58,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 57
-    },
-    {
-        "MainData": 332,
-        "Pokemon": 161,
-        "Traps": 7,
-        "Items": 59,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 57
-    },
-    {
-        "MainData": 333,
-        "Pokemon": 161,
-        "Traps": 7,
-        "Items": 59,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 57
-    },
-    {
-        "MainData": 334,
-        "Pokemon": 161,
-        "Traps": 7,
-        "Items": 59,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 57
-    },
-    {
-        "MainData": 335,
-        "Pokemon": 161,
-        "Traps": 8,
-        "Items": 59,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 57
-    },
-    {
-        "MainData": 336,
-        "Pokemon": 161,
-        "Traps": 8,
-        "Items": 59,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 57
-    },
-    {
-        "MainData": 337,
-        "Pokemon": 161,
-        "Traps": 8,
-        "Items": 59,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 57
-    },
-    {
-        "MainData": 338,
-        "Pokemon": 161,
-        "Traps": 8,
-        "Items": 59,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 57
-    },
-    {
-        "MainData": 339,
-        "Pokemon": 161,
-        "Traps": 8,
-        "Items": 59,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 57
-    },
-    {
-        "MainData": 340,
-        "Pokemon": 161,
-        "Traps": 8,
-        "Items": 59,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 57
-    },
-    {
-        "MainData": 341,
-        "Pokemon": 161,
-        "Traps": 8,
-        "Items": 59,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 57
-    },
-    {
-        "MainData": 342,
-        "Pokemon": 161,
-        "Traps": 8,
-        "Items": 59,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 57
-    },
-    {
-        "MainData": 343,
-        "Pokemon": 161,
-        "Traps": 8,
-        "Items": 59,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 57
-    },
-    {
-        "MainData": 344,
-        "Pokemon": 161,
-        "Traps": 8,
-        "Items": 59,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 57
-    },
-    {
-        "MainData": 345,
-        "Pokemon": 162,
-        "Traps": 9,
-        "Items": 59,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 57
-    }
-    ]
-}
+{
+    "name": "MeteorCaveFloorID",
+    "tables": [
+    {
+        "MainData": 326,
+        "Pokemon": 161,
+        "Traps": 7,
+        "Items": 56,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 57
+    },
+    {
+        "MainData": 327,
+        "Pokemon": 161,
+        "Traps": 7,
+        "Items": 56,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 57
+    },
+    {
+        "MainData": 328,
+        "Pokemon": 161,
+        "Traps": 7,
+        "Items": 56,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 57
+    },
+    {
+        "MainData": 329,
+        "Pokemon": 161,
+        "Traps": 7,
+        "Items": 58,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 57
+    },
+    {
+        "MainData": 330,
+        "Pokemon": 161,
+        "Traps": 7,
+        "Items": 58,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 57
+    },
+    {
+        "MainData": 331,
+        "Pokemon": 161,
+        "Traps": 7,
+        "Items": 58,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 57
+    },
+    {
+        "MainData": 332,
+        "Pokemon": 161,
+        "Traps": 7,
+        "Items": 59,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 57
+    },
+    {
+        "MainData": 333,
+        "Pokemon": 161,
+        "Traps": 7,
+        "Items": 59,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 57
+    },
+    {
+        "MainData": 334,
+        "Pokemon": 161,
+        "Traps": 7,
+        "Items": 59,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 57
+    },
+    {
+        "MainData": 335,
+        "Pokemon": 161,
+        "Traps": 8,
+        "Items": 59,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 57
+    },
+    {
+        "MainData": 336,
+        "Pokemon": 161,
+        "Traps": 8,
+        "Items": 59,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 57
+    },
+    {
+        "MainData": 337,
+        "Pokemon": 161,
+        "Traps": 8,
+        "Items": 59,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 57
+    },
+    {
+        "MainData": 338,
+        "Pokemon": 161,
+        "Traps": 8,
+        "Items": 59,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 57
+    },
+    {
+        "MainData": 339,
+        "Pokemon": 161,
+        "Traps": 8,
+        "Items": 59,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 57
+    },
+    {
+        "MainData": 340,
+        "Pokemon": 161,
+        "Traps": 8,
+        "Items": 59,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 57
+    },
+    {
+        "MainData": 341,
+        "Pokemon": 161,
+        "Traps": 8,
+        "Items": 59,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 57
+    },
+    {
+        "MainData": 342,
+        "Pokemon": 161,
+        "Traps": 8,
+        "Items": 59,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 57
+    },
+    {
+        "MainData": 343,
+        "Pokemon": 161,
+        "Traps": 8,
+        "Items": 59,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 57
+    },
+    {
+        "MainData": 344,
+        "Pokemon": 161,
+        "Traps": 8,
+        "Items": 59,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 57
+    },
+    {
+        "MainData": 345,
+        "Pokemon": 162,
+        "Traps": 9,
+        "Items": 59,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 57
+    }
+    ]
+}
-- 
cgit v1.2.3