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/FantasyStrait/floor_id.json | 550 +++++++++++++++---------------- 1 file changed, 275 insertions(+), 275 deletions(-) (limited to 'data/dungeon/FantasyStrait') diff --git a/data/dungeon/FantasyStrait/floor_id.json b/data/dungeon/FantasyStrait/floor_id.json index b948978..38b8b3e 100644 --- a/data/dungeon/FantasyStrait/floor_id.json +++ b/data/dungeon/FantasyStrait/floor_id.json @@ -1,275 +1,275 @@ -{ - "name": "FantasyStraitFloorID", - "tables": [ - { - "MainData": 1091, - "Pokemon": 509, - "Traps": 86, - "Items": 121, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1092, - "Pokemon": 509, - "Traps": 86, - "Items": 121, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1093, - "Pokemon": 509, - "Traps": 86, - "Items": 121, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1094, - "Pokemon": 509, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1095, - "Pokemon": 510, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1096, - "Pokemon": 511, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1097, - "Pokemon": 511, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1098, - "Pokemon": 511, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1099, - "Pokemon": 512, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1100, - "Pokemon": 513, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1101, - "Pokemon": 513, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1102, - "Pokemon": 513, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1103, - "Pokemon": 513, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1104, - "Pokemon": 514, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1105, - "Pokemon": 515, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1106, - "Pokemon": 515, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1107, - "Pokemon": 515, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1108, - "Pokemon": 515, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1109, - "Pokemon": 515, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1110, - "Pokemon": 516, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1111, - "Pokemon": 517, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1112, - "Pokemon": 517, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1113, - "Pokemon": 517, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1114, - "Pokemon": 137, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1115, - "Pokemon": 518, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1116, - "Pokemon": 519, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1117, - "Pokemon": 519, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1118, - "Pokemon": 519, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1119, - "Pokemon": 519, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1120, - "Pokemon": 520, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - } - ] -} +{ + "name": "FantasyStraitFloorID", + "tables": [ + { + "MainData": 1091, + "Pokemon": 509, + "Traps": 86, + "Items": 121, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1092, + "Pokemon": 509, + "Traps": 86, + "Items": 121, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1093, + "Pokemon": 509, + "Traps": 86, + "Items": 121, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1094, + "Pokemon": 509, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1095, + "Pokemon": 510, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1096, + "Pokemon": 511, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1097, + "Pokemon": 511, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1098, + "Pokemon": 511, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1099, + "Pokemon": 512, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1100, + "Pokemon": 513, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1101, + "Pokemon": 513, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1102, + "Pokemon": 513, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1103, + "Pokemon": 513, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1104, + "Pokemon": 514, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1105, + "Pokemon": 515, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1106, + "Pokemon": 515, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1107, + "Pokemon": 515, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1108, + "Pokemon": 515, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1109, + "Pokemon": 515, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1110, + "Pokemon": 516, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1111, + "Pokemon": 517, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1112, + "Pokemon": 517, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1113, + "Pokemon": 517, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1114, + "Pokemon": 137, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1115, + "Pokemon": 518, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1116, + "Pokemon": 519, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1117, + "Pokemon": 519, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1118, + "Pokemon": 519, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1119, + "Pokemon": 519, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1120, + "Pokemon": 520, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + } + ] +} -- cgit v1.2.3