From 8237e29a164211eb2ec4cd161eb4183cc1947fee Mon Sep 17 00:00:00 2001 From: Cheng Hann Gan 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 * Renamed symbols per PR comments Co-authored-by: Cheng Hann Gan Co-authored-by: Seth Barberee --- data/dungeon/D50/floor_id.json | 46 +++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 23 deletions(-) (limited to 'data/dungeon/D50') diff --git a/data/dungeon/D50/floor_id.json b/data/dungeon/D50/floor_id.json index 4dc2f2e..6f23a99 100644 --- a/data/dungeon/D50/floor_id.json +++ b/data/dungeon/D50/floor_id.json @@ -1,23 +1,23 @@ -{ - "name": "D50FloorID", - "tables": [ - { - "MainData": 1139, - "Pokemon": 526, - "Traps": 87, - "Items": 87, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 1140, - "Pokemon": 526, - "Traps": 87, - "Items": 87, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 66 - } - ] -} +{ + "name": "D50FloorID", + "tables": [ + { + "MainData": 1139, + "Pokemon": 526, + "Traps": 87, + "Items": 87, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1140, + "Pokemon": 526, + "Traps": 87, + "Items": 87, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + } + ] +} -- cgit v1.2.3