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/NorthernRange/floor_id.json | 460 +++++++++++++++----------------
 1 file changed, 230 insertions(+), 230 deletions(-)

(limited to 'data/dungeon/NorthernRange')

diff --git a/data/dungeon/NorthernRange/floor_id.json b/data/dungeon/NorthernRange/floor_id.json
index 86a4c82..27ca365 100644
--- a/data/dungeon/NorthernRange/floor_id.json
+++ b/data/dungeon/NorthernRange/floor_id.json
@@ -1,230 +1,230 @@
-{
-    "name": "NorthernRangeFloorID",
-    "tables": [
-    {
-        "MainData": 703,
-        "Pokemon": 327,
-        "Traps": 62,
-        "Items": 84,
-        "KecleonShop": 37,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 704,
-        "Pokemon": 327,
-        "Traps": 62,
-        "Items": 84,
-        "KecleonShop": 37,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 705,
-        "Pokemon": 327,
-        "Traps": 62,
-        "Items": 84,
-        "KecleonShop": 37,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 706,
-        "Pokemon": 327,
-        "Traps": 62,
-        "Items": 85,
-        "KecleonShop": 37,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 707,
-        "Pokemon": 327,
-        "Traps": 62,
-        "Items": 85,
-        "KecleonShop": 37,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 708,
-        "Pokemon": 328,
-        "Traps": 62,
-        "Items": 85,
-        "KecleonShop": 37,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 709,
-        "Pokemon": 329,
-        "Traps": 62,
-        "Items": 85,
-        "KecleonShop": 37,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 710,
-        "Pokemon": 330,
-        "Traps": 62,
-        "Items": 85,
-        "KecleonShop": 37,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 711,
-        "Pokemon": 330,
-        "Traps": 62,
-        "Items": 85,
-        "KecleonShop": 37,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 712,
-        "Pokemon": 330,
-        "Traps": 62,
-        "Items": 85,
-        "KecleonShop": 37,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 713,
-        "Pokemon": 330,
-        "Traps": 62,
-        "Items": 85,
-        "KecleonShop": 37,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 714,
-        "Pokemon": 331,
-        "Traps": 62,
-        "Items": 85,
-        "KecleonShop": 37,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 715,
-        "Pokemon": 331,
-        "Traps": 62,
-        "Items": 85,
-        "KecleonShop": 37,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 716,
-        "Pokemon": 332,
-        "Traps": 62,
-        "Items": 85,
-        "KecleonShop": 37,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 717,
-        "Pokemon": 332,
-        "Traps": 62,
-        "Items": 85,
-        "KecleonShop": 37,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 718,
-        "Pokemon": 332,
-        "Traps": 62,
-        "Items": 85,
-        "KecleonShop": 37,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 719,
-        "Pokemon": 333,
-        "Traps": 62,
-        "Items": 85,
-        "KecleonShop": 37,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 720,
-        "Pokemon": 334,
-        "Traps": 62,
-        "Items": 85,
-        "KecleonShop": 37,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 721,
-        "Pokemon": 335,
-        "Traps": 62,
-        "Items": 85,
-        "KecleonShop": 37,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 722,
-        "Pokemon": 336,
-        "Traps": 62,
-        "Items": 85,
-        "KecleonShop": 37,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 723,
-        "Pokemon": 337,
-        "Traps": 61,
-        "Items": 85,
-        "KecleonShop": 37,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 724,
-        "Pokemon": 337,
-        "Traps": 61,
-        "Items": 85,
-        "KecleonShop": 37,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 725,
-        "Pokemon": 337,
-        "Traps": 61,
-        "Items": 86,
-        "KecleonShop": 37,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 726,
-        "Pokemon": 337,
-        "Traps": 61,
-        "Items": 86,
-        "KecleonShop": 37,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 727,
-        "Pokemon": 338,
-        "Traps": 61,
-        "Items": 86,
-        "KecleonShop": 37,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    }
-    ]
-}
+{
+    "name": "NorthernRangeFloorID",
+    "tables": [
+    {
+        "MainData": 703,
+        "Pokemon": 327,
+        "Traps": 62,
+        "Items": 84,
+        "KecleonShop": 37,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 704,
+        "Pokemon": 327,
+        "Traps": 62,
+        "Items": 84,
+        "KecleonShop": 37,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 705,
+        "Pokemon": 327,
+        "Traps": 62,
+        "Items": 84,
+        "KecleonShop": 37,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 706,
+        "Pokemon": 327,
+        "Traps": 62,
+        "Items": 85,
+        "KecleonShop": 37,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 707,
+        "Pokemon": 327,
+        "Traps": 62,
+        "Items": 85,
+        "KecleonShop": 37,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 708,
+        "Pokemon": 328,
+        "Traps": 62,
+        "Items": 85,
+        "KecleonShop": 37,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 709,
+        "Pokemon": 329,
+        "Traps": 62,
+        "Items": 85,
+        "KecleonShop": 37,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 710,
+        "Pokemon": 330,
+        "Traps": 62,
+        "Items": 85,
+        "KecleonShop": 37,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 711,
+        "Pokemon": 330,
+        "Traps": 62,
+        "Items": 85,
+        "KecleonShop": 37,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 712,
+        "Pokemon": 330,
+        "Traps": 62,
+        "Items": 85,
+        "KecleonShop": 37,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 713,
+        "Pokemon": 330,
+        "Traps": 62,
+        "Items": 85,
+        "KecleonShop": 37,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 714,
+        "Pokemon": 331,
+        "Traps": 62,
+        "Items": 85,
+        "KecleonShop": 37,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 715,
+        "Pokemon": 331,
+        "Traps": 62,
+        "Items": 85,
+        "KecleonShop": 37,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 716,
+        "Pokemon": 332,
+        "Traps": 62,
+        "Items": 85,
+        "KecleonShop": 37,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 717,
+        "Pokemon": 332,
+        "Traps": 62,
+        "Items": 85,
+        "KecleonShop": 37,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 718,
+        "Pokemon": 332,
+        "Traps": 62,
+        "Items": 85,
+        "KecleonShop": 37,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 719,
+        "Pokemon": 333,
+        "Traps": 62,
+        "Items": 85,
+        "KecleonShop": 37,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 720,
+        "Pokemon": 334,
+        "Traps": 62,
+        "Items": 85,
+        "KecleonShop": 37,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 721,
+        "Pokemon": 335,
+        "Traps": 62,
+        "Items": 85,
+        "KecleonShop": 37,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 722,
+        "Pokemon": 336,
+        "Traps": 62,
+        "Items": 85,
+        "KecleonShop": 37,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 723,
+        "Pokemon": 337,
+        "Traps": 61,
+        "Items": 85,
+        "KecleonShop": 37,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 724,
+        "Pokemon": 337,
+        "Traps": 61,
+        "Items": 85,
+        "KecleonShop": 37,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 725,
+        "Pokemon": 337,
+        "Traps": 61,
+        "Items": 86,
+        "KecleonShop": 37,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 726,
+        "Pokemon": 337,
+        "Traps": 61,
+        "Items": 86,
+        "KecleonShop": 37,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 727,
+        "Pokemon": 338,
+        "Traps": 61,
+        "Items": 86,
+        "KecleonShop": 37,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    }
+    ]
+}
-- 
cgit v1.2.3