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/FrostyGrotto/floor_id.json      | 100 +++++++++++++--------------
 data/dungeon/FrostyGrotto/pokemon_found.json |  94 ++++++++++++-------------
 2 files changed, 97 insertions(+), 97 deletions(-)

(limited to 'data/dungeon/FrostyGrotto')

diff --git a/data/dungeon/FrostyGrotto/floor_id.json b/data/dungeon/FrostyGrotto/floor_id.json
index 886b207..2b8c806 100644
--- a/data/dungeon/FrostyGrotto/floor_id.json
+++ b/data/dungeon/FrostyGrotto/floor_id.json
@@ -1,50 +1,50 @@
-{
-    "name": "FrostyGrottoFloorID",
-    "tables": [
-    {
-        "MainData": 102,
-        "Pokemon": 70,
-        "Traps": 3,
-        "Items": 30,
-        "KecleonShop": 28,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 103,
-        "Pokemon": 70,
-        "Traps": 3,
-        "Items": 30,
-        "KecleonShop": 28,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 104,
-        "Pokemon": 70,
-        "Traps": 3,
-        "Items": 30,
-        "KecleonShop": 28,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 105,
-        "Pokemon": 70,
-        "Traps": 3,
-        "Items": 31,
-        "KecleonShop": 28,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    },
-    {
-        "MainData": 106,
-        "Pokemon": 71,
-        "Traps": 3,
-        "Items": 31,
-        "KecleonShop": 28,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 3
-    }
-    ]
-}
+{
+    "name": "FrostyGrottoFloorID",
+    "tables": [
+    {
+        "MainData": 102,
+        "Pokemon": 70,
+        "Traps": 3,
+        "Items": 30,
+        "KecleonShop": 28,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 103,
+        "Pokemon": 70,
+        "Traps": 3,
+        "Items": 30,
+        "KecleonShop": 28,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 104,
+        "Pokemon": 70,
+        "Traps": 3,
+        "Items": 30,
+        "KecleonShop": 28,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 105,
+        "Pokemon": 70,
+        "Traps": 3,
+        "Items": 31,
+        "KecleonShop": 28,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 106,
+        "Pokemon": 71,
+        "Traps": 3,
+        "Items": 31,
+        "KecleonShop": 28,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    }
+    ]
+}
diff --git a/data/dungeon/FrostyGrotto/pokemon_found.json b/data/dungeon/FrostyGrotto/pokemon_found.json
index 65ad404..241f094 100644
--- a/data/dungeon/FrostyGrotto/pokemon_found.json
+++ b/data/dungeon/FrostyGrotto/pokemon_found.json
@@ -1,47 +1,47 @@
-{
-	"tables": [{
-		"name": "FrostyGrotto_1F_4F_Pokemon",
-		"pokemon": [
-                        {
-				"species": "SPECIES_RHYHORN",
-				"level": 16,
-				"probability": 5000
-			},
-			{
-				"species": "SPECIES_KECLEON",
-				"level": 90,
-				"probability": 0
-			},
-			{
-				"species": "SPECIES_METANG",
-				"level": 17,
-				"probability": 5000
-			},
-			{
-				"species": "SPECIES_DECOY",
-				"level": 1,
-				"probability": 0
-			}
-		]
-	}, {
-		"name": "FrostyGrotto_5F_Pokemon",
-		"pokemon": [
-                        {
-				"species": "SPECIES_ARTICUNO",
-				"level": 33,
-				"probability": 10000
-			},
-			{
-				"species": "SPECIES_KECLEON",
-				"level": 90,
-				"probability": 0
-			},
-			{
-				"species": "SPECIES_DECOY",
-				"level": 1,
-				"probability": 0
-			}
-		]
-        }
-        ]
-}
+{
+	"tables": [{
+		"name": "FrostyGrotto_1F_4F_Pokemon",
+		"pokemon": [
+                        {
+				"species": "SPECIES_RHYHORN",
+				"level": 16,
+				"probability": 5000
+			},
+			{
+				"species": "SPECIES_KECLEON",
+				"level": 90,
+				"probability": 0
+			},
+			{
+				"species": "SPECIES_METANG",
+				"level": 17,
+				"probability": 5000
+			},
+			{
+				"species": "SPECIES_DECOY",
+				"level": 1,
+				"probability": 0
+			}
+		]
+	}, {
+		"name": "FrostyGrotto_5F_Pokemon",
+		"pokemon": [
+                        {
+				"species": "SPECIES_ARTICUNO",
+				"level": 33,
+				"probability": 10000
+			},
+			{
+				"species": "SPECIES_KECLEON",
+				"level": 90,
+				"probability": 0
+			},
+			{
+				"species": "SPECIES_DECOY",
+				"level": 1,
+				"probability": 0
+			}
+		]
+        }
+        ]
+}
-- 
cgit v1.2.3