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>

2 files changed, 356 insertions, 356 deletions

diff --git a/data/dungeon/MtFreeze/floor_id.json b/data/dungeon/MtFreeze/floor_id.json
index 3cd5011..9fc3948 100644
--- a/data/dungeon/MtFreeze/floor_id.json
+++ b/data/dungeon/MtFreeze/floor_id.json
@@ -1,140 +1,140 @@
-{

-    "name": "MtFreezeFloorID",

-    "tables": [

-    {

-        "MainData": 107,

-        "Pokemon": 72,

-        "Traps": 3,

-        "Items": 32,

-        "KecleonShop": 28,

-        "MonsterRoomItems": 2,

-        "BuriedItems": 3

-    },

-    {

-        "MainData": 108,

-        "Pokemon": 72,

-        "Traps": 3,

-        "Items": 32,

-        "KecleonShop": 28,

-        "MonsterRoomItems": 2,

-        "BuriedItems": 3

-    },

-    {

-        "MainData": 109,

-        "Pokemon": 73,

-        "Traps": 3,

-        "Items": 32,

-        "KecleonShop": 28,

-        "MonsterRoomItems": 2,

-        "BuriedItems": 3

-    },

-    {

-        "MainData": 110,

-        "Pokemon": 73,

-        "Traps": 3,

-        "Items": 33,

-        "KecleonShop": 28,

-        "MonsterRoomItems": 2,

-        "BuriedItems": 3

-    },

-    {

-        "MainData": 111,

-        "Pokemon": 73,

-        "Traps": 3,

-        "Items": 33,

-        "KecleonShop": 28,

-        "MonsterRoomItems": 2,

-        "BuriedItems": 3

-    },

-    {

-        "MainData": 112,

-        "Pokemon": 74,

-        "Traps": 3,

-        "Items": 33,

-        "KecleonShop": 28,

-        "MonsterRoomItems": 2,

-        "BuriedItems": 3

-    },

-    {

-        "MainData": 113,

-        "Pokemon": 75,

-        "Traps": 3,

-        "Items": 33,

-        "KecleonShop": 28,

-        "MonsterRoomItems": 2,

-        "BuriedItems": 3

-    },

-    {

-        "MainData": 114,

-        "Pokemon": 76,

-        "Traps": 3,

-        "Items": 33,

-        "KecleonShop": 28,

-        "MonsterRoomItems": 2,

-        "BuriedItems": 3

-    },

-    {

-        "MainData": 115,

-        "Pokemon": 76,

-        "Traps": 3,

-        "Items": 33,

-        "KecleonShop": 28,

-        "MonsterRoomItems": 2,

-        "BuriedItems": 3

-    },

-    {

-        "MainData": 116,

-        "Pokemon": 76,

-        "Traps": 3,

-        "Items": 33,

-        "KecleonShop": 28,

-        "MonsterRoomItems": 2,

-        "BuriedItems": 3

-    },

-    {

-        "MainData": 117,

-        "Pokemon": 76,

-        "Traps": 3,

-        "Items": 33,

-        "KecleonShop": 28,

-        "MonsterRoomItems": 2,

-        "BuriedItems": 3

-    },

-    {

-        "MainData": 118,

-        "Pokemon": 77,

-        "Traps": 3,

-        "Items": 33,

-        "KecleonShop": 28,

-        "MonsterRoomItems": 2,

-        "BuriedItems": 3

-    },

-    {

-        "MainData": 119,

-        "Pokemon": 78,

-        "Traps": 3,

-        "Items": 33,

-        "KecleonShop": 28,

-        "MonsterRoomItems": 2,

-        "BuriedItems": 3

-    },

-    {

-        "MainData": 120,

-        "Pokemon": 78,

-        "Traps": 3,

-        "Items": 33,

-        "KecleonShop": 28,

-        "MonsterRoomItems": 2,

-        "BuriedItems": 3

-    },

-    {

-        "MainData": 121,

-        "Pokemon": 78,

-        "Traps": 3,

-        "Items": 33,

-        "KecleonShop": 28,

-        "MonsterRoomItems": 2,

-        "BuriedItems": 3

-    }

-    ]

-}

+{
+    "name": "MtFreezeFloorID",
+    "tables": [
+    {
+        "MainData": 107,
+        "Pokemon": 72,
+        "Traps": 3,
+        "Items": 32,
+        "KecleonShop": 28,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 108,
+        "Pokemon": 72,
+        "Traps": 3,
+        "Items": 32,
+        "KecleonShop": 28,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 109,
+        "Pokemon": 73,
+        "Traps": 3,
+        "Items": 32,
+        "KecleonShop": 28,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 110,
+        "Pokemon": 73,
+        "Traps": 3,
+        "Items": 33,
+        "KecleonShop": 28,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 111,
+        "Pokemon": 73,
+        "Traps": 3,
+        "Items": 33,
+        "KecleonShop": 28,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 112,
+        "Pokemon": 74,
+        "Traps": 3,
+        "Items": 33,
+        "KecleonShop": 28,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 113,
+        "Pokemon": 75,
+        "Traps": 3,
+        "Items": 33,
+        "KecleonShop": 28,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 114,
+        "Pokemon": 76,
+        "Traps": 3,
+        "Items": 33,
+        "KecleonShop": 28,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 115,
+        "Pokemon": 76,
+        "Traps": 3,
+        "Items": 33,
+        "KecleonShop": 28,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 116,
+        "Pokemon": 76,
+        "Traps": 3,
+        "Items": 33,
+        "KecleonShop": 28,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 117,
+        "Pokemon": 76,
+        "Traps": 3,
+        "Items": 33,
+        "KecleonShop": 28,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 118,
+        "Pokemon": 77,
+        "Traps": 3,
+        "Items": 33,
+        "KecleonShop": 28,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 119,
+        "Pokemon": 78,
+        "Traps": 3,
+        "Items": 33,
+        "KecleonShop": 28,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 120,
+        "Pokemon": 78,
+        "Traps": 3,
+        "Items": 33,
+        "KecleonShop": 28,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 121,
+        "Pokemon": 78,
+        "Traps": 3,
+        "Items": 33,
+        "KecleonShop": 28,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 3
+    }
+    ]
+}
diff --git a/data/dungeon/MtFreeze/pokemon_found.json b/data/dungeon/MtFreeze/pokemon_found.json
index 413e22c..bdd07d0 100644
--- a/data/dungeon/MtFreeze/pokemon_found.json
+++ b/data/dungeon/MtFreeze/pokemon_found.json
@@ -1,216 +1,216 @@
-{

-	"tables": [{

-		"name": "MtFreeze_1F_2F_Pokemon",

-		"pokemon": [

-                        {

-				"species": "SPECIES_PINECO",

-				"level": 18,

-				"probability": 1111

-			},

-			{

-				"species": "SPECIES_SWABLU",

-				"level": 18,

-				"probability": 4445

-			},

-			{

-				"species": "SPECIES_KECLEON",

-				"level": 90,

-				"probability": 0

-			},

-			{

-				"species": "SPECIES_SHELGON",

-				"level": 19,

-				"probability": 4444

-			},

-			{

-				"species": "SPECIES_DECOY",

-				"level": 1,

-				"probability": 0

-			}

-		]

-	}, {

-		"name": "MtFreeze_3F_5F_Pokemon",

-		"pokemon": [

-			{

-				"species": "SPECIES_SEEL",

-				"level": 18,

-				"probability": 2759

-			},

-                        {

-				"species": "SPECIES_PINECO",

-				"level": 18,

-				"probability": 689

-			},

-			{

-				"species": "SPECIES_PUPITAR",

-				"level": 17,

-				"probability": 1035

-			},

-			{

-				"species": "SPECIES_SWABLU",

-				"level": 18,

-				"probability": 2758

-			},

-			{

-				"species": "SPECIES_KECLEON",

-				"level": 90,

-				"probability": 0

-			},

-			{

-				"species": "SPECIES_SHELGON",

-				"level": 19,

-				"probability": 2759

-			},

-			{

-				"species": "SPECIES_DECOY",

-				"level": 1,

-				"probability": 0

-			}

-		]

-	}, {

-		"name": "MtFreeze_6F_Pokemon",

-		"pokemon": [

-			{

-				"species": "SPECIES_SEEL",

-				"level": 18,

-				"probability": 3333

-			},

-			{

-				"species": "SPECIES_SWABLU",

-				"level": 18,

-				"probability": 3334

-			},

-			{

-				"species": "SPECIES_KECLEON",

-				"level": 90,

-				"probability": 0

-			},

-			{

-				"species": "SPECIES_SHELGON",

-				"level": 19,

-				"probability": 3333

-			},

-			{

-				"species": "SPECIES_DECOY",

-				"level": 1,

-				"probability": 0

-			}

-		]

-	}, {

-		"name": "MtFreeze_7F_Pokemon",

-		"pokemon": [

-			{

-				"species": "SPECIES_SEEL",

-				"level": 18,

-				"probability": 2857

-			},

-			{

-				"species": "SPECIES_VIGOROTH",

-				"level": 20,

-				"probability": 2857

-			},

-			{

-				"species": "SPECIES_ZANGOOSE",

-				"level": 18,

-				"probability": 2857

-			},

-			{

-				"species": "SPECIES_KECLEON",

-				"level": 90,

-				"probability": 0

-			},

-			{

-				"species": "SPECIES_CHIMECHO",

-				"level": 22,

-				"probability": 1429

-			},

-			{

-				"species": "SPECIES_DECOY",

-				"level": 1,

-				"probability": 0

-			}

-		]

-	}, {

-		"name": "MtFreeze_8F_11F_Pokemon",

-		"pokemon": [

-			{

-				"species": "SPECIES_VIGOROTH",

-				"level": 20,

-				"probability": 4000

-			},

-			{

-				"species": "SPECIES_ZANGOOSE",

-				"level": 18,

-				"probability": 4000

-			},

-			{

-				"species": "SPECIES_KECLEON",

-				"level": 90,

-				"probability": 0

-			},

-			{

-				"species": "SPECIES_CHIMECHO",

-				"level": 22,

-				"probability": 2000

-			},

-			{

-				"species": "SPECIES_DECOY",

-				"level": 1,

-				"probability": 0

-			}

-		]

-	}, {

-		"name": "MtFreeze_12F_Pokemon",

-		"pokemon": [

-			{

-				"species": "SPECIES_SLAKING",

-				"level": 15,

-				"probability": 4000

-			},

-			{

-				"species": "SPECIES_ZANGOOSE",

-				"level": 18,

-				"probability": 4000

-			},

-			{

-				"species": "SPECIES_KECLEON",

-				"level": 90,

-				"probability": 0

-			},

-			{

-				"species": "SPECIES_CHIMECHO",

-				"level": 22,

-				"probability": 2000

-			},

-			{

-				"species": "SPECIES_DECOY",

-				"level": 1,

-				"probability": 0

-			}

-		]

-	}, {

-		"name": "MtFreeze_13F_15F_Pokemon",

-		"pokemon": [

-			{

-				"species": "SPECIES_SLAKING",

-				"level": 15,

-				"probability": 5000

-			},

-			{

-				"species": "SPECIES_SEVIPER",

-				"level": 19,

-				"probability": 5000

-			},

-			{

-				"species": "SPECIES_KECLEON",

-				"level": 90,

-				"probability": 0

-			},

-			{

-				"species": "SPECIES_DECOY",

-				"level": 1,

-				"probability": 0

-			}

-		]

-	}]

-}

+{
+	"tables": [{
+		"name": "MtFreeze_1F_2F_Pokemon",
+		"pokemon": [
+                        {
+				"species": "SPECIES_PINECO",
+				"level": 18,
+				"probability": 1111
+			},
+			{
+				"species": "SPECIES_SWABLU",
+				"level": 18,
+				"probability": 4445
+			},
+			{
+				"species": "SPECIES_KECLEON",
+				"level": 90,
+				"probability": 0
+			},
+			{
+				"species": "SPECIES_SHELGON",
+				"level": 19,
+				"probability": 4444
+			},
+			{
+				"species": "SPECIES_DECOY",
+				"level": 1,
+				"probability": 0
+			}
+		]
+	}, {
+		"name": "MtFreeze_3F_5F_Pokemon",
+		"pokemon": [
+			{
+				"species": "SPECIES_SEEL",
+				"level": 18,
+				"probability": 2759
+			},
+                        {
+				"species": "SPECIES_PINECO",
+				"level": 18,
+				"probability": 689
+			},
+			{
+				"species": "SPECIES_PUPITAR",
+				"level": 17,
+				"probability": 1035
+			},
+			{
+				"species": "SPECIES_SWABLU",
+				"level": 18,
+				"probability": 2758
+			},
+			{
+				"species": "SPECIES_KECLEON",
+				"level": 90,
+				"probability": 0
+			},
+			{
+				"species": "SPECIES_SHELGON",
+				"level": 19,
+				"probability": 2759
+			},
+			{
+				"species": "SPECIES_DECOY",
+				"level": 1,
+				"probability": 0
+			}
+		]
+	}, {
+		"name": "MtFreeze_6F_Pokemon",
+		"pokemon": [
+			{
+				"species": "SPECIES_SEEL",
+				"level": 18,
+				"probability": 3333
+			},
+			{
+				"species": "SPECIES_SWABLU",
+				"level": 18,
+				"probability": 3334
+			},
+			{
+				"species": "SPECIES_KECLEON",
+				"level": 90,
+				"probability": 0
+			},
+			{
+				"species": "SPECIES_SHELGON",
+				"level": 19,
+				"probability": 3333
+			},
+			{
+				"species": "SPECIES_DECOY",
+				"level": 1,
+				"probability": 0
+			}
+		]
+	}, {
+		"name": "MtFreeze_7F_Pokemon",
+		"pokemon": [
+			{
+				"species": "SPECIES_SEEL",
+				"level": 18,
+				"probability": 2857
+			},
+			{
+				"species": "SPECIES_VIGOROTH",
+				"level": 20,
+				"probability": 2857
+			},
+			{
+				"species": "SPECIES_ZANGOOSE",
+				"level": 18,
+				"probability": 2857
+			},
+			{
+				"species": "SPECIES_KECLEON",
+				"level": 90,
+				"probability": 0
+			},
+			{
+				"species": "SPECIES_CHIMECHO",
+				"level": 22,
+				"probability": 1429
+			},
+			{
+				"species": "SPECIES_DECOY",
+				"level": 1,
+				"probability": 0
+			}
+		]
+	}, {
+		"name": "MtFreeze_8F_11F_Pokemon",
+		"pokemon": [
+			{
+				"species": "SPECIES_VIGOROTH",
+				"level": 20,
+				"probability": 4000
+			},
+			{
+				"species": "SPECIES_ZANGOOSE",
+				"level": 18,
+				"probability": 4000
+			},
+			{
+				"species": "SPECIES_KECLEON",
+				"level": 90,
+				"probability": 0
+			},
+			{
+				"species": "SPECIES_CHIMECHO",
+				"level": 22,
+				"probability": 2000
+			},
+			{
+				"species": "SPECIES_DECOY",
+				"level": 1,
+				"probability": 0
+			}
+		]
+	}, {
+		"name": "MtFreeze_12F_Pokemon",
+		"pokemon": [
+			{
+				"species": "SPECIES_SLAKING",
+				"level": 15,
+				"probability": 4000
+			},
+			{
+				"species": "SPECIES_ZANGOOSE",
+				"level": 18,
+				"probability": 4000
+			},
+			{
+				"species": "SPECIES_KECLEON",
+				"level": 90,
+				"probability": 0
+			},
+			{
+				"species": "SPECIES_CHIMECHO",
+				"level": 22,
+				"probability": 2000
+			},
+			{
+				"species": "SPECIES_DECOY",
+				"level": 1,
+				"probability": 0
+			}
+		]
+	}, {
+		"name": "MtFreeze_13F_15F_Pokemon",
+		"pokemon": [
+			{
+				"species": "SPECIES_SLAKING",
+				"level": 15,
+				"probability": 5000
+			},
+			{
+				"species": "SPECIES_SEVIPER",
+				"level": 19,
+				"probability": 5000
+			},
+			{
+				"species": "SPECIES_KECLEON",
+				"level": 90,
+				"probability": 0
+			},
+			{
+				"species": "SPECIES_DECOY",
+				"level": 1,
+				"probability": 0
+			}
+		]
+	}]
+}