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/ThunderwaveCave/floor_id.json | 100 ++++++------ data/dungeon/ThunderwaveCave/pokemon_found.json | 200 ++++++++++++------------ 2 files changed, 150 insertions(+), 150 deletions(-) (limited to 'data/dungeon/ThunderwaveCave') diff --git a/data/dungeon/ThunderwaveCave/floor_id.json b/data/dungeon/ThunderwaveCave/floor_id.json index 1a5898b..a90b7cb 100644 --- a/data/dungeon/ThunderwaveCave/floor_id.json +++ b/data/dungeon/ThunderwaveCave/floor_id.json @@ -1,50 +1,50 @@ -{ - "name": "ThunderwaveCaveFloorID", - "tables": [ - { - "MainData": 3, - "Pokemon": 2, - "Traps": 1, - "Items": 6, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 4, - "Pokemon": 2, - "Traps": 1, - "Items": 6, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 5, - "Pokemon": 3, - "Traps": 1, - "Items": 6, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 6, - "Pokemon": 4, - "Traps": 1, - "Items": 7, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 7, - "Pokemon": 4, - "Traps": 1, - "Items": 7, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - } - ] -} +{ + "name": "ThunderwaveCaveFloorID", + "tables": [ + { + "MainData": 3, + "Pokemon": 2, + "Traps": 1, + "Items": 6, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 4, + "Pokemon": 2, + "Traps": 1, + "Items": 6, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 5, + "Pokemon": 3, + "Traps": 1, + "Items": 6, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 6, + "Pokemon": 4, + "Traps": 1, + "Items": 7, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 7, + "Pokemon": 4, + "Traps": 1, + "Items": 7, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + } + ] +} diff --git a/data/dungeon/ThunderwaveCave/pokemon_found.json b/data/dungeon/ThunderwaveCave/pokemon_found.json index e22ea7b..676857b 100644 --- a/data/dungeon/ThunderwaveCave/pokemon_found.json +++ b/data/dungeon/ThunderwaveCave/pokemon_found.json @@ -1,100 +1,100 @@ -{ - "tables": [{ - "name": "ThunderwaveCave_1F_2F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_RATTATA", - "level": 3, - "probability": 5000 - }, - { - "species": "SPECIES_NIDORAN_F", - "level": 4, - "probability": 2500 - }, - { - "species": "SPECIES_POOCHYENA", - "level": 3, - "probability": 2500 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "ThunderwaveCave_3F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_RATTATA", - "level": 3, - "probability": 4167 - }, - { - "species": "SPECIES_NIDORAN_F", - "level": 4, - "probability": 2083 - }, - { - "species": "SPECIES_VOLTORB", - "level": 3, - "probability": 1667 - }, - { - "species": "SPECIES_POOCHYENA", - "level": 3, - "probability": 2083 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "ThunderwaveCave_4F_5F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_VOLTORB", - "level": 3, - "probability": 3846 - }, - { - "species": "SPECIES_ELEKID", - "level": 4, - "probability": 3077 - }, - { - "species": "SPECIES_PLUSLE", - "level": 3, - "probability": 1539 - }, - { - "species": "SPECIES_MINUN", - "level": 3, - "probability": 1538 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }] -} +{ + "tables": [{ + "name": "ThunderwaveCave_1F_2F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_RATTATA", + "level": 3, + "probability": 5000 + }, + { + "species": "SPECIES_NIDORAN_F", + "level": 4, + "probability": 2500 + }, + { + "species": "SPECIES_POOCHYENA", + "level": 3, + "probability": 2500 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "ThunderwaveCave_3F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_RATTATA", + "level": 3, + "probability": 4167 + }, + { + "species": "SPECIES_NIDORAN_F", + "level": 4, + "probability": 2083 + }, + { + "species": "SPECIES_VOLTORB", + "level": 3, + "probability": 1667 + }, + { + "species": "SPECIES_POOCHYENA", + "level": 3, + "probability": 2083 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "ThunderwaveCave_4F_5F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_VOLTORB", + "level": 3, + "probability": 3846 + }, + { + "species": "SPECIES_ELEKID", + "level": 4, + "probability": 3077 + }, + { + "species": "SPECIES_PLUSLE", + "level": 3, + "probability": 1539 + }, + { + "species": "SPECIES_MINUN", + "level": 3, + "probability": 1538 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }] +} -- cgit v1.2.3