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/MarvelousSea/floor_id.json b/data/dungeon/MarvelousSea/floor_id.json
index a0660cf..ffd84e4 100644
--- a/data/dungeon/MarvelousSea/floor_id.json
+++ b/data/dungeon/MarvelousSea/floor_id.json
@@ -1,185 +1,185 @@
-{

-    "name": "MarvelousSeaFloorID",

-    "tables": [

-    {

-        "MainData": 1071,

-        "Pokemon": 502,

-        "Traps": 86,

-        "Items": 121,

-        "KecleonShop": 1,

-        "MonsterRoomItems": 46,

-        "BuriedItems": 3

-    },

-    {

-        "MainData": 1072,

-        "Pokemon": 502,

-        "Traps": 86,

-        "Items": 121,

-        "KecleonShop": 1,

-        "MonsterRoomItems": 46,

-        "BuriedItems": 3

-    },

-    {

-        "MainData": 1073,

-        "Pokemon": 502,

-        "Traps": 86,

-        "Items": 121,

-        "KecleonShop": 1,

-        "MonsterRoomItems": 46,

-        "BuriedItems": 3

-    },

-    {

-        "MainData": 1074,

-        "Pokemon": 502,

-        "Traps": 86,

-        "Items": 122,

-        "KecleonShop": 1,

-        "MonsterRoomItems": 46,

-        "BuriedItems": 3

-    },

-    {

-        "MainData": 1075,

-        "Pokemon": 502,

-        "Traps": 86,

-        "Items": 122,

-        "KecleonShop": 1,

-        "MonsterRoomItems": 46,

-        "BuriedItems": 3

-    },

-    {

-        "MainData": 1076,

-        "Pokemon": 503,

-        "Traps": 86,

-        "Items": 122,

-        "KecleonShop": 1,

-        "MonsterRoomItems": 46,

-        "BuriedItems": 3

-    },

-    {

-        "MainData": 1077,

-        "Pokemon": 503,

-        "Traps": 86,

-        "Items": 122,

-        "KecleonShop": 1,

-        "MonsterRoomItems": 46,

-        "BuriedItems": 3

-    },

-    {

-        "MainData": 1078,

-        "Pokemon": 503,

-        "Traps": 86,

-        "Items": 122,

-        "KecleonShop": 1,

-        "MonsterRoomItems": 46,

-        "BuriedItems": 3

-    },

-    {

-        "MainData": 1079,

-        "Pokemon": 504,

-        "Traps": 86,

-        "Items": 122,

-        "KecleonShop": 1,

-        "MonsterRoomItems": 46,

-        "BuriedItems": 3

-    },

-    {

-        "MainData": 1080,

-        "Pokemon": 505,

-        "Traps": 86,

-        "Items": 122,

-        "KecleonShop": 1,

-        "MonsterRoomItems": 46,

-        "BuriedItems": 3

-    },

-    {

-        "MainData": 1081,

-        "Pokemon": 505,

-        "Traps": 86,

-        "Items": 122,

-        "KecleonShop": 1,

-        "MonsterRoomItems": 46,

-        "BuriedItems": 3

-    },

-    {

-        "MainData": 1082,

-        "Pokemon": 505,

-        "Traps": 86,

-        "Items": 122,

-        "KecleonShop": 1,

-        "MonsterRoomItems": 46,

-        "BuriedItems": 3

-    },

-    {

-        "MainData": 1083,

-        "Pokemon": 505,

-        "Traps": 86,

-        "Items": 122,

-        "KecleonShop": 1,

-        "MonsterRoomItems": 46,

-        "BuriedItems": 3

-    },

-    {

-        "MainData": 1084,

-        "Pokemon": 506,

-        "Traps": 86,

-        "Items": 122,

-        "KecleonShop": 1,

-        "MonsterRoomItems": 46,

-        "BuriedItems": 3

-    },

-    {

-        "MainData": 1085,

-        "Pokemon": 507,

-        "Traps": 86,

-        "Items": 122,

-        "KecleonShop": 1,

-        "MonsterRoomItems": 46,

-        "BuriedItems": 3

-    },

-    {

-        "MainData": 1086,

-        "Pokemon": 507,

-        "Traps": 86,

-        "Items": 122,

-        "KecleonShop": 1,

-        "MonsterRoomItems": 46,

-        "BuriedItems": 3

-    },

-    {

-        "MainData": 1087,

-        "Pokemon": 507,

-        "Traps": 86,

-        "Items": 122,

-        "KecleonShop": 1,

-        "MonsterRoomItems": 46,

-        "BuriedItems": 3

-    },

-    {

-        "MainData": 1088,

-        "Pokemon": 507,

-        "Traps": 86,

-        "Items": 122,

-        "KecleonShop": 1,

-        "MonsterRoomItems": 46,

-        "BuriedItems": 3

-    },

-    {

-        "MainData": 1089,

-        "Pokemon": 507,

-        "Traps": 86,

-        "Items": 122,

-        "KecleonShop": 1,

-        "MonsterRoomItems": 46,

-        "BuriedItems": 3

-    },

-    {

-        "MainData": 1090,

-        "Pokemon": 508,

-        "Traps": 86,

-        "Items": 122,

-        "KecleonShop": 1,

-        "MonsterRoomItems": 46,

-        "BuriedItems": 3

-    }

-    ]

-}

+{
+    "name": "MarvelousSeaFloorID",
+    "tables": [
+    {
+        "MainData": 1071,
+        "Pokemon": 502,
+        "Traps": 86,
+        "Items": 121,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1072,
+        "Pokemon": 502,
+        "Traps": 86,
+        "Items": 121,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1073,
+        "Pokemon": 502,
+        "Traps": 86,
+        "Items": 121,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1074,
+        "Pokemon": 502,
+        "Traps": 86,
+        "Items": 122,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1075,
+        "Pokemon": 502,
+        "Traps": 86,
+        "Items": 122,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1076,
+        "Pokemon": 503,
+        "Traps": 86,
+        "Items": 122,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1077,
+        "Pokemon": 503,
+        "Traps": 86,
+        "Items": 122,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1078,
+        "Pokemon": 503,
+        "Traps": 86,
+        "Items": 122,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1079,
+        "Pokemon": 504,
+        "Traps": 86,
+        "Items": 122,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1080,
+        "Pokemon": 505,
+        "Traps": 86,
+        "Items": 122,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1081,
+        "Pokemon": 505,
+        "Traps": 86,
+        "Items": 122,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1082,
+        "Pokemon": 505,
+        "Traps": 86,
+        "Items": 122,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1083,
+        "Pokemon": 505,
+        "Traps": 86,
+        "Items": 122,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1084,
+        "Pokemon": 506,
+        "Traps": 86,
+        "Items": 122,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1085,
+        "Pokemon": 507,
+        "Traps": 86,
+        "Items": 122,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1086,
+        "Pokemon": 507,
+        "Traps": 86,
+        "Items": 122,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1087,
+        "Pokemon": 507,
+        "Traps": 86,
+        "Items": 122,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1088,
+        "Pokemon": 507,
+        "Traps": 86,
+        "Items": 122,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1089,
+        "Pokemon": 507,
+        "Traps": 86,
+        "Items": 122,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    },
+    {
+        "MainData": 1090,
+        "Pokemon": 508,
+        "Traps": 86,
+        "Items": 122,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 46,
+        "BuriedItems": 3
+    }
+    ]
+}