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/MagmaCavernPit/floor_id.json | 64 +++++------ data/dungeon/MagmaCavernPit/pokemon_found.json | 150 ++++++++++++------------- 2 files changed, 107 insertions(+), 107 deletions(-) (limited to 'data/dungeon/MagmaCavernPit') diff --git a/data/dungeon/MagmaCavernPit/floor_id.json b/data/dungeon/MagmaCavernPit/floor_id.json index 42995f5..837d1d1 100644 --- a/data/dungeon/MagmaCavernPit/floor_id.json +++ b/data/dungeon/MagmaCavernPit/floor_id.json @@ -1,32 +1,32 @@ -{ - "name": "MagmaCavernPitFloorID", - "tables": [ - { - "MainData": 150, - "Pokemon": 94, - "Traps": 3, - "Items": 40, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 151, - "Pokemon": 95, - "Traps": 3, - "Items": 40, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 152, - "Pokemon": 96, - "Traps": 3, - "Items": 40, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - } - ] -} +{ + "name": "MagmaCavernPitFloorID", + "tables": [ + { + "MainData": 150, + "Pokemon": 94, + "Traps": 3, + "Items": 40, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 151, + "Pokemon": 95, + "Traps": 3, + "Items": 40, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 152, + "Pokemon": 96, + "Traps": 3, + "Items": 40, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + } + ] +} diff --git a/data/dungeon/MagmaCavernPit/pokemon_found.json b/data/dungeon/MagmaCavernPit/pokemon_found.json index c0e312f..c2cd5f2 100644 --- a/data/dungeon/MagmaCavernPit/pokemon_found.json +++ b/data/dungeon/MagmaCavernPit/pokemon_found.json @@ -1,75 +1,75 @@ -{ - "tables": [{ - "name": "MagmaCavernPit_1F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_ONIX", - "level": 30, - "probability": 5000 - }, - { - "species": "SPECIES_STEELIX", - "level": 25, - "probability": 5000 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "MagmaCavernPit_2F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_CHARIZARD", - "level": 55, - "probability": 0 - }, - { - "species": "SPECIES_TYRANITAR", - "level": 50, - "probability": 10000 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "MagmaCavernPit_3F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_ALAKAZAM", - "level": 50, - "probability": 5000 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_GROUDON", - "level": 27, - "probability": 5000 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }] -} +{ + "tables": [{ + "name": "MagmaCavernPit_1F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_ONIX", + "level": 30, + "probability": 5000 + }, + { + "species": "SPECIES_STEELIX", + "level": 25, + "probability": 5000 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "MagmaCavernPit_2F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_CHARIZARD", + "level": 55, + "probability": 0 + }, + { + "species": "SPECIES_TYRANITAR", + "level": 50, + "probability": 10000 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "MagmaCavernPit_3F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_ALAKAZAM", + "level": 50, + "probability": 5000 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_GROUDON", + "level": 27, + "probability": 5000 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }] +} -- cgit v1.2.3