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>

1 files changed, 185 insertions, 185 deletions

diff --git a/data/dungeon/SolarCave/floor_id.json b/data/dungeon/SolarCave/floor_id.json
index fc8d677..b742d12 100644
--- a/data/dungeon/SolarCave/floor_id.json
+++ b/data/dungeon/SolarCave/floor_id.json
@@ -1,185 +1,185 @@
-{

-    "name": "SolarCaveFloorID",

-    "tables": [

-    {

-        "MainData": 900,

-        "Pokemon": 412,

-        "Traps": 75,

-        "Items": 102,

-        "KecleonShop": 1,

-        "MonsterRoomItems": 46,

-        "BuriedItems": 3

-    },

-    {

-        "MainData": 901,

-        "Pokemon": 412,

-        "Traps": 76,

-        "Items": 102,

-        "KecleonShop": 1,

-        "MonsterRoomItems": 46,

-        "BuriedItems": 3

-    },

-    {

-        "MainData": 902,

-        "Pokemon": 412,

-        "Traps": 77,

-        "Items": 102,

-        "KecleonShop": 1,

-        "MonsterRoomItems": 46,

-        "BuriedItems": 3

-    },

-    {

-        "MainData": 903,

-        "Pokemon": 413,

-        "Traps": 78,

-        "Items": 102,

-        "KecleonShop": 1,

-        "MonsterRoomItems": 46,

-        "BuriedItems": 3

-    },

-    {

-        "MainData": 904,

-        "Pokemon": 414,

-        "Traps": 79,

-        "Items": 102,

-        "KecleonShop": 1,

-        "MonsterRoomItems": 46,

-        "BuriedItems": 3

-    },

-    {

-        "MainData": 905,

-        "Pokemon": 415,

-        "Traps": 80,

-        "Items": 102,

-        "KecleonShop": 1,

-        "MonsterRoomItems": 46,

-        "BuriedItems": 3

-    },

-    {

-        "MainData": 906,

-        "Pokemon": 416,

-        "Traps": 81,

-        "Items": 102,

-        "KecleonShop": 1,

-        "MonsterRoomItems": 46,

-        "BuriedItems": 3

-    },

-    {

-        "MainData": 907,

-        "Pokemon": 417,

-        "Traps": 81,

-        "Items": 102,

-        "KecleonShop": 1,

-        "MonsterRoomItems": 46,

-        "BuriedItems": 3

-    },

-    {

-        "MainData": 908,

-        "Pokemon": 418,

-        "Traps": 81,

-        "Items": 102,

-        "KecleonShop": 1,

-        "MonsterRoomItems": 46,

-        "BuriedItems": 3

-    },

-    {

-        "MainData": 909,

-        "Pokemon": 419,

-        "Traps": 81,

-        "Items": 103,

-        "KecleonShop": 1,

-        "MonsterRoomItems": 46,

-        "BuriedItems": 3

-    },

-    {

-        "MainData": 910,

-        "Pokemon": 420,

-        "Traps": 82,

-        "Items": 103,

-        "KecleonShop": 1,

-        "MonsterRoomItems": 46,

-        "BuriedItems": 3

-    },

-    {

-        "MainData": 911,

-        "Pokemon": 421,

-        "Traps": 82,

-        "Items": 103,

-        "KecleonShop": 1,

-        "MonsterRoomItems": 46,

-        "BuriedItems": 3

-    },

-    {

-        "MainData": 912,

-        "Pokemon": 422,

-        "Traps": 82,

-        "Items": 103,

-        "KecleonShop": 1,

-        "MonsterRoomItems": 46,

-        "BuriedItems": 3

-    },

-    {

-        "MainData": 913,

-        "Pokemon": 422,

-        "Traps": 82,

-        "Items": 103,

-        "KecleonShop": 1,

-        "MonsterRoomItems": 46,

-        "BuriedItems": 3

-    },

-    {

-        "MainData": 914,

-        "Pokemon": 423,

-        "Traps": 82,

-        "Items": 103,

-        "KecleonShop": 1,

-        "MonsterRoomItems": 46,

-        "BuriedItems": 3

-    },

-    {

-        "MainData": 915,

-        "Pokemon": 424,

-        "Traps": 83,

-        "Items": 104,

-        "KecleonShop": 1,

-        "MonsterRoomItems": 46,

-        "BuriedItems": 3

-    },

-    {

-        "MainData": 916,

-        "Pokemon": 425,

-        "Traps": 83,

-        "Items": 104,

-        "KecleonShop": 1,

-        "MonsterRoomItems": 46,

-        "BuriedItems": 3

-    },

-    {

-        "MainData": 917,

-        "Pokemon": 426,

-        "Traps": 83,

-        "Items": 104,

-        "KecleonShop": 1,

-        "MonsterRoomItems": 46,

-        "BuriedItems": 3

-    },

-    {

-        "MainData": 918,

-        "Pokemon": 426,

-        "Traps": 83,

-        "Items": 104,

-        "KecleonShop": 1,

-        "MonsterRoomItems": 46,

-        "BuriedItems": 3

-    },

-    {

-        "MainData": 919,

-        "Pokemon": 426,

-        "Traps": 84,

-        "Items": 104,

-        "KecleonShop": 1,

-        "MonsterRoomItems": 46,

-        "BuriedItems": 3

-    }

-    ]

-}

+{
+    "name": "SolarCaveFloorID",
+    "tables": [
+    {
+        "MainData": 900,
+        "Pokemon": 412,
+        "Traps": 75,
+        "Items": 102,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 901,
+        "Pokemon": 412,
+        "Traps": 76,
+        "Items": 102,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 902,
+        "Pokemon": 412,
+        "Traps": 77,
+        "Items": 102,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 903,
+        "Pokemon": 413,
+        "Traps": 78,
+        "Items": 102,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 904,
+        "Pokemon": 414,
+        "Traps": 79,
+        "Items": 102,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 905,
+        "Pokemon": 415,
+        "Traps": 80,
+        "Items": 102,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 906,
+        "Pokemon": 416,
+        "Traps": 81,
+        "Items": 102,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 907,
+        "Pokemon": 417,
+        "Traps": 81,
+        "Items": 102,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 908,
+        "Pokemon": 418,
+        "Traps": 81,
+        "Items": 102,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 909,
+        "Pokemon": 419,
+        "Traps": 81,
+        "Items": 103,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 910,
+        "Pokemon": 420,
+        "Traps": 82,
+        "Items": 103,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 911,
+        "Pokemon": 421,
+        "Traps": 82,
+        "Items": 103,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 912,
+        "Pokemon": 422,
+        "Traps": 82,
+        "Items": 103,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 913,
+        "Pokemon": 422,
+        "Traps": 82,
+        "Items": 103,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 914,
+        "Pokemon": 423,
+        "Traps": 82,
+        "Items": 103,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 915,
+        "Pokemon": 424,
+        "Traps": 83,
+        "Items": 104,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 916,
+        "Pokemon": 425,
+        "Traps": 83,
+        "Items": 104,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 917,
+        "Pokemon": 426,
+        "Traps": 83,
+        "Items": 104,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 918,
+        "Pokemon": 426,
+        "Traps": 83,
+        "Items": 104,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 919,
+        "Pokemon": 426,
+        "Traps": 84,
+        "Items": 104,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    }
+    ]
+}