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/RockPath/floor_id.json | 82 ++++++++++++++++++-------------------
 1 file changed, 41 insertions(+), 41 deletions(-)

(limited to 'data/dungeon/RockPath')

diff --git a/data/dungeon/RockPath/floor_id.json b/data/dungeon/RockPath/floor_id.json
index 5a6666e..6c8aed9 100644
--- a/data/dungeon/RockPath/floor_id.json
+++ b/data/dungeon/RockPath/floor_id.json
@@ -1,41 +1,41 @@
-{
-    "name": "RockPathFloorID",
-    "tables": [
-    {
-        "MainData": 1121,
-        "Pokemon": 521,
-        "Traps": 10,
-        "Items": 123,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1122,
-        "Pokemon": 521,
-        "Traps": 10,
-        "Items": 123,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1123,
-        "Pokemon": 521,
-        "Traps": 10,
-        "Items": 123,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 1124,
-        "Pokemon": 521,
-        "Traps": 10,
-        "Items": 123,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    }
-    ]
-}
+{
+    "name": "RockPathFloorID",
+    "tables": [
+    {
+        "MainData": 1121,
+        "Pokemon": 521,
+        "Traps": 10,
+        "Items": 123,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1122,
+        "Pokemon": 521,
+        "Traps": 10,
+        "Items": 123,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1123,
+        "Pokemon": 521,
+        "Traps": 10,
+        "Items": 123,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1124,
+        "Pokemon": 521,
+        "Traps": 10,
+        "Items": 123,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    }
+    ]
+}
-- 
cgit v1.2.3