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/MtThunder/floor_id.json | 190 +++++----- data/dungeon/MtThunder/pokemon_found.json | 600 +++++++++++++++--------------- 2 files changed, 395 insertions(+), 395 deletions(-) (limited to 'data/dungeon/MtThunder') diff --git a/data/dungeon/MtThunder/floor_id.json b/data/dungeon/MtThunder/floor_id.json index 0af734b..db52745 100644 --- a/data/dungeon/MtThunder/floor_id.json +++ b/data/dungeon/MtThunder/floor_id.json @@ -1,95 +1,95 @@ -{ - "name": "MtThunderFloorID", - "tables": [ - { - "MainData": 39, - "Pokemon": 29, - "Traps": 1, - "Items": 15, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 40, - "Pokemon": 30, - "Traps": 1, - "Items": 15, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 41, - "Pokemon": 30, - "Traps": 1, - "Items": 15, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 42, - "Pokemon": 30, - "Traps": 1, - "Items": 16, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 43, - "Pokemon": 31, - "Traps": 1, - "Items": 16, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 44, - "Pokemon": 32, - "Traps": 1, - "Items": 16, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 45, - "Pokemon": 33, - "Traps": 1, - "Items": 16, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 46, - "Pokemon": 34, - "Traps": 1, - "Items": 16, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 47, - "Pokemon": 35, - "Traps": 1, - "Items": 16, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 48, - "Pokemon": 36, - "Traps": 1, - "Items": 16, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - } - ] -} +{ + "name": "MtThunderFloorID", + "tables": [ + { + "MainData": 39, + "Pokemon": 29, + "Traps": 1, + "Items": 15, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 40, + "Pokemon": 30, + "Traps": 1, + "Items": 15, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 41, + "Pokemon": 30, + "Traps": 1, + "Items": 15, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 42, + "Pokemon": 30, + "Traps": 1, + "Items": 16, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 43, + "Pokemon": 31, + "Traps": 1, + "Items": 16, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 44, + "Pokemon": 32, + "Traps": 1, + "Items": 16, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 45, + "Pokemon": 33, + "Traps": 1, + "Items": 16, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 46, + "Pokemon": 34, + "Traps": 1, + "Items": 16, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 47, + "Pokemon": 35, + "Traps": 1, + "Items": 16, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 48, + "Pokemon": 36, + "Traps": 1, + "Items": 16, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + } + ] +} diff --git a/data/dungeon/MtThunder/pokemon_found.json b/data/dungeon/MtThunder/pokemon_found.json index f6c5c76..731f4ac 100644 --- a/data/dungeon/MtThunder/pokemon_found.json +++ b/data/dungeon/MtThunder/pokemon_found.json @@ -1,300 +1,300 @@ -{ - "tables": [{ - "name": "MtThunder_1F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_WEEDLE", - "level": 8, - "probability": 1875 - }, - { - "species": "SPECIES_NIDORAN_M", - "level": 12, - "probability": 3125 - }, - { - "species": "SPECIES_ELECTRIKE", - "level": 12, - "probability": 3125 - }, - { - "species": "SPECIES_CACNEA", - "level": 11, - "probability": 1875 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "MtThunder_2F_4F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_WEEDLE", - "level": 8, - "probability": 1429 - }, - { - "species": "SPECIES_PIDGEOTTO", - "level": 11, - "probability": 2381 - }, - { - "species": "SPECIES_NIDORAN_M", - "level": 12, - "probability": 2380 - }, - { - "species": "SPECIES_ELECTRIKE", - "level": 12, - "probability": 2381 - }, - { - "species": "SPECIES_CACNEA", - "level": 11, - "probability": 1429 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "MtThunder_5F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_BEEDRILL", - "level": 10, - "probability": 1333 - }, - { - "species": "SPECIES_PIDGEOTTO", - "level": 11, - "probability": 3334 - }, - { - "species": "SPECIES_ELECTABUZZ", - "level": 12, - "probability": 2666 - }, - { - "species": "SPECIES_STANTLER", - "level": 9, - "probability": 2667 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "MtThunder_6F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_BEEDRILL", - "level": 10, - "probability": 1538 - }, - { - "species": "SPECIES_ELECTABUZZ", - "level": 12, - "probability": 3077 - }, - { - "species": "SPECIES_AMPHAROS", - "level": 12, - "probability": 2308 - }, - { - "species": "SPECIES_STANTLER", - "level": 9, - "probability": 3077 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "MtThunder_7F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_BEEDRILL", - "level": 10, - "probability": 1111 - }, - { - "species": "SPECIES_ELECTABUZZ", - "level": 12, - "probability": 2222 - }, - { - "species": "SPECIES_AMPHAROS", - "level": 12, - "probability": 1667 - }, - { - "species": "SPECIES_GLIGAR", - "level": 12, - "probability": 2778 - }, - { - "species": "SPECIES_STANTLER", - "level": 9, - "probability": 2222 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "MtThunder_8F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_BEEDRILL", - "level": 10, - "probability": 870 - }, - { - "species": "SPECIES_ELECTABUZZ", - "level": 12, - "probability": 1739 - }, - { - "species": "SPECIES_AMPHAROS", - "level": 12, - "probability": 1304 - }, - { - "species": "SPECIES_GLIGAR", - "level": 12, - "probability": 2174 - }, - { - "species": "SPECIES_STANTLER", - "level": 9, - "probability": 1739 - }, - { - "species": "SPECIES_MANECTRIC", - "level": 9, - "probability": 2174 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "MtThunder_9F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_GROWLITHE", - "level": 10, - "probability": 1905 - }, - { - "species": "SPECIES_AMPHAROS", - "level": 12, - "probability": 1428 - }, - { - "species": "SPECIES_GLIGAR", - "level": 12, - "probability": 2381 - }, - { - "species": "SPECIES_STANTLER", - "level": 9, - "probability": 1905 - }, - { - "species": "SPECIES_MANECTRIC", - "level": 9, - "probability": 2381 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "MtThunder_10F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_GROWLITHE", - "level": 10, - "probability": 2353 - }, - { - "species": "SPECIES_AMPHAROS", - "level": 12, - "probability": 1765 - }, - { - "species": "SPECIES_GLIGAR", - "level": 12, - "probability": 2941 - }, - { - "species": "SPECIES_MANECTRIC", - "level": 9, - "probability": 2941 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }] -} +{ + "tables": [{ + "name": "MtThunder_1F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_WEEDLE", + "level": 8, + "probability": 1875 + }, + { + "species": "SPECIES_NIDORAN_M", + "level": 12, + "probability": 3125 + }, + { + "species": "SPECIES_ELECTRIKE", + "level": 12, + "probability": 3125 + }, + { + "species": "SPECIES_CACNEA", + "level": 11, + "probability": 1875 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "MtThunder_2F_4F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_WEEDLE", + "level": 8, + "probability": 1429 + }, + { + "species": "SPECIES_PIDGEOTTO", + "level": 11, + "probability": 2381 + }, + { + "species": "SPECIES_NIDORAN_M", + "level": 12, + "probability": 2380 + }, + { + "species": "SPECIES_ELECTRIKE", + "level": 12, + "probability": 2381 + }, + { + "species": "SPECIES_CACNEA", + "level": 11, + "probability": 1429 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "MtThunder_5F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_BEEDRILL", + "level": 10, + "probability": 1333 + }, + { + "species": "SPECIES_PIDGEOTTO", + "level": 11, + "probability": 3334 + }, + { + "species": "SPECIES_ELECTABUZZ", + "level": 12, + "probability": 2666 + }, + { + "species": "SPECIES_STANTLER", + "level": 9, + "probability": 2667 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "MtThunder_6F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_BEEDRILL", + "level": 10, + "probability": 1538 + }, + { + "species": "SPECIES_ELECTABUZZ", + "level": 12, + "probability": 3077 + }, + { + "species": "SPECIES_AMPHAROS", + "level": 12, + "probability": 2308 + }, + { + "species": "SPECIES_STANTLER", + "level": 9, + "probability": 3077 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "MtThunder_7F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_BEEDRILL", + "level": 10, + "probability": 1111 + }, + { + "species": "SPECIES_ELECTABUZZ", + "level": 12, + "probability": 2222 + }, + { + "species": "SPECIES_AMPHAROS", + "level": 12, + "probability": 1667 + }, + { + "species": "SPECIES_GLIGAR", + "level": 12, + "probability": 2778 + }, + { + "species": "SPECIES_STANTLER", + "level": 9, + "probability": 2222 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "MtThunder_8F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_BEEDRILL", + "level": 10, + "probability": 870 + }, + { + "species": "SPECIES_ELECTABUZZ", + "level": 12, + "probability": 1739 + }, + { + "species": "SPECIES_AMPHAROS", + "level": 12, + "probability": 1304 + }, + { + "species": "SPECIES_GLIGAR", + "level": 12, + "probability": 2174 + }, + { + "species": "SPECIES_STANTLER", + "level": 9, + "probability": 1739 + }, + { + "species": "SPECIES_MANECTRIC", + "level": 9, + "probability": 2174 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "MtThunder_9F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_GROWLITHE", + "level": 10, + "probability": 1905 + }, + { + "species": "SPECIES_AMPHAROS", + "level": 12, + "probability": 1428 + }, + { + "species": "SPECIES_GLIGAR", + "level": 12, + "probability": 2381 + }, + { + "species": "SPECIES_STANTLER", + "level": 9, + "probability": 1905 + }, + { + "species": "SPECIES_MANECTRIC", + "level": 9, + "probability": 2381 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "MtThunder_10F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_GROWLITHE", + "level": 10, + "probability": 2353 + }, + { + "species": "SPECIES_AMPHAROS", + "level": 12, + "probability": 1765 + }, + { + "species": "SPECIES_GLIGAR", + "level": 12, + "probability": 2941 + }, + { + "species": "SPECIES_MANECTRIC", + "level": 9, + "probability": 2941 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }] +} -- cgit v1.2.3