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/D51/floor_id.json | 910 ++++++++++++++++++++--------------------- 1 file changed, 455 insertions(+), 455 deletions(-) (limited to 'data/dungeon/D51') diff --git a/data/dungeon/D51/floor_id.json b/data/dungeon/D51/floor_id.json index 42acf2d..6c67400 100644 --- a/data/dungeon/D51/floor_id.json +++ b/data/dungeon/D51/floor_id.json @@ -1,455 +1,455 @@ -{ - "name": "D51FloorID", - "tables": [ - { - "MainData": 1141, - "Pokemon": 526, - "Traps": 87, - "Items": 128, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1142, - "Pokemon": 526, - "Traps": 87, - "Items": 128, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1143, - "Pokemon": 532, - "Traps": 87, - "Items": 128, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1144, - "Pokemon": 533, - "Traps": 87, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1145, - "Pokemon": 529, - "Traps": 87, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1146, - "Pokemon": 529, - "Traps": 87, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1147, - "Pokemon": 530, - "Traps": 87, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1148, - "Pokemon": 530, - "Traps": 87, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1149, - "Pokemon": 530, - "Traps": 87, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1150, - "Pokemon": 531, - "Traps": 87, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1151, - "Pokemon": 531, - "Traps": 87, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1152, - "Pokemon": 531, - "Traps": 87, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1153, - "Pokemon": 531, - "Traps": 87, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1154, - "Pokemon": 534, - "Traps": 87, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1155, - "Pokemon": 534, - "Traps": 87, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1156, - "Pokemon": 535, - "Traps": 87, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1157, - "Pokemon": 535, - "Traps": 87, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1158, - "Pokemon": 535, - "Traps": 87, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1159, - "Pokemon": 535, - "Traps": 87, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1160, - "Pokemon": 536, - "Traps": 87, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1161, - "Pokemon": 536, - "Traps": 88, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1162, - "Pokemon": 537, - "Traps": 88, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1163, - "Pokemon": 537, - "Traps": 88, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1164, - "Pokemon": 537, - "Traps": 88, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1165, - "Pokemon": 537, - "Traps": 88, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1166, - "Pokemon": 538, - "Traps": 88, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1167, - "Pokemon": 538, - "Traps": 88, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1168, - "Pokemon": 538, - "Traps": 88, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1169, - "Pokemon": 538, - "Traps": 88, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1170, - "Pokemon": 538, - "Traps": 88, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1171, - "Pokemon": 539, - "Traps": 88, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1172, - "Pokemon": 539, - "Traps": 88, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1173, - "Pokemon": 539, - "Traps": 88, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1174, - "Pokemon": 539, - "Traps": 88, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1175, - "Pokemon": 539, - "Traps": 88, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1176, - "Pokemon": 540, - "Traps": 88, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1177, - "Pokemon": 540, - "Traps": 88, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1178, - "Pokemon": 540, - "Traps": 88, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1179, - "Pokemon": 540, - "Traps": 88, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1180, - "Pokemon": 540, - "Traps": 88, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1181, - "Pokemon": 541, - "Traps": 89, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1182, - "Pokemon": 541, - "Traps": 89, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1183, - "Pokemon": 541, - "Traps": 89, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1184, - "Pokemon": 541, - "Traps": 89, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1185, - "Pokemon": 541, - "Traps": 89, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1186, - "Pokemon": 541, - "Traps": 89, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1187, - "Pokemon": 542, - "Traps": 89, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1188, - "Pokemon": 542, - "Traps": 89, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1189, - "Pokemon": 542, - "Traps": 89, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1190, - "Pokemon": 542, - "Traps": 90, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - } - ] -} +{ + "name": "D51FloorID", + "tables": [ + { + "MainData": 1141, + "Pokemon": 526, + "Traps": 87, + "Items": 128, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1142, + "Pokemon": 526, + "Traps": 87, + "Items": 128, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1143, + "Pokemon": 532, + "Traps": 87, + "Items": 128, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1144, + "Pokemon": 533, + "Traps": 87, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1145, + "Pokemon": 529, + "Traps": 87, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1146, + "Pokemon": 529, + "Traps": 87, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1147, + "Pokemon": 530, + "Traps": 87, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1148, + "Pokemon": 530, + "Traps": 87, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1149, + "Pokemon": 530, + "Traps": 87, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1150, + "Pokemon": 531, + "Traps": 87, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1151, + "Pokemon": 531, + "Traps": 87, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1152, + "Pokemon": 531, + "Traps": 87, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1153, + "Pokemon": 531, + "Traps": 87, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1154, + "Pokemon": 534, + "Traps": 87, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1155, + "Pokemon": 534, + "Traps": 87, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1156, + "Pokemon": 535, + "Traps": 87, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1157, + "Pokemon": 535, + "Traps": 87, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1158, + "Pokemon": 535, + "Traps": 87, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1159, + "Pokemon": 535, + "Traps": 87, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1160, + "Pokemon": 536, + "Traps": 87, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1161, + "Pokemon": 536, + "Traps": 88, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1162, + "Pokemon": 537, + "Traps": 88, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1163, + "Pokemon": 537, + "Traps": 88, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1164, + "Pokemon": 537, + "Traps": 88, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1165, + "Pokemon": 537, + "Traps": 88, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1166, + "Pokemon": 538, + "Traps": 88, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1167, + "Pokemon": 538, + "Traps": 88, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1168, + "Pokemon": 538, + "Traps": 88, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1169, + "Pokemon": 538, + "Traps": 88, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1170, + "Pokemon": 538, + "Traps": 88, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1171, + "Pokemon": 539, + "Traps": 88, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1172, + "Pokemon": 539, + "Traps": 88, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1173, + "Pokemon": 539, + "Traps": 88, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1174, + "Pokemon": 539, + "Traps": 88, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1175, + "Pokemon": 539, + "Traps": 88, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1176, + "Pokemon": 540, + "Traps": 88, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1177, + "Pokemon": 540, + "Traps": 88, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1178, + "Pokemon": 540, + "Traps": 88, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1179, + "Pokemon": 540, + "Traps": 88, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1180, + "Pokemon": 540, + "Traps": 88, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1181, + "Pokemon": 541, + "Traps": 89, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1182, + "Pokemon": 541, + "Traps": 89, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1183, + "Pokemon": 541, + "Traps": 89, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1184, + "Pokemon": 541, + "Traps": 89, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1185, + "Pokemon": 541, + "Traps": 89, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1186, + "Pokemon": 541, + "Traps": 89, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1187, + "Pokemon": 542, + "Traps": 89, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1188, + "Pokemon": 542, + "Traps": 89, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1189, + "Pokemon": 542, + "Traps": 89, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1190, + "Pokemon": 542, + "Traps": 90, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + } + ] +} -- cgit v1.2.3