diff options
author | Cheng Hann Gan <chenghanngan.us@gmail.com> | 2021-09-09 19:22:48 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-09 16:22:48 -0700 |
commit | 8237e29a164211eb2ec4cd161eb4183cc1947fee (patch) | |
tree | 67dc502264b755dc620f56969f3bea68a40b17af /data/dungeon/MtFaraway | |
parent | 4eff1882443b0004d9c9fa4895cdfefdc356565f (diff) |
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 <seth.barberee@gmail.com>
* Renamed symbols per PR comments
Co-authored-by: Cheng Hann Gan <chenghann_gan@ultimatesoftware.com>
Co-authored-by: Seth Barberee <seth.barberee@gmail.com>
Diffstat (limited to 'data/dungeon/MtFaraway')
-rw-r--r-- | data/dungeon/MtFaraway/floor_id.json | 730 |
1 files changed, 365 insertions, 365 deletions
diff --git a/data/dungeon/MtFaraway/floor_id.json b/data/dungeon/MtFaraway/floor_id.json index f90c5de..5ab9103 100644 --- a/data/dungeon/MtFaraway/floor_id.json +++ b/data/dungeon/MtFaraway/floor_id.json @@ -1,365 +1,365 @@ -{
- "name": "MtFarawayFloorID",
- "tables": [
- {
- "MainData": 1525,
- "Pokemon": 715,
- "Traps": 72,
- "Items": 166,
- "KecleonShop": 61,
- "MonsterRoomItems": 46,
- "BuriedItems": 62
- },
- {
- "MainData": 1526,
- "Pokemon": 715,
- "Traps": 72,
- "Items": 166,
- "KecleonShop": 61,
- "MonsterRoomItems": 46,
- "BuriedItems": 62
- },
- {
- "MainData": 1527,
- "Pokemon": 715,
- "Traps": 72,
- "Items": 166,
- "KecleonShop": 61,
- "MonsterRoomItems": 46,
- "BuriedItems": 62
- },
- {
- "MainData": 1528,
- "Pokemon": 715,
- "Traps": 72,
- "Items": 167,
- "KecleonShop": 61,
- "MonsterRoomItems": 46,
- "BuriedItems": 62
- },
- {
- "MainData": 1529,
- "Pokemon": 715,
- "Traps": 72,
- "Items": 167,
- "KecleonShop": 61,
- "MonsterRoomItems": 46,
- "BuriedItems": 62
- },
- {
- "MainData": 1530,
- "Pokemon": 716,
- "Traps": 72,
- "Items": 167,
- "KecleonShop": 61,
- "MonsterRoomItems": 46,
- "BuriedItems": 62
- },
- {
- "MainData": 1531,
- "Pokemon": 716,
- "Traps": 72,
- "Items": 167,
- "KecleonShop": 61,
- "MonsterRoomItems": 46,
- "BuriedItems": 62
- },
- {
- "MainData": 1532,
- "Pokemon": 716,
- "Traps": 72,
- "Items": 167,
- "KecleonShop": 61,
- "MonsterRoomItems": 46,
- "BuriedItems": 62
- },
- {
- "MainData": 1533,
- "Pokemon": 716,
- "Traps": 72,
- "Items": 167,
- "KecleonShop": 61,
- "MonsterRoomItems": 46,
- "BuriedItems": 62
- },
- {
- "MainData": 1534,
- "Pokemon": 717,
- "Traps": 73,
- "Items": 167,
- "KecleonShop": 61,
- "MonsterRoomItems": 46,
- "BuriedItems": 62
- },
- {
- "MainData": 1535,
- "Pokemon": 718,
- "Traps": 74,
- "Items": 167,
- "KecleonShop": 61,
- "MonsterRoomItems": 46,
- "BuriedItems": 62
- },
- {
- "MainData": 1536,
- "Pokemon": 719,
- "Traps": 74,
- "Items": 167,
- "KecleonShop": 61,
- "MonsterRoomItems": 46,
- "BuriedItems": 62
- },
- {
- "MainData": 1537,
- "Pokemon": 719,
- "Traps": 74,
- "Items": 167,
- "KecleonShop": 61,
- "MonsterRoomItems": 46,
- "BuriedItems": 62
- },
- {
- "MainData": 1538,
- "Pokemon": 719,
- "Traps": 74,
- "Items": 167,
- "KecleonShop": 61,
- "MonsterRoomItems": 46,
- "BuriedItems": 62
- },
- {
- "MainData": 1539,
- "Pokemon": 719,
- "Traps": 74,
- "Items": 167,
- "KecleonShop": 61,
- "MonsterRoomItems": 46,
- "BuriedItems": 62
- },
- {
- "MainData": 1540,
- "Pokemon": 719,
- "Traps": 74,
- "Items": 167,
- "KecleonShop": 61,
- "MonsterRoomItems": 46,
- "BuriedItems": 62
- },
- {
- "MainData": 1541,
- "Pokemon": 719,
- "Traps": 74,
- "Items": 167,
- "KecleonShop": 61,
- "MonsterRoomItems": 46,
- "BuriedItems": 62
- },
- {
- "MainData": 1542,
- "Pokemon": 719,
- "Traps": 74,
- "Items": 167,
- "KecleonShop": 61,
- "MonsterRoomItems": 46,
- "BuriedItems": 62
- },
- {
- "MainData": 1543,
- "Pokemon": 719,
- "Traps": 74,
- "Items": 167,
- "KecleonShop": 61,
- "MonsterRoomItems": 46,
- "BuriedItems": 62
- },
- {
- "MainData": 1544,
- "Pokemon": 720,
- "Traps": 112,
- "Items": 167,
- "KecleonShop": 61,
- "MonsterRoomItems": 46,
- "BuriedItems": 62
- },
- {
- "MainData": 1545,
- "Pokemon": 721,
- "Traps": 112,
- "Items": 167,
- "KecleonShop": 61,
- "MonsterRoomItems": 46,
- "BuriedItems": 62
- },
- {
- "MainData": 1546,
- "Pokemon": 721,
- "Traps": 112,
- "Items": 167,
- "KecleonShop": 61,
- "MonsterRoomItems": 46,
- "BuriedItems": 62
- },
- {
- "MainData": 1547,
- "Pokemon": 721,
- "Traps": 112,
- "Items": 167,
- "KecleonShop": 61,
- "MonsterRoomItems": 46,
- "BuriedItems": 62
- },
- {
- "MainData": 1548,
- "Pokemon": 721,
- "Traps": 112,
- "Items": 167,
- "KecleonShop": 61,
- "MonsterRoomItems": 46,
- "BuriedItems": 62
- },
- {
- "MainData": 1549,
- "Pokemon": 721,
- "Traps": 112,
- "Items": 167,
- "KecleonShop": 61,
- "MonsterRoomItems": 46,
- "BuriedItems": 62
- },
- {
- "MainData": 1550,
- "Pokemon": 721,
- "Traps": 112,
- "Items": 167,
- "KecleonShop": 61,
- "MonsterRoomItems": 46,
- "BuriedItems": 62
- },
- {
- "MainData": 1551,
- "Pokemon": 721,
- "Traps": 112,
- "Items": 167,
- "KecleonShop": 61,
- "MonsterRoomItems": 46,
- "BuriedItems": 62
- },
- {
- "MainData": 1552,
- "Pokemon": 721,
- "Traps": 112,
- "Items": 167,
- "KecleonShop": 61,
- "MonsterRoomItems": 46,
- "BuriedItems": 62
- },
- {
- "MainData": 1553,
- "Pokemon": 721,
- "Traps": 112,
- "Items": 167,
- "KecleonShop": 61,
- "MonsterRoomItems": 46,
- "BuriedItems": 62
- },
- {
- "MainData": 1554,
- "Pokemon": 722,
- "Traps": 112,
- "Items": 167,
- "KecleonShop": 61,
- "MonsterRoomItems": 46,
- "BuriedItems": 62
- },
- {
- "MainData": 1555,
- "Pokemon": 723,
- "Traps": 113,
- "Items": 167,
- "KecleonShop": 61,
- "MonsterRoomItems": 46,
- "BuriedItems": 62
- },
- {
- "MainData": 1556,
- "Pokemon": 723,
- "Traps": 113,
- "Items": 167,
- "KecleonShop": 61,
- "MonsterRoomItems": 46,
- "BuriedItems": 62
- },
- {
- "MainData": 1557,
- "Pokemon": 723,
- "Traps": 113,
- "Items": 167,
- "KecleonShop": 61,
- "MonsterRoomItems": 46,
- "BuriedItems": 62
- },
- {
- "MainData": 1558,
- "Pokemon": 723,
- "Traps": 113,
- "Items": 167,
- "KecleonShop": 61,
- "MonsterRoomItems": 46,
- "BuriedItems": 62
- },
- {
- "MainData": 1559,
- "Pokemon": 724,
- "Traps": 113,
- "Items": 167,
- "KecleonShop": 61,
- "MonsterRoomItems": 46,
- "BuriedItems": 62
- },
- {
- "MainData": 1560,
- "Pokemon": 723,
- "Traps": 113,
- "Items": 167,
- "KecleonShop": 61,
- "MonsterRoomItems": 46,
- "BuriedItems": 62
- },
- {
- "MainData": 1561,
- "Pokemon": 723,
- "Traps": 113,
- "Items": 167,
- "KecleonShop": 61,
- "MonsterRoomItems": 46,
- "BuriedItems": 62
- },
- {
- "MainData": 1562,
- "Pokemon": 723,
- "Traps": 113,
- "Items": 167,
- "KecleonShop": 61,
- "MonsterRoomItems": 46,
- "BuriedItems": 62
- },
- {
- "MainData": 1563,
- "Pokemon": 725,
- "Traps": 113,
- "Items": 167,
- "KecleonShop": 61,
- "MonsterRoomItems": 46,
- "BuriedItems": 62
- },
- {
- "MainData": 1564,
- "Pokemon": 726,
- "Traps": 114,
- "Items": 167,
- "KecleonShop": 61,
- "MonsterRoomItems": 46,
- "BuriedItems": 62
- }
- ]
-}
+{ + "name": "MtFarawayFloorID", + "tables": [ + { + "MainData": 1525, + "Pokemon": 715, + "Traps": 72, + "Items": 166, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 1526, + "Pokemon": 715, + "Traps": 72, + "Items": 166, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 1527, + "Pokemon": 715, + "Traps": 72, + "Items": 166, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 1528, + "Pokemon": 715, + "Traps": 72, + "Items": 167, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 1529, + "Pokemon": 715, + "Traps": 72, + "Items": 167, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 1530, + "Pokemon": 716, + "Traps": 72, + "Items": 167, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 1531, + "Pokemon": 716, + "Traps": 72, + "Items": 167, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 1532, + "Pokemon": 716, + "Traps": 72, + "Items": 167, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 1533, + "Pokemon": 716, + "Traps": 72, + "Items": 167, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 1534, + "Pokemon": 717, + "Traps": 73, + "Items": 167, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 1535, + "Pokemon": 718, + "Traps": 74, + "Items": 167, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 1536, + "Pokemon": 719, + "Traps": 74, + "Items": 167, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 1537, + "Pokemon": 719, + "Traps": 74, + "Items": 167, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 1538, + "Pokemon": 719, + "Traps": 74, + "Items": 167, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 1539, + "Pokemon": 719, + "Traps": 74, + "Items": 167, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 1540, + "Pokemon": 719, + "Traps": 74, + "Items": 167, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 1541, + "Pokemon": 719, + "Traps": 74, + "Items": 167, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 1542, + "Pokemon": 719, + "Traps": 74, + "Items": 167, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 1543, + "Pokemon": 719, + "Traps": 74, + "Items": 167, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 1544, + "Pokemon": 720, + "Traps": 112, + "Items": 167, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 1545, + "Pokemon": 721, + "Traps": 112, + "Items": 167, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 1546, + "Pokemon": 721, + "Traps": 112, + "Items": 167, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 1547, + "Pokemon": 721, + "Traps": 112, + "Items": 167, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 1548, + "Pokemon": 721, + "Traps": 112, + "Items": 167, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 1549, + "Pokemon": 721, + "Traps": 112, + "Items": 167, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 1550, + "Pokemon": 721, + "Traps": 112, + "Items": 167, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 1551, + "Pokemon": 721, + "Traps": 112, + "Items": 167, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 1552, + "Pokemon": 721, + "Traps": 112, + "Items": 167, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 1553, + "Pokemon": 721, + "Traps": 112, + "Items": 167, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 1554, + "Pokemon": 722, + "Traps": 112, + "Items": 167, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 1555, + "Pokemon": 723, + "Traps": 113, + "Items": 167, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 1556, + "Pokemon": 723, + "Traps": 113, + "Items": 167, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 1557, + "Pokemon": 723, + "Traps": 113, + "Items": 167, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 1558, + "Pokemon": 723, + "Traps": 113, + "Items": 167, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 1559, + "Pokemon": 724, + "Traps": 113, + "Items": 167, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 1560, + "Pokemon": 723, + "Traps": 113, + "Items": 167, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 1561, + "Pokemon": 723, + "Traps": 113, + "Items": 167, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 1562, + "Pokemon": 723, + "Traps": 113, + "Items": 167, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 1563, + "Pokemon": 725, + "Traps": 113, + "Items": 167, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 1564, + "Pokemon": 726, + "Traps": 114, + "Items": 167, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + } + ] +} |