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/SilentChasm/floor_id.json | 172 ++++---- data/dungeon/SilentChasm/pokemon_found.json | 632 ++++++++++++++-------------- 2 files changed, 402 insertions(+), 402 deletions(-) (limited to 'data/dungeon/SilentChasm') diff --git a/data/dungeon/SilentChasm/floor_id.json b/data/dungeon/SilentChasm/floor_id.json index 4ae1414..4f90018 100644 --- a/data/dungeon/SilentChasm/floor_id.json +++ b/data/dungeon/SilentChasm/floor_id.json @@ -1,86 +1,86 @@ -{ - "name": "SilentChasmFloorID", - "tables": [ - { - "MainData": 30, - "Pokemon": 22, - "Traps": 1, - "Items": 13, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 31, - "Pokemon": 22, - "Traps": 1, - "Items": 13, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 32, - "Pokemon": 22, - "Traps": 1, - "Items": 13, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 33, - "Pokemon": 23, - "Traps": 1, - "Items": 14, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 34, - "Pokemon": 24, - "Traps": 1, - "Items": 14, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 35, - "Pokemon": 25, - "Traps": 1, - "Items": 14, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 36, - "Pokemon": 26, - "Traps": 1, - "Items": 14, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 37, - "Pokemon": 27, - "Traps": 1, - "Items": 14, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 38, - "Pokemon": 28, - "Traps": 1, - "Items": 14, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - } - ] -} +{ + "name": "SilentChasmFloorID", + "tables": [ + { + "MainData": 30, + "Pokemon": 22, + "Traps": 1, + "Items": 13, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 31, + "Pokemon": 22, + "Traps": 1, + "Items": 13, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 32, + "Pokemon": 22, + "Traps": 1, + "Items": 13, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 33, + "Pokemon": 23, + "Traps": 1, + "Items": 14, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 34, + "Pokemon": 24, + "Traps": 1, + "Items": 14, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 35, + "Pokemon": 25, + "Traps": 1, + "Items": 14, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 36, + "Pokemon": 26, + "Traps": 1, + "Items": 14, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 37, + "Pokemon": 27, + "Traps": 1, + "Items": 14, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 38, + "Pokemon": 28, + "Traps": 1, + "Items": 14, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + } + ] +} diff --git a/data/dungeon/SilentChasm/pokemon_found.json b/data/dungeon/SilentChasm/pokemon_found.json index 6cbcca8..5edadea 100644 --- a/data/dungeon/SilentChasm/pokemon_found.json +++ b/data/dungeon/SilentChasm/pokemon_found.json @@ -1,316 +1,316 @@ -{ - "tables": [{ - "name": "SilentChasm_1F_3F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_WEEDLE", - "level": 8, - "probability": 1667 - }, - { - "species": "SPECIES_GLOOM", - "level": 10, - "probability": 1000 - }, - { - "species": "SPECIES_FARFETCHD", - "level": 10, - "probability": 2666 - }, - { - "species": "SPECIES_YANMA", - "level": 10, - "probability": 2000 - }, - { - "species": "SPECIES_TEDDIURSA", - "level": 10, - "probability": 2667 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "SilentChasm_4F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_WEEDLE", - "level": 8, - "probability": 2778 - }, - { - "species": "SPECIES_GLOOM", - "level": 10, - "probability": 1666 - }, - { - "species": "SPECIES_YANMA", - "level": 10, - "probability": 3334 - }, - { - "species": "SPECIES_DUSTOX", - "level": 10, - "probability": 2222 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "SilentChasm_5F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_WEEDLE", - "level": 8, - "probability": 1515 - }, - { - "species": "SPECIES_GLOOM", - "level": 10, - "probability": 909 - }, - { - "species": "SPECIES_POLIWAG", - "level": 10, - "probability": 909 - }, - { - "species": "SPECIES_YANMA", - "level": 10, - "probability": 1819 - }, - { - "species": "SPECIES_HOUNDOUR", - "level": 11, - "probability": 2424 - }, - { - "species": "SPECIES_DUSTOX", - "level": 10, - "probability": 2424 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "SilentChasm_6F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_WEEDLE", - "level": 8, - "probability": 1064 - }, - { - "species": "SPECIES_GLOOM", - "level": 10, - "probability": 638 - }, - { - "species": "SPECIES_POLIWAG", - "level": 10, - "probability": 638 - }, - { - "species": "SPECIES_SPINARAK", - "level": 11, - "probability": 1277 - }, - { - "species": "SPECIES_YANMA", - "level": 10, - "probability": 1277 - }, - { - "species": "SPECIES_HOUNDOUR", - "level": 11, - "probability": 1702 - }, - { - "species": "SPECIES_DUSTOX", - "level": 10, - "probability": 1702 - }, - { - "species": "SPECIES_TRAPINCH", - "level": 11, - "probability": 1702 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "SilentChasm_7F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_GLOOM", - "level": 10, - "probability": 652 - }, - { - "species": "SPECIES_PARAS", - "level": 11, - "probability": 870 - }, - { - "species": "SPECIES_POLIWAG", - "level": 10, - "probability": 652 - }, - { - "species": "SPECIES_SPINARAK", - "level": 11, - "probability": 1304 - }, - { - "species": "SPECIES_YANMA", - "level": 10, - "probability": 1305 - }, - { - "species": "SPECIES_HOUNDOUR", - "level": 11, - "probability": 1739 - }, - { - "species": "SPECIES_DUSTOX", - "level": 10, - "probability": 1739 - }, - { - "species": "SPECIES_TRAPINCH", - "level": 11, - "probability": 1739 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "SilentChasm_8F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_GLOOM", - "level": 10, - "probability": 1000 - }, - { - "species": "SPECIES_PARAS", - "level": 11, - "probability": 1333 - }, - { - "species": "SPECIES_POLIWAG", - "level": 10, - "probability": 1000 - }, - { - "species": "SPECIES_SPINARAK", - "level": 11, - "probability": 2000 - }, - { - "species": "SPECIES_YANMA", - "level": 10, - "probability": 2000 - }, - { - "species": "SPECIES_TRAPINCH", - "level": 11, - "probability": 2667 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "SilentChasm_9F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_BEEDRILL", - "level": 10, - "probability": 1724 - }, - { - "species": "SPECIES_GLOOM", - "level": 10, - "probability": 1035 - }, - { - "species": "SPECIES_PARAS", - "level": 11, - "probability": 1379 - }, - { - "species": "SPECIES_POLIWAG", - "level": 10, - "probability": 1034 - }, - { - "species": "SPECIES_SPINARAK", - "level": 11, - "probability": 2069 - }, - { - "species": "SPECIES_TRAPINCH", - "level": 11, - "probability": 2759 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }] -} +{ + "tables": [{ + "name": "SilentChasm_1F_3F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_WEEDLE", + "level": 8, + "probability": 1667 + }, + { + "species": "SPECIES_GLOOM", + "level": 10, + "probability": 1000 + }, + { + "species": "SPECIES_FARFETCHD", + "level": 10, + "probability": 2666 + }, + { + "species": "SPECIES_YANMA", + "level": 10, + "probability": 2000 + }, + { + "species": "SPECIES_TEDDIURSA", + "level": 10, + "probability": 2667 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "SilentChasm_4F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_WEEDLE", + "level": 8, + "probability": 2778 + }, + { + "species": "SPECIES_GLOOM", + "level": 10, + "probability": 1666 + }, + { + "species": "SPECIES_YANMA", + "level": 10, + "probability": 3334 + }, + { + "species": "SPECIES_DUSTOX", + "level": 10, + "probability": 2222 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "SilentChasm_5F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_WEEDLE", + "level": 8, + "probability": 1515 + }, + { + "species": "SPECIES_GLOOM", + "level": 10, + "probability": 909 + }, + { + "species": "SPECIES_POLIWAG", + "level": 10, + "probability": 909 + }, + { + "species": "SPECIES_YANMA", + "level": 10, + "probability": 1819 + }, + { + "species": "SPECIES_HOUNDOUR", + "level": 11, + "probability": 2424 + }, + { + "species": "SPECIES_DUSTOX", + "level": 10, + "probability": 2424 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "SilentChasm_6F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_WEEDLE", + "level": 8, + "probability": 1064 + }, + { + "species": "SPECIES_GLOOM", + "level": 10, + "probability": 638 + }, + { + "species": "SPECIES_POLIWAG", + "level": 10, + "probability": 638 + }, + { + "species": "SPECIES_SPINARAK", + "level": 11, + "probability": 1277 + }, + { + "species": "SPECIES_YANMA", + "level": 10, + "probability": 1277 + }, + { + "species": "SPECIES_HOUNDOUR", + "level": 11, + "probability": 1702 + }, + { + "species": "SPECIES_DUSTOX", + "level": 10, + "probability": 1702 + }, + { + "species": "SPECIES_TRAPINCH", + "level": 11, + "probability": 1702 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "SilentChasm_7F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_GLOOM", + "level": 10, + "probability": 652 + }, + { + "species": "SPECIES_PARAS", + "level": 11, + "probability": 870 + }, + { + "species": "SPECIES_POLIWAG", + "level": 10, + "probability": 652 + }, + { + "species": "SPECIES_SPINARAK", + "level": 11, + "probability": 1304 + }, + { + "species": "SPECIES_YANMA", + "level": 10, + "probability": 1305 + }, + { + "species": "SPECIES_HOUNDOUR", + "level": 11, + "probability": 1739 + }, + { + "species": "SPECIES_DUSTOX", + "level": 10, + "probability": 1739 + }, + { + "species": "SPECIES_TRAPINCH", + "level": 11, + "probability": 1739 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "SilentChasm_8F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_GLOOM", + "level": 10, + "probability": 1000 + }, + { + "species": "SPECIES_PARAS", + "level": 11, + "probability": 1333 + }, + { + "species": "SPECIES_POLIWAG", + "level": 10, + "probability": 1000 + }, + { + "species": "SPECIES_SPINARAK", + "level": 11, + "probability": 2000 + }, + { + "species": "SPECIES_YANMA", + "level": 10, + "probability": 2000 + }, + { + "species": "SPECIES_TRAPINCH", + "level": 11, + "probability": 2667 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "SilentChasm_9F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_BEEDRILL", + "level": 10, + "probability": 1724 + }, + { + "species": "SPECIES_GLOOM", + "level": 10, + "probability": 1035 + }, + { + "species": "SPECIES_PARAS", + "level": 11, + "probability": 1379 + }, + { + "species": "SPECIES_POLIWAG", + "level": 10, + "probability": 1034 + }, + { + "species": "SPECIES_SPINARAK", + "level": 11, + "probability": 2069 + }, + { + "species": "SPECIES_TRAPINCH", + "level": 11, + "probability": 2759 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }] +} -- cgit v1.2.3