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/FieryField/floor_id.json | 550 +++++++++++++++++-----------------
 1 file changed, 275 insertions(+), 275 deletions(-)

(limited to 'data/dungeon/FieryField')

diff --git a/data/dungeon/FieryField/floor_id.json b/data/dungeon/FieryField/floor_id.json
index 1f4bdd5..b3b2c00 100644
--- a/data/dungeon/FieryField/floor_id.json
+++ b/data/dungeon/FieryField/floor_id.json
@@ -1,275 +1,275 @@
-{
-    "name": "FieryFieldFloorID",
-    "tables": [
-    {
-        "MainData": 840,
-        "Pokemon": 381,
-        "Traps": 72,
-        "Items": 98,
-        "KecleonShop": 94,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 57
-    },
-    {
-        "MainData": 841,
-        "Pokemon": 381,
-        "Traps": 72,
-        "Items": 98,
-        "KecleonShop": 94,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 57
-    },
-    {
-        "MainData": 842,
-        "Pokemon": 381,
-        "Traps": 72,
-        "Items": 98,
-        "KecleonShop": 94,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 57
-    },
-    {
-        "MainData": 843,
-        "Pokemon": 382,
-        "Traps": 72,
-        "Items": 98,
-        "KecleonShop": 94,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 57
-    },
-    {
-        "MainData": 844,
-        "Pokemon": 383,
-        "Traps": 72,
-        "Items": 98,
-        "KecleonShop": 94,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 57
-    },
-    {
-        "MainData": 845,
-        "Pokemon": 384,
-        "Traps": 72,
-        "Items": 98,
-        "KecleonShop": 94,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 57
-    },
-    {
-        "MainData": 846,
-        "Pokemon": 384,
-        "Traps": 72,
-        "Items": 98,
-        "KecleonShop": 94,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 57
-    },
-    {
-        "MainData": 847,
-        "Pokemon": 385,
-        "Traps": 72,
-        "Items": 98,
-        "KecleonShop": 94,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 57
-    },
-    {
-        "MainData": 848,
-        "Pokemon": 386,
-        "Traps": 72,
-        "Items": 98,
-        "KecleonShop": 94,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 57
-    },
-    {
-        "MainData": 849,
-        "Pokemon": 387,
-        "Traps": 73,
-        "Items": 98,
-        "KecleonShop": 94,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 57
-    },
-    {
-        "MainData": 850,
-        "Pokemon": 387,
-        "Traps": 74,
-        "Items": 98,
-        "KecleonShop": 94,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 57
-    },
-    {
-        "MainData": 851,
-        "Pokemon": 387,
-        "Traps": 74,
-        "Items": 98,
-        "KecleonShop": 94,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 57
-    },
-    {
-        "MainData": 852,
-        "Pokemon": 387,
-        "Traps": 74,
-        "Items": 98,
-        "KecleonShop": 94,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 57
-    },
-    {
-        "MainData": 853,
-        "Pokemon": 387,
-        "Traps": 74,
-        "Items": 98,
-        "KecleonShop": 94,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 57
-    },
-    {
-        "MainData": 854,
-        "Pokemon": 388,
-        "Traps": 74,
-        "Items": 98,
-        "KecleonShop": 94,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 57
-    },
-    {
-        "MainData": 855,
-        "Pokemon": 388,
-        "Traps": 74,
-        "Items": 98,
-        "KecleonShop": 94,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 57
-    },
-    {
-        "MainData": 856,
-        "Pokemon": 389,
-        "Traps": 74,
-        "Items": 98,
-        "KecleonShop": 94,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 57
-    },
-    {
-        "MainData": 857,
-        "Pokemon": 389,
-        "Traps": 74,
-        "Items": 98,
-        "KecleonShop": 94,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 57
-    },
-    {
-        "MainData": 858,
-        "Pokemon": 389,
-        "Traps": 74,
-        "Items": 98,
-        "KecleonShop": 94,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 57
-    },
-    {
-        "MainData": 859,
-        "Pokemon": 389,
-        "Traps": 74,
-        "Items": 98,
-        "KecleonShop": 94,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 57
-    },
-    {
-        "MainData": 860,
-        "Pokemon": 390,
-        "Traps": 74,
-        "Items": 98,
-        "KecleonShop": 94,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 57
-    },
-    {
-        "MainData": 861,
-        "Pokemon": 391,
-        "Traps": 74,
-        "Items": 98,
-        "KecleonShop": 94,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 57
-    },
-    {
-        "MainData": 862,
-        "Pokemon": 391,
-        "Traps": 74,
-        "Items": 98,
-        "KecleonShop": 94,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 57
-    },
-    {
-        "MainData": 863,
-        "Pokemon": 391,
-        "Traps": 74,
-        "Items": 98,
-        "KecleonShop": 94,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 57
-    },
-    {
-        "MainData": 864,
-        "Pokemon": 392,
-        "Traps": 74,
-        "Items": 98,
-        "KecleonShop": 94,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 57
-    },
-    {
-        "MainData": 865,
-        "Pokemon": 393,
-        "Traps": 74,
-        "Items": 98,
-        "KecleonShop": 94,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 57
-    },
-    {
-        "MainData": 866,
-        "Pokemon": 393,
-        "Traps": 74,
-        "Items": 98,
-        "KecleonShop": 94,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 57
-    },
-    {
-        "MainData": 867,
-        "Pokemon": 393,
-        "Traps": 74,
-        "Items": 98,
-        "KecleonShop": 94,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 57
-    },
-    {
-        "MainData": 868,
-        "Pokemon": 393,
-        "Traps": 74,
-        "Items": 99,
-        "KecleonShop": 94,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 57
-    },
-    {
-        "MainData": 869,
-        "Pokemon": 394,
-        "Traps": 74,
-        "Items": 99,
-        "KecleonShop": 94,
-        "MonsterRoomItems": 46,
-        "BuriedItems": 57
-    }
-    ]
-}
+{
+    "name": "FieryFieldFloorID",
+    "tables": [
+    {
+        "MainData": 840,
+        "Pokemon": 381,
+        "Traps": 72,
+        "Items": 98,
+        "KecleonShop": 94,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 57
+    },
+    {
+        "MainData": 841,
+        "Pokemon": 381,
+        "Traps": 72,
+        "Items": 98,
+        "KecleonShop": 94,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 57
+    },
+    {
+        "MainData": 842,
+        "Pokemon": 381,
+        "Traps": 72,
+        "Items": 98,
+        "KecleonShop": 94,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 57
+    },
+    {
+        "MainData": 843,
+        "Pokemon": 382,
+        "Traps": 72,
+        "Items": 98,
+        "KecleonShop": 94,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 57
+    },
+    {
+        "MainData": 844,
+        "Pokemon": 383,
+        "Traps": 72,
+        "Items": 98,
+        "KecleonShop": 94,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 57
+    },
+    {
+        "MainData": 845,
+        "Pokemon": 384,
+        "Traps": 72,
+        "Items": 98,
+        "KecleonShop": 94,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 57
+    },
+    {
+        "MainData": 846,
+        "Pokemon": 384,
+        "Traps": 72,
+        "Items": 98,
+        "KecleonShop": 94,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 57
+    },
+    {
+        "MainData": 847,
+        "Pokemon": 385,
+        "Traps": 72,
+        "Items": 98,
+        "KecleonShop": 94,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 57
+    },
+    {
+        "MainData": 848,
+        "Pokemon": 386,
+        "Traps": 72,
+        "Items": 98,
+        "KecleonShop": 94,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 57
+    },
+    {
+        "MainData": 849,
+        "Pokemon": 387,
+        "Traps": 73,
+        "Items": 98,
+        "KecleonShop": 94,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 57
+    },
+    {
+        "MainData": 850,
+        "Pokemon": 387,
+        "Traps": 74,
+        "Items": 98,
+        "KecleonShop": 94,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 57
+    },
+    {
+        "MainData": 851,
+        "Pokemon": 387,
+        "Traps": 74,
+        "Items": 98,
+        "KecleonShop": 94,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 57
+    },
+    {
+        "MainData": 852,
+        "Pokemon": 387,
+        "Traps": 74,
+        "Items": 98,
+        "KecleonShop": 94,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 57
+    },
+    {
+        "MainData": 853,
+        "Pokemon": 387,
+        "Traps": 74,
+        "Items": 98,
+        "KecleonShop": 94,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 57
+    },
+    {
+        "MainData": 854,
+        "Pokemon": 388,
+        "Traps": 74,
+        "Items": 98,
+        "KecleonShop": 94,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 57
+    },
+    {
+        "MainData": 855,
+        "Pokemon": 388,
+        "Traps": 74,
+        "Items": 98,
+        "KecleonShop": 94,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 57
+    },
+    {
+        "MainData": 856,
+        "Pokemon": 389,
+        "Traps": 74,
+        "Items": 98,
+        "KecleonShop": 94,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 57
+    },
+    {
+        "MainData": 857,
+        "Pokemon": 389,
+        "Traps": 74,
+        "Items": 98,
+        "KecleonShop": 94,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 57
+    },
+    {
+        "MainData": 858,
+        "Pokemon": 389,
+        "Traps": 74,
+        "Items": 98,
+        "KecleonShop": 94,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 57
+    },
+    {
+        "MainData": 859,
+        "Pokemon": 389,
+        "Traps": 74,
+        "Items": 98,
+        "KecleonShop": 94,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 57
+    },
+    {
+        "MainData": 860,
+        "Pokemon": 390,
+        "Traps": 74,
+        "Items": 98,
+        "KecleonShop": 94,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 57
+    },
+    {
+        "MainData": 861,
+        "Pokemon": 391,
+        "Traps": 74,
+        "Items": 98,
+        "KecleonShop": 94,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 57
+    },
+    {
+        "MainData": 862,
+        "Pokemon": 391,
+        "Traps": 74,
+        "Items": 98,
+        "KecleonShop": 94,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 57
+    },
+    {
+        "MainData": 863,
+        "Pokemon": 391,
+        "Traps": 74,
+        "Items": 98,
+        "KecleonShop": 94,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 57
+    },
+    {
+        "MainData": 864,
+        "Pokemon": 392,
+        "Traps": 74,
+        "Items": 98,
+        "KecleonShop": 94,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 57
+    },
+    {
+        "MainData": 865,
+        "Pokemon": 393,
+        "Traps": 74,
+        "Items": 98,
+        "KecleonShop": 94,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 57
+    },
+    {
+        "MainData": 866,
+        "Pokemon": 393,
+        "Traps": 74,
+        "Items": 98,
+        "KecleonShop": 94,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 57
+    },
+    {
+        "MainData": 867,
+        "Pokemon": 393,
+        "Traps": 74,
+        "Items": 98,
+        "KecleonShop": 94,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 57
+    },
+    {
+        "MainData": 868,
+        "Pokemon": 393,
+        "Traps": 74,
+        "Items": 99,
+        "KecleonShop": 94,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 57
+    },
+    {
+        "MainData": 869,
+        "Pokemon": 394,
+        "Traps": 74,
+        "Items": 99,
+        "KecleonShop": 94,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 57
+    }
+    ]
+}
-- 
cgit v1.2.3