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/FrostyForest/floor_id.json | 172 ++++++------- data/dungeon/FrostyForest/pokemon_found.json | 368 +++++++++++++-------------- 2 files changed, 270 insertions(+), 270 deletions(-) (limited to 'data/dungeon/FrostyForest') diff --git a/data/dungeon/FrostyForest/floor_id.json b/data/dungeon/FrostyForest/floor_id.json index 538dae7..9e907aa 100644 --- a/data/dungeon/FrostyForest/floor_id.json +++ b/data/dungeon/FrostyForest/floor_id.json @@ -1,86 +1,86 @@ -{ - "name": "FrostyForestFloorID", - "tables": [ - { - "MainData": 93, - "Pokemon": 64, - "Traps": 3, - "Items": 27, - "KecleonShop": 28, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 94, - "Pokemon": 64, - "Traps": 3, - "Items": 27, - "KecleonShop": 28, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 95, - "Pokemon": 65, - "Traps": 3, - "Items": 27, - "KecleonShop": 28, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 96, - "Pokemon": 66, - "Traps": 3, - "Items": 29, - "KecleonShop": 28, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 97, - "Pokemon": 67, - "Traps": 3, - "Items": 29, - "KecleonShop": 28, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 98, - "Pokemon": 67, - "Traps": 3, - "Items": 29, - "KecleonShop": 28, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 99, - "Pokemon": 68, - "Traps": 3, - "Items": 29, - "KecleonShop": 28, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 100, - "Pokemon": 69, - "Traps": 3, - "Items": 29, - "KecleonShop": 28, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 101, - "Pokemon": 69, - "Traps": 3, - "Items": 29, - "KecleonShop": 28, - "MonsterRoomItems": 2, - "BuriedItems": 3 - } - ] -} +{ + "name": "FrostyForestFloorID", + "tables": [ + { + "MainData": 93, + "Pokemon": 64, + "Traps": 3, + "Items": 27, + "KecleonShop": 28, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 94, + "Pokemon": 64, + "Traps": 3, + "Items": 27, + "KecleonShop": 28, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 95, + "Pokemon": 65, + "Traps": 3, + "Items": 27, + "KecleonShop": 28, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 96, + "Pokemon": 66, + "Traps": 3, + "Items": 29, + "KecleonShop": 28, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 97, + "Pokemon": 67, + "Traps": 3, + "Items": 29, + "KecleonShop": 28, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 98, + "Pokemon": 67, + "Traps": 3, + "Items": 29, + "KecleonShop": 28, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 99, + "Pokemon": 68, + "Traps": 3, + "Items": 29, + "KecleonShop": 28, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 100, + "Pokemon": 69, + "Traps": 3, + "Items": 29, + "KecleonShop": 28, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 101, + "Pokemon": 69, + "Traps": 3, + "Items": 29, + "KecleonShop": 28, + "MonsterRoomItems": 2, + "BuriedItems": 3 + } + ] +} diff --git a/data/dungeon/FrostyForest/pokemon_found.json b/data/dungeon/FrostyForest/pokemon_found.json index 66e0441..c35cf48 100644 --- a/data/dungeon/FrostyForest/pokemon_found.json +++ b/data/dungeon/FrostyForest/pokemon_found.json @@ -1,184 +1,184 @@ -{ - "tables": [{ - "name": "FrostyForest_1F_2F_Pokemon", - "pokemon": [{ - "species": "SPECIES_FURRET", - "level": 14, - "probability": 6250 - }, - { - "species": "SPECIES_AZURILL", - "level": 11, - "probability": 3750 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - - "name": "FrostyForest_3F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_FURRET", - "level": 14, - "probability": 4167 - }, - { - "species": "SPECIES_AZURILL", - "level": 11, - "probability": 2500 - }, - { - "species": "SPECIES_NOSEPASS", - "level": 13, - "probability": 3333 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - - ] - }, { - "name": "FrostyForest_4F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_DITTO", - "level": 25, - "probability": 1429 - }, - { - "species": "SPECIES_FURRET", - "level": 14, - "probability": 3571 - }, - { - "species": "SPECIES_PILOSWINE", - "level": 14, - "probability": 2143 - }, - { - "species": "SPECIES_NOSEPASS", - "level": 13, - "probability": 2857 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "FrostyForest_5F_6F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_DITTO", - "level": 25, - "probability": 2222 - }, - { - "species": "SPECIES_PILOSWINE", - "level": 14, - "probability": 3334 - }, - { - "species": "SPECIES_NOSEPASS", - "level": 13, - "probability": 4444 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "FrostyForest_7F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_DITTO", - "level": 25, - "probability": 2000 - }, - { - "species": "SPECIES_MIGHTYENA", - "level": 17, - "probability": 4000 - }, - { - "species": "SPECIES_LAIRON", - "level": 17, - "probability": 4000 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "FrostyForest_8F_9F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_DITTO", - "level": 25, - "probability": 1600 - }, - { - "species": "SPECIES_MIGHTYENA", - "level": 17, - "probability": 3200 - }, - { - "species": "SPECIES_LAIRON", - "level": 17, - "probability": 3200 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_SNORUNT", - "level": 20, - "probability": 2000 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - } - ] -} +{ + "tables": [{ + "name": "FrostyForest_1F_2F_Pokemon", + "pokemon": [{ + "species": "SPECIES_FURRET", + "level": 14, + "probability": 6250 + }, + { + "species": "SPECIES_AZURILL", + "level": 11, + "probability": 3750 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + + "name": "FrostyForest_3F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_FURRET", + "level": 14, + "probability": 4167 + }, + { + "species": "SPECIES_AZURILL", + "level": 11, + "probability": 2500 + }, + { + "species": "SPECIES_NOSEPASS", + "level": 13, + "probability": 3333 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + + ] + }, { + "name": "FrostyForest_4F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_DITTO", + "level": 25, + "probability": 1429 + }, + { + "species": "SPECIES_FURRET", + "level": 14, + "probability": 3571 + }, + { + "species": "SPECIES_PILOSWINE", + "level": 14, + "probability": 2143 + }, + { + "species": "SPECIES_NOSEPASS", + "level": 13, + "probability": 2857 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "FrostyForest_5F_6F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_DITTO", + "level": 25, + "probability": 2222 + }, + { + "species": "SPECIES_PILOSWINE", + "level": 14, + "probability": 3334 + }, + { + "species": "SPECIES_NOSEPASS", + "level": 13, + "probability": 4444 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "FrostyForest_7F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_DITTO", + "level": 25, + "probability": 2000 + }, + { + "species": "SPECIES_MIGHTYENA", + "level": 17, + "probability": 4000 + }, + { + "species": "SPECIES_LAIRON", + "level": 17, + "probability": 4000 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "FrostyForest_8F_9F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_DITTO", + "level": 25, + "probability": 1600 + }, + { + "species": "SPECIES_MIGHTYENA", + "level": 17, + "probability": 3200 + }, + { + "species": "SPECIES_LAIRON", + "level": 17, + "probability": 3200 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_SNORUNT", + "level": 20, + "probability": 2000 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + } + ] +} -- cgit v1.2.3