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

(limited to 'data/dungeon/DesertRegion')

diff --git a/data/dungeon/DesertRegion/floor_id.json b/data/dungeon/DesertRegion/floor_id.json
index bb03749..862ab4b 100644
--- a/data/dungeon/DesertRegion/floor_id.json
+++ b/data/dungeon/DesertRegion/floor_id.json
@@ -1,185 +1,185 @@
-{
-    "name": "DesertRegionFloorID",
-    "tables": [
-    {
-        "MainData": 740,
-        "Pokemon": 340,
-        "Traps": 64,
-        "Items": 89,
-        "KecleonShop": 90,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 91
-    },
-    {
-        "MainData": 741,
-        "Pokemon": 340,
-        "Traps": 64,
-        "Items": 89,
-        "KecleonShop": 90,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 91
-    },
-    {
-        "MainData": 742,
-        "Pokemon": 340,
-        "Traps": 64,
-        "Items": 89,
-        "KecleonShop": 90,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 91
-    },
-    {
-        "MainData": 743,
-        "Pokemon": 340,
-        "Traps": 64,
-        "Items": 89,
-        "KecleonShop": 90,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 91
-    },
-    {
-        "MainData": 744,
-        "Pokemon": 340,
-        "Traps": 64,
-        "Items": 89,
-        "KecleonShop": 90,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 91
-    },
-    {
-        "MainData": 745,
-        "Pokemon": 340,
-        "Traps": 64,
-        "Items": 89,
-        "KecleonShop": 90,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 91
-    },
-    {
-        "MainData": 746,
-        "Pokemon": 341,
-        "Traps": 64,
-        "Items": 89,
-        "KecleonShop": 90,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 91
-    },
-    {
-        "MainData": 747,
-        "Pokemon": 341,
-        "Traps": 64,
-        "Items": 89,
-        "KecleonShop": 90,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 91
-    },
-    {
-        "MainData": 748,
-        "Pokemon": 341,
-        "Traps": 64,
-        "Items": 89,
-        "KecleonShop": 90,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 91
-    },
-    {
-        "MainData": 749,
-        "Pokemon": 341,
-        "Traps": 64,
-        "Items": 89,
-        "KecleonShop": 90,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 91
-    },
-    {
-        "MainData": 750,
-        "Pokemon": 341,
-        "Traps": 64,
-        "Items": 89,
-        "KecleonShop": 90,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 91
-    },
-    {
-        "MainData": 751,
-        "Pokemon": 342,
-        "Traps": 64,
-        "Items": 89,
-        "KecleonShop": 90,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 91
-    },
-    {
-        "MainData": 752,
-        "Pokemon": 342,
-        "Traps": 64,
-        "Items": 89,
-        "KecleonShop": 90,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 91
-    },
-    {
-        "MainData": 753,
-        "Pokemon": 343,
-        "Traps": 64,
-        "Items": 89,
-        "KecleonShop": 90,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 91
-    },
-    {
-        "MainData": 754,
-        "Pokemon": 344,
-        "Traps": 64,
-        "Items": 89,
-        "KecleonShop": 90,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 91
-    },
-    {
-        "MainData": 755,
-        "Pokemon": 344,
-        "Traps": 64,
-        "Items": 89,
-        "KecleonShop": 90,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 91
-    },
-    {
-        "MainData": 756,
-        "Pokemon": 344,
-        "Traps": 64,
-        "Items": 89,
-        "KecleonShop": 90,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 91
-    },
-    {
-        "MainData": 757,
-        "Pokemon": 344,
-        "Traps": 64,
-        "Items": 89,
-        "KecleonShop": 90,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 91
-    },
-    {
-        "MainData": 758,
-        "Pokemon": 344,
-        "Traps": 64,
-        "Items": 92,
-        "KecleonShop": 90,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 91
-    },
-    {
-        "MainData": 759,
-        "Pokemon": 344,
-        "Traps": 64,
-        "Items": 92,
-        "KecleonShop": 90,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 91
-    }
-    ]
-}
+{
+    "name": "DesertRegionFloorID",
+    "tables": [
+    {
+        "MainData": 740,
+        "Pokemon": 340,
+        "Traps": 64,
+        "Items": 89,
+        "KecleonShop": 90,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 91
+    },
+    {
+        "MainData": 741,
+        "Pokemon": 340,
+        "Traps": 64,
+        "Items": 89,
+        "KecleonShop": 90,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 91
+    },
+    {
+        "MainData": 742,
+        "Pokemon": 340,
+        "Traps": 64,
+        "Items": 89,
+        "KecleonShop": 90,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 91
+    },
+    {
+        "MainData": 743,
+        "Pokemon": 340,
+        "Traps": 64,
+        "Items": 89,
+        "KecleonShop": 90,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 91
+    },
+    {
+        "MainData": 744,
+        "Pokemon": 340,
+        "Traps": 64,
+        "Items": 89,
+        "KecleonShop": 90,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 91
+    },
+    {
+        "MainData": 745,
+        "Pokemon": 340,
+        "Traps": 64,
+        "Items": 89,
+        "KecleonShop": 90,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 91
+    },
+    {
+        "MainData": 746,
+        "Pokemon": 341,
+        "Traps": 64,
+        "Items": 89,
+        "KecleonShop": 90,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 91
+    },
+    {
+        "MainData": 747,
+        "Pokemon": 341,
+        "Traps": 64,
+        "Items": 89,
+        "KecleonShop": 90,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 91
+    },
+    {
+        "MainData": 748,
+        "Pokemon": 341,
+        "Traps": 64,
+        "Items": 89,
+        "KecleonShop": 90,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 91
+    },
+    {
+        "MainData": 749,
+        "Pokemon": 341,
+        "Traps": 64,
+        "Items": 89,
+        "KecleonShop": 90,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 91
+    },
+    {
+        "MainData": 750,
+        "Pokemon": 341,
+        "Traps": 64,
+        "Items": 89,
+        "KecleonShop": 90,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 91
+    },
+    {
+        "MainData": 751,
+        "Pokemon": 342,
+        "Traps": 64,
+        "Items": 89,
+        "KecleonShop": 90,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 91
+    },
+    {
+        "MainData": 752,
+        "Pokemon": 342,
+        "Traps": 64,
+        "Items": 89,
+        "KecleonShop": 90,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 91
+    },
+    {
+        "MainData": 753,
+        "Pokemon": 343,
+        "Traps": 64,
+        "Items": 89,
+        "KecleonShop": 90,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 91
+    },
+    {
+        "MainData": 754,
+        "Pokemon": 344,
+        "Traps": 64,
+        "Items": 89,
+        "KecleonShop": 90,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 91
+    },
+    {
+        "MainData": 755,
+        "Pokemon": 344,
+        "Traps": 64,
+        "Items": 89,
+        "KecleonShop": 90,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 91
+    },
+    {
+        "MainData": 756,
+        "Pokemon": 344,
+        "Traps": 64,
+        "Items": 89,
+        "KecleonShop": 90,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 91
+    },
+    {
+        "MainData": 757,
+        "Pokemon": 344,
+        "Traps": 64,
+        "Items": 89,
+        "KecleonShop": 90,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 91
+    },
+    {
+        "MainData": 758,
+        "Pokemon": 344,
+        "Traps": 64,
+        "Items": 92,
+        "KecleonShop": 90,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 91
+    },
+    {
+        "MainData": 759,
+        "Pokemon": 344,
+        "Traps": 64,
+        "Items": 92,
+        "KecleonShop": 90,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 91
+    }
+    ]
+}
-- 
cgit v1.2.3