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/LapisCave/floor_id.json | 262 +++++++++++----------- data/dungeon/LapisCave/pokemon_found.json | 348 +++++++++++++++--------------- 2 files changed, 305 insertions(+), 305 deletions(-) (limited to 'data/dungeon/LapisCave') diff --git a/data/dungeon/LapisCave/floor_id.json b/data/dungeon/LapisCave/floor_id.json index ef52aa7..9ea5aca 100644 --- a/data/dungeon/LapisCave/floor_id.json +++ b/data/dungeon/LapisCave/floor_id.json @@ -1,131 +1,131 @@ -{ - "name": "LapisCaveFloorID", - "tables": [ - { - "MainData": 64, - "Pokemon": 48, - "Traps": 4, - "Items": 21, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 65, - "Pokemon": 48, - "Traps": 4, - "Items": 21, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 66, - "Pokemon": 48, - "Traps": 4, - "Items": 21, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 67, - "Pokemon": 49, - "Traps": 4, - "Items": 21, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 68, - "Pokemon": 50, - "Traps": 4, - "Items": 22, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 69, - "Pokemon": 50, - "Traps": 4, - "Items": 22, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 70, - "Pokemon": 50, - "Traps": 4, - "Items": 23, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 71, - "Pokemon": 50, - "Traps": 4, - "Items": 23, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 72, - "Pokemon": 51, - "Traps": 4, - "Items": 23, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 73, - "Pokemon": 51, - "Traps": 4, - "Items": 23, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 74, - "Pokemon": 52, - "Traps": 4, - "Items": 23, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 75, - "Pokemon": 52, - "Traps": 4, - "Items": 23, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 76, - "Pokemon": 53, - "Traps": 4, - "Items": 23, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 77, - "Pokemon": 54, - "Traps": 4, - "Items": 23, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - } - ] -} +{ + "name": "LapisCaveFloorID", + "tables": [ + { + "MainData": 64, + "Pokemon": 48, + "Traps": 4, + "Items": 21, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 65, + "Pokemon": 48, + "Traps": 4, + "Items": 21, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 66, + "Pokemon": 48, + "Traps": 4, + "Items": 21, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 67, + "Pokemon": 49, + "Traps": 4, + "Items": 21, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 68, + "Pokemon": 50, + "Traps": 4, + "Items": 22, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 69, + "Pokemon": 50, + "Traps": 4, + "Items": 22, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 70, + "Pokemon": 50, + "Traps": 4, + "Items": 23, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 71, + "Pokemon": 50, + "Traps": 4, + "Items": 23, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 72, + "Pokemon": 51, + "Traps": 4, + "Items": 23, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 73, + "Pokemon": 51, + "Traps": 4, + "Items": 23, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 74, + "Pokemon": 52, + "Traps": 4, + "Items": 23, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 75, + "Pokemon": 52, + "Traps": 4, + "Items": 23, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 76, + "Pokemon": 53, + "Traps": 4, + "Items": 23, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 77, + "Pokemon": 54, + "Traps": 4, + "Items": 23, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + } + ] +} diff --git a/data/dungeon/LapisCave/pokemon_found.json b/data/dungeon/LapisCave/pokemon_found.json index 4e46b1c..7964480 100644 --- a/data/dungeon/LapisCave/pokemon_found.json +++ b/data/dungeon/LapisCave/pokemon_found.json @@ -1,174 +1,174 @@ -{ - "tables": [{ - "name": "LapisCave_1F_3F_Pokemon", - "pokemon": [{ - "species": "SPECIES_ZUBAT", - "level": 17, - "probability": 5000 - }, - { - "species": "SPECIES_NINCADA", - "level": 14, - "probability": 5000 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "LapisCave_4F_Pokemon", - "pokemon": [{ - "species": "SPECIES_NIDORINA", - "level": 15, - "probability": 3333 - }, - { - "species": "SPECIES_NIDORINO", - "level": 15, - "probability": 3334 - }, - { - "species": "SPECIES_NINCADA", - "level": 14, - "probability": 3333 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "LapisCave_5F_8F_Pokemon", - "pokemon": [{ - "species": "SPECIES_NIDORINA", - "level": 15, - "probability": 3333 - }, - { - "species": "SPECIES_NIDORINO", - "level": 15, - "probability": 3334 - }, - { - "species": "SPECIES_ILLIMISE", - "level": 15, - "probability": 3333 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "LapisCave_9F_10F_Pokemon", - "pokemon": [{ - "species": "SPECIES_TANGELA", - "level": 14, - "probability": 5000 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_BAGON", - "level": 16, - "probability": 5000 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "LapisCave_11F_12F_Pokemon", - "pokemon": [{ - "species": "SPECIES_GOLBAT", - "level": 10, - "probability": 3333 - }, - { - "species": "SPECIES_TANGELA", - "level": 14, - "probability": 3334 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_BAGON", - "level": 16, - "probability": 3333 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "LapisCave_13F_Pokemon", - "pokemon": [{ - "species": "SPECIES_GOLBAT", - "level": 10, - "probability": 5000 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_BAGON", - "level": 16, - "probability": 5000 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "LapisCave_14F_Pokemon", - "pokemon": [{ - "species": "SPECIES_GOLBAT", - "level": 10, - "probability": 10000 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }] -} +{ + "tables": [{ + "name": "LapisCave_1F_3F_Pokemon", + "pokemon": [{ + "species": "SPECIES_ZUBAT", + "level": 17, + "probability": 5000 + }, + { + "species": "SPECIES_NINCADA", + "level": 14, + "probability": 5000 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "LapisCave_4F_Pokemon", + "pokemon": [{ + "species": "SPECIES_NIDORINA", + "level": 15, + "probability": 3333 + }, + { + "species": "SPECIES_NIDORINO", + "level": 15, + "probability": 3334 + }, + { + "species": "SPECIES_NINCADA", + "level": 14, + "probability": 3333 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "LapisCave_5F_8F_Pokemon", + "pokemon": [{ + "species": "SPECIES_NIDORINA", + "level": 15, + "probability": 3333 + }, + { + "species": "SPECIES_NIDORINO", + "level": 15, + "probability": 3334 + }, + { + "species": "SPECIES_ILLIMISE", + "level": 15, + "probability": 3333 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "LapisCave_9F_10F_Pokemon", + "pokemon": [{ + "species": "SPECIES_TANGELA", + "level": 14, + "probability": 5000 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_BAGON", + "level": 16, + "probability": 5000 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "LapisCave_11F_12F_Pokemon", + "pokemon": [{ + "species": "SPECIES_GOLBAT", + "level": 10, + "probability": 3333 + }, + { + "species": "SPECIES_TANGELA", + "level": 14, + "probability": 3334 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_BAGON", + "level": 16, + "probability": 3333 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "LapisCave_13F_Pokemon", + "pokemon": [{ + "species": "SPECIES_GOLBAT", + "level": 10, + "probability": 5000 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_BAGON", + "level": 16, + "probability": 5000 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "LapisCave_14F_Pokemon", + "pokemon": [{ + "species": "SPECIES_GOLBAT", + "level": 10, + "probability": 10000 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }] +} -- cgit v1.2.3