From 92a8e55fdd348a88a365eb389181d8e29da6dad9 Mon Sep 17 00:00:00 2001 From: Dennis Date: Sat, 10 Jul 2021 18:23:20 +0200 Subject: Decompiled some item related functions (#42) * decompile sub_8091290 * decompile sub_80912c8 * rename functions / struct field * more names * decompile 80913A0 * decompile GetItemMove * decompile sub_80913E0 * rename function * decompile CanSellItem function * rename inventory struct * add some item check functions * fix renaming stuff * this file shouldnt have been here * forgot merge conflict * decompile more item functions * rename some stuff * fix HM/TM naming * Update src/code_801AFA4.c Use enum value for USED_TM * Fix incorrect value Co-authored-by: Seth Barberee --- .gitignore | 1 + asm/code_2.s | 8 +- asm/code_800D090.s | 16 +- asm/code_8012A18.s | 10 +- asm/code_801B3C0.s | 32 +- asm/code_801C620.s | 20 +- asm/code_8027C84.s | 20 +- asm/code_802B640.s | 6 +- asm/code_80428A0.s | 64 +- asm/code_8048480.s | 6 +- asm/code_8057824.s | 202 +- asm/code_807001C.s | 44 +- asm/code_8090208.s | 6 +- asm/code_8092334.s | 44 +- asm/code_80958E8.s | 6 +- asm/code_8098BDC.s | 18 +- asm/code_809D148.s | 22 +- asm/event_flag.s | 22 +- asm/felicity_bank.s | 12 +- asm/friend_area_action_menu.s | 8 +- asm/friend_list_menu.s | 114 +- asm/items.s | 2172 +- asm/items_1.s | 1435 + asm/kangaskhan_storage.s | 6 +- asm/kangaskhan_storage_1.s | 22 +- asm/kangaskhan_storage_2.s | 48 +- asm/kecleon_items.s | 36 +- asm/other_menus.s | 8 +- asm/pokemon_3.s | 74 +- asm/pokemon_square.s | 64 +- asm/wonder_mail_3.s | 12 +- data/data_80F4278.s | 3 +- data/data_810AE24.s | 21 +- data/dungeon/.gitignore | 4 +- data/dungeon/Autopilot/floor_id.json | 190 +- data/dungeon/Boss3/floor_id.json | 370 +- data/dungeon/Boss4/floor_id.json | 208 +- data/dungeon/Boss9/floor_id.json | 226 +- data/dungeon/BuriedRelic/floor_id.json | 1792 +- data/dungeon/D50/floor_id.json | 46 +- data/dungeon/D51/floor_id.json | 910 +- data/dungeon/D54/floor_id.json | 550 +- data/dungeon/D61/floor_id.json | 1792 +- data/dungeon/D63/floor_id.json | 28 +- data/dungeon/DarknightRelic/floor_id.json | 280 +- data/dungeon/DesertRegion/floor_id.json | 370 +- data/dungeon/DojoRegistration/floor_id.json | 1252 +- data/dungeon/FantasyStrait/floor_id.json | 550 +- data/dungeon/FantasyStraitAlt/floor_id.json | 352 +- data/dungeon/FaroffSea/floor_id.json | 1360 +- data/dungeon/FieryField/floor_id.json | 550 +- data/dungeon/FrostyForest/floor_id.json | 172 +- data/dungeon/FrostyForest/pokemon_found.json | 368 +- data/dungeon/FrostyGrotto/floor_id.json | 100 +- data/dungeon/FrostyGrotto/pokemon_found.json | 94 +- data/dungeon/GrandSea/floor_id.json | 550 +- data/dungeon/GreatCanyon/floor_id.json | 226 +- data/dungeon/GreatCanyon/pokemon_found.json | 568 +- data/dungeon/HowlingForest/floor_id.json | 280 +- data/dungeon/JoyousTower/floor_id.json | 1792 +- data/dungeon/LapisCave/floor_id.json | 262 +- data/dungeon/LapisCave/pokemon_found.json | 348 +- data/dungeon/LightningField/floor_id.json | 550 +- data/dungeon/MagmaCavern/floor_id.json | 424 +- data/dungeon/MagmaCavern/pokemon_found.json | 782 +- data/dungeon/MagmaCavernPit/floor_id.json | 64 +- data/dungeon/MagmaCavernPit/pokemon_found.json | 150 +- data/dungeon/MarvelousSea/floor_id.json | 370 +- data/dungeon/MeteorCave/floor_id.json | 370 +- data/dungeon/MtBlaze/floor_id.json | 226 +- data/dungeon/MtBlaze/pokemon_found.json | 440 +- data/dungeon/MtBlazePeak/floor_id.json | 64 +- data/dungeon/MtBlazePeak/pokemon_found.json | 90 +- data/dungeon/MtFaraway/floor_id.json | 730 +- data/dungeon/MtFreeze/floor_id.json | 280 +- data/dungeon/MtFreeze/pokemon_found.json | 432 +- data/dungeon/MtFreezePeak/floor_id.json | 100 +- data/dungeon/MtFreezePeak/pokemon_found.json | 112 +- data/dungeon/MtFreezePeakAlt/floor_id.json | 82 +- data/dungeon/MtSteel/floor_id.json | 172 +- data/dungeon/MtSteel/pokemon_found.json | 376 +- data/dungeon/MtThunder/floor_id.json | 190 +- data/dungeon/MtThunder/pokemon_found.json | 600 +- data/dungeon/MtThunderPeak/floor_id.json | 66 +- data/dungeon/MtThunderPeak/pokemon_found.json | 118 +- data/dungeon/MurkyCave/floor_id.json | 352 +- data/dungeon/NorthernRange/floor_id.json | 460 +- data/dungeon/NorthwindField/floor_id.json | 550 +- data/dungeon/OddityCave/floor_id.json | 280 +- data/dungeon/PitfallValley/floor_id.json | 460 +- data/dungeon/PurityForest/floor_id.json | 1792 +- data/dungeon/RemainsIsland/floor_id.json | 370 +- data/dungeon/RockPath/floor_id.json | 82 +- data/dungeon/SilentChasm/floor_id.json | 172 +- data/dungeon/SilentChasm/pokemon_found.json | 632 +- data/dungeon/SilverTrench/floor_id.json | 1792 +- data/dungeon/SinisterWoods/floor_id.json | 244 +- data/dungeon/SinisterWoods/pokemon_found.json | 892 +- data/dungeon/SkyTower/floor_id.json | 460 +- data/dungeon/SkyTower/pokemon_found.json | 932 +- data/dungeon/SkyTowerSummit/floor_id.json | 172 +- data/dungeon/SkyTowerSummit/pokemon_found.json | 132 +- data/dungeon/SnowPath/floor_id.json | 82 +- data/dungeon/SolarCave/floor_id.json | 370 +- data/dungeon/SouthernCavern/floor_id.json | 910 +- data/dungeon/StormySea/floor_id.json | 730 +- data/dungeon/ThunderwaveCave/floor_id.json | 100 +- data/dungeon/ThunderwaveCave/pokemon_found.json | 200 +- data/dungeon/TinyWoods/floor_id.json | 64 +- data/dungeon/TinyWoods/pokemon_found.json | 128 +- data/dungeon/UnownRelic/floor_id.json | 208 +- data/dungeon/UproarForest/floor_id.json | 190 +- data/dungeon/WaterfallPond/floor_id.json | 352 +- data/dungeon/WesternCave/floor_id.json | 1792 +- data/dungeon/WishCave/floor_id.json | 1792 +- data/dungeon/WondrousSea/floor_id.json | 226 +- data/dungeon/WyvernHill/floor_id.json | 550 +- include/friend_area_action_menu.h | 2 +- include/friend_rescue.h | 2 +- include/gUnknown_203B460.h | 20 - include/item.h | 270 +- include/kangaskhan_storage.h | 2 +- include/kecleon_items.h | 4 +- include/pokemon.h | 2 +- include/save.h | 2 +- include/subStruct_203B240.h | 10 + include/sub_8095228.h | 2 +- include/team_inventory.h | 20 + include/trade_items_menu.h | 2 +- include/wonder_mail.h | 2 +- ld_script.txt | 2 + src/adventure_log.c | 4 +- src/code_801AFA4.c | 15 +- src/code_801B3C0.c | 14 +- src/code_801C620.c | 15 +- src/code_801D760.c | 6 +- src/code_8057824.c | 6 +- src/code_80958E8.c | 6 +- src/debug_menu_mid.c | 16 +- src/felicity_bank_1.c | 18 +- src/friend_area_action_menu.c | 6 +- src/friend_area_action_menu_1.c | 22 +- src/friend_rescue.c | 2 +- src/friend_rescue_1.c | 6 +- src/items.c | 116 +- src/items_1.c | 413 + src/kangaskhan_storage_2.c | 24 +- src/kecleon_items_1.c | 32 +- src/other_menus.c | 6 +- src/save.c | 6 +- src/trade_items_menu.c | 18 +- src/wonder_mail.c | 12 +- sym_ewram2.txt | 2 +- tools/aif2pcm/.gitignore | 4 +- tools/aif2pcm/LICENSE | 40 +- tools/bin2c/.gitignore | 2 +- tools/bin2c/LICENSE | 38 +- tools/br_ips/.gitignore | 4 +- tools/dungeonjson/.gitignore | 2 +- tools/dungeonjson/dungeonjson.cpp | 1300 +- tools/dungeonjson/json11.cpp | 1572 +- tools/gbafix/.gitignore | 4 +- tools/gbafix/COPYING | 1348 +- tools/gbagfx/.gitignore | 2 +- tools/gbagfx/LICENSE | 38 +- tools/jsonproc/.gitignore | 2 +- tools/jsonproc/inja.hpp | 7058 ++-- tools/jsonproc/jsonproc.cpp | 218 +- tools/jsonproc/nlohmann/json.hpp | 41684 +++++++++++----------- tools/mapjson/.gitignore | 2 +- tools/mapjson/json11.cpp | 1572 +- tools/mapjson/mapjson.cpp | 1076 +- tools/mid2agb/.gitignore | 2 +- tools/mid2agb/LICENSE | 38 +- tools/mid2agb/agb.cpp | 1094 +- tools/mid2agb/error.cpp | 72 +- tools/mid2agb/main.cpp | 466 +- tools/mid2agb/midi.cpp | 1928 +- tools/mid2agb/tables.cpp | 572 +- tools/preproc/.gitignore | 2 +- tools/preproc/LICENSE | 38 +- tools/preproc/asm_file.cpp | 1064 +- tools/preproc/c_file.cpp | 860 +- tools/preproc/charmap.cpp | 816 +- tools/preproc/preproc.cpp | 312 +- tools/preproc/string_parser.cpp | 710 +- tools/preproc/utf8.cpp | 184 +- tools/ramscrgen/.gitignore | 2 +- tools/ramscrgen/LICENSE | 38 +- tools/ramscrgen/elf.cpp | 544 +- tools/ramscrgen/main.cpp | 374 +- tools/ramscrgen/sym_file.cpp | 984 +- tools/rsfont/.gitignore | 2 +- tools/rsfont/LICENSE | 38 +- tools/scaninc/.gitignore | 2 +- tools/scaninc/LICENSE | 38 +- tools/scaninc/asm_file.cpp | 384 +- tools/scaninc/c_file.cpp | 614 +- tools/scaninc/scaninc.cpp | 256 +- tools/scaninc/source_file.cpp | 260 +- 200 files changed, 56570 insertions(+), 56625 deletions(-) create mode 100644 asm/items_1.s delete mode 100644 include/gUnknown_203B460.h create mode 100644 include/subStruct_203B240.h create mode 100644 include/team_inventory.h create mode 100644 src/items_1.c diff --git a/.gitignore b/.gitignore index c755f21..d62e4d2 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ build/ *.DS_Store *.pl *.a +.vscode/ \ No newline at end of file diff --git a/asm/code_2.s b/asm/code_2.s index 2fca8d0..b9d3464 100644 --- a/asm/code_2.s +++ b/asm/code_2.s @@ -1509,7 +1509,7 @@ _08001266: adds r4, 0x1 cmp r4, 0x13 ble _0800124E - bl sub_80910B4 + bl FillInventoryGaps movs r4, 0 ldr r5, _080012BC movs r3, 0x1 @@ -1548,7 +1548,7 @@ _08001298: pop {r0} bx r0 .align 2, 0 -_080012B8: .4byte gUnknown_203B460 +_080012B8: .4byte gTeamInventory_203B460 _080012BC: .4byte gRecruitedPokemonRef thumb_func_end sub_8001248 @@ -1568,7 +1568,7 @@ _080012C8: adds r3, 0x1 cmp r3, 0x13 ble _080012C8 - bl sub_80910B4 + bl FillInventoryGaps movs r3, 0 ldr r5, _08001328 movs r4, 0x1 @@ -1607,7 +1607,7 @@ _08001306: pop {r0} bx r0 .align 2, 0 -_08001324: .4byte gUnknown_203B460 +_08001324: .4byte gTeamInventory_203B460 _08001328: .4byte gRecruitedPokemonRef thumb_func_end sub_80012C0 diff --git a/asm/code_800D090.s b/asm/code_800D090.s index fc0455f..8b1845d 100644 --- a/asm/code_800D090.s +++ b/asm/code_800D090.s @@ -7718,7 +7718,7 @@ _08010BD0: movs r0, 0xC movs r1, 0x2 movs r3, 0 - bl sub_8014FF0 + bl xxx_format_and_draw movs r0, 0 bl sub_80073E0 add sp, 0x64 @@ -7816,7 +7816,7 @@ _08010C86: movs r1, 0 adds r2, r5, 0 movs r3, 0 - bl sub_8014FF0 + bl xxx_format_and_draw movs r0, 0 bl sub_80073E0 movs r0, 0x1 @@ -7826,13 +7826,13 @@ _08010C86: movs r0, 0xA movs r1, 0 movs r3, 0x1 - bl sub_8014FF0 + bl xxx_format_and_draw ldr r2, _08010D78 str r4, [sp] movs r0, 0xA movs r1, 0xC movs r3, 0x1 - bl sub_8014FF0 + bl xxx_format_and_draw movs r0, 0x1 bl sub_80073E0 add r0, sp, 0x4 @@ -8739,7 +8739,7 @@ _08011406: movs r1, 0x2 add r2, sp, 0x4 movs r3, 0 - bl sub_8014FF0 + bl xxx_format_and_draw movs r0, 0 bl sub_80073E0 ldr r0, _08011480 @@ -8936,7 +8936,7 @@ _0801152A: movs r0, 0x10 movs r1, 0 movs r3, 0 - bl sub_8014FF0 + bl xxx_format_and_draw movs r6, 0 cmp r6, r9 bge _08011678 @@ -8965,7 +8965,7 @@ _080115DC: adds r1, r4, 0 ldr r2, _0801163C movs r3, 0 - bl sub_8014FF0 + bl xxx_format_and_draw b _08011672 .align 2, 0 _08011610: .4byte gUnknown_203B0E4 @@ -9003,7 +9003,7 @@ _08011640: adds r1, r4, 0 ldr r2, _08011698 movs r3, 0 - bl sub_8014FF0 + bl xxx_format_and_draw _08011672: adds r6, 0x1 cmp r6, r9 diff --git a/asm/code_8012A18.s b/asm/code_8012A18.s index 7d65e4a..350e33d 100644 --- a/asm/code_8012A18.s +++ b/asm/code_8012A18.s @@ -469,7 +469,7 @@ sub_8012EBC: ldr r3, [r5, 0x10] movs r1, 0 str r1, [sp] - bl sub_8014FF0 + bl xxx_format_and_draw _08012F24: ldr r7, [r5, 0x8] ldr r4, [r5, 0x4] @@ -521,7 +521,7 @@ _08012F64: str r0, [sp] movs r0, 0x8 mov r2, r8 - bl sub_8014FF0 + bl xxx_format_and_draw adds r4, 0x8 movs r1, 0x1 add r9, r1 @@ -4717,8 +4717,8 @@ _08014FE8: bx r1 thumb_func_end sub_8014FA8 - thumb_func_start sub_8014FF0 -sub_8014FF0: + thumb_func_start xxx_format_and_draw +xxx_format_and_draw: push {r4-r6,lr} mov r6, r8 push {r6} @@ -4750,7 +4750,7 @@ sub_8014FF0: bx r0 .align 2, 0 _08015030: .4byte 0x000001f7 - thumb_func_end sub_8014FF0 + thumb_func_end xxx_format_and_draw thumb_func_start sub_8015034 sub_8015034: diff --git a/asm/code_801B3C0.s b/asm/code_801B3C0.s index 9d9fddc..966c4c3 100644 --- a/asm/code_801B3C0.s +++ b/asm/code_801B3C0.s @@ -29,7 +29,7 @@ sub_801B60C: strb r4, [r0, 0x12] ldr r0, [r6] ldrb r0, [r0, 0x12] - bl sub_8090A60 + bl IsThrowableItem lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 @@ -366,7 +366,7 @@ _0801B8FE: _0801B914: movs r0, 0xFA lsls r0, 2 - bl sub_80913A0 + bl AddToTeamMoney movs r0, 0x4 bl sub_801B748 b _0801BB0E @@ -381,12 +381,12 @@ _0801B92A: bl sub_801B748 b _0801BB0E _0801B938: - bl sub_8090A34 + bl GetNumberOfFilledInventorySlots cmp r0, 0x13 ble _0801B986 ldr r0, [r4] ldrb r0, [r0, 0x12] - bl sub_8091524 + bl IsNotMoneyOrUsedTMItem lsls r0, 24 cmp r0, 0 beq _0801B968 @@ -408,7 +408,7 @@ _0801B968: movs r0, 0x6 b _0801B99C .align 2, 0 -_0801B970: .4byte gUnknown_203B460 +_0801B970: .4byte gTeamInventory_203B460 _0801B974: .4byte 0x000003e7 _0801B978: strh r1, [r3] @@ -420,8 +420,8 @@ _0801B978: _0801B986: ldr r0, [r4] adds r0, 0x10 - bl sub_8091290 - bl sub_80910B4 + bl AddItemToInventory + bl FillInventoryGaps movs r0, 0xCB bl PlaySound ldr r1, [r4] @@ -888,7 +888,7 @@ _0801BCFC: b _0801BD7A .align 2, 0 _0801BD28: .4byte gUnknown_203B234 -_0801BD2C: .4byte gUnknown_203B460 +_0801BD2C: .4byte gTeamInventory_203B460 _0801BD30: .4byte gUnknown_202DEA8 _0801BD34: bl sub_801A8AC @@ -913,7 +913,7 @@ _0801BD34: b _0801BD7A .align 2, 0 _0801BD64: .4byte gUnknown_203B234 -_0801BD68: .4byte gUnknown_203B460 +_0801BD68: .4byte gTeamInventory_203B460 _0801BD6C: .4byte gUnknown_202DEA8 _0801BD70: bl sub_801A928 @@ -972,11 +972,11 @@ _0801BDD2: bl sub_80917B8 ldr r0, [r4] ldr r0, [r0, 0x24] - bl sub_80911F8 + bl ShiftItemsDownFrom ldr r0, [r4] adds r0, 0x10 - bl sub_8091290 - bl sub_80910B4 + bl AddItemToInventory + bl FillInventoryGaps movs r0, 0xCB bl PlaySound movs r0, 0 @@ -1049,11 +1049,11 @@ _0801BE78: _0801BE80: ldr r0, [r4] ldr r0, [r0, 0x24] - bl sub_80911F8 + bl ShiftItemsDownFrom ldr r0, [r4] adds r0, 0x10 - bl sub_8091290 - bl sub_80910B4 + bl AddItemToInventory + bl FillInventoryGaps movs r0, 0xCB bl PlaySound bl sub_801A928 @@ -1968,7 +1968,7 @@ _0801C5AE: movs r0, 0xC adds r1, r7, 0 ldr r2, _0801C5E8 - bl sub_8014FF0 + bl xxx_format_and_draw adds r5, 0x1 ldr r0, [r6] movs r1, 0x3E diff --git a/asm/code_801C620.s b/asm/code_801C620.s index 8c97b65..1f2dd00 100644 --- a/asm/code_801C620.s +++ b/asm/code_801C620.s @@ -220,7 +220,7 @@ _0801CA7C: movs r6, 0 cmp r0, 0 bne _0801CAB0 - bl sub_8090A34 + bl GetNumberOfFilledInventorySlots adds r4, r0, 0 bl sub_801CFB8 adds r4, r0 @@ -669,7 +669,7 @@ _0801CE44: .4byte 0x000004d2 _0801CE48: .4byte 0x000004ce _0801CE4C: .4byte 0x000004b4 _0801CE50: .4byte 0x000004ec -_0801CE54: .4byte gUnknown_203B460 +_0801CE54: .4byte gTeamInventory_203B460 thumb_func_end sub_801CCD8 thumb_func_start sub_801CE58 @@ -698,7 +698,7 @@ _0801CE68: lsls r0, r6, 24 lsrs r0, 24 str r3, [sp] - bl sub_8091524 + bl IsNotMoneyOrUsedTMItem lsls r0, 24 ldr r3, [sp] cmp r0, 0 @@ -771,7 +771,7 @@ _0801CEFC: bx r1 .align 2, 0 _0801CF0C: .4byte gUnknown_203B244 -_0801CF10: .4byte gUnknown_203B460 +_0801CF10: .4byte gTeamInventory_203B460 thumb_func_end sub_801CE58 thumb_func_start sub_801CF14 @@ -795,7 +795,7 @@ _0801CF20: beq _0801CF3E lsls r0, r4, 24 lsrs r0, 24 - bl sub_8091524 + bl IsNotMoneyOrUsedTMItem lsls r0, 24 cmp r0, 0 bne _0801CF1A @@ -809,7 +809,7 @@ _0801CF46: pop {r1} bx r1 .align 2, 0 -_0801CF4C: .4byte gUnknown_203B460 +_0801CF4C: .4byte gTeamInventory_203B460 thumb_func_end sub_801CF14 thumb_func_start sub_801CF50 @@ -826,7 +826,7 @@ _0801CF5A: _0801CF5E: lsls r0, r4, 24 lsrs r0, 24 - bl sub_8091524 + bl IsNotMoneyOrUsedTMItem lsls r0, 24 cmp r0, 0 beq _0801CF7C @@ -849,7 +849,7 @@ _0801CF84: bx r1 .align 2, 0 _0801CF8C: .4byte 0x000003e6 -_0801CF90: .4byte gUnknown_203B460 +_0801CF90: .4byte gTeamInventory_203B460 thumb_func_end sub_801CF50 thumb_func_start sub_801CF94 @@ -1554,7 +1554,7 @@ sub_801D4C0: str r0, [r1, 0x6C] ldr r0, _0801D558 str r0, [r1, 0x68] - bl sub_8090A34 + bl GetNumberOfFilledInventorySlots cmp r0, 0 bne _0801D4FE ldr r0, [r4] @@ -1640,7 +1640,7 @@ _0801D59A: str r0, [r1, 0x74] ldr r0, _0801D648 str r0, [r1, 0x70] - bl sub_8090A34 + bl GetNumberOfFilledInventorySlots cmp r0, 0 bne _0801D5B4 ldr r0, [r4] diff --git a/asm/code_8027C84.s b/asm/code_8027C84.s index c007807..c2bbfa0 100644 --- a/asm/code_8027C84.s +++ b/asm/code_8027C84.s @@ -115,7 +115,7 @@ sub_8027D40: movs r0, 0x4 movs r1, 0x3 adds r3, r6, 0 - bl sub_8014FF0 + bl xxx_format_and_draw adds r0, r6, 0 bl sub_80073E0 add sp, 0x14 @@ -209,7 +209,7 @@ sub_8027E18: movs r0, 0 b _08027E46 _08027E28: - bl sub_8090A34 + bl GetNumberOfFilledInventorySlots cmp r0, 0x13 bgt _08027E34 movs r0, 0x1 @@ -237,12 +237,12 @@ sub_8027E4C: adds r4, r5, 0 adds r4, 0x28 ldrb r0, [r4] - bl sub_8091524 + bl IsNotMoneyOrUsedTMItem lsls r0, 24 cmp r0, 0 beq _08027E88 ldrb r0, [r4] - bl sub_8090A60 + bl IsThrowableItem lsls r0, 24 cmp r0, 0 beq _08027E94 @@ -264,7 +264,7 @@ _08027E88: movs r0, 0 b _08027EAA .align 2, 0 -_08027E8C: .4byte gUnknown_203B460 +_08027E8C: .4byte gTeamInventory_203B460 _08027E90: .4byte 0x000003e7 _08027E94: ldr r0, _08027EB0 @@ -284,7 +284,7 @@ _08027EAA: pop {r1} bx r1 .align 2, 0 -_08027EB0: .4byte gUnknown_203B460 +_08027EB0: .4byte gTeamInventory_203B460 _08027EB4: .4byte 0x000003e6 thumb_func_end sub_8027E4C @@ -310,7 +310,7 @@ _08027ED8: ldr r0, [r4] adds r0, 0x14 bl sub_8091274 - bl sub_80910B4 + bl FillInventoryGaps ldr r0, [r4] movs r1, 0 strb r1, [r0, 0x14] @@ -331,7 +331,7 @@ _08027F0C: bl PlaySound ldr r0, [r4] ldrb r0, [r0, 0x14] - bl sub_8090A60 + bl IsThrowableItem lsls r0, 24 cmp r0, 0 beq _08027F40 @@ -348,7 +348,7 @@ _08027F0C: b _08027F52 .align 2, 0 _08027F38: .4byte 0x0000014d -_08027F3C: .4byte gUnknown_203B460 +_08027F3C: .4byte gTeamInventory_203B460 _08027F40: ldr r0, _08027F74 ldr r1, [r0] @@ -376,7 +376,7 @@ _08027F52: bl sub_8027184 b _08027F82 .align 2, 0 -_08027F74: .4byte gUnknown_203B460 +_08027F74: .4byte gTeamInventory_203B460 _08027F78: .4byte gUnknown_203B2BC _08027F7C: movs r0, 0x2 diff --git a/asm/code_802B640.s b/asm/code_802B640.s index cdef6e2..68c3ef2 100644 --- a/asm/code_802B640.s +++ b/asm/code_802B640.s @@ -409,7 +409,7 @@ _0802B930: str r0, [sp] movs r0, 0x15 adds r1, r5, 0 - bl sub_8014FF0 + bl xxx_format_and_draw adds r6, 0x1 ldr r0, [r7] adds r0, 0x52 @@ -668,7 +668,7 @@ sub_802BB28: str r4, [sp] movs r0, 0xA movs r1, 0 - bl sub_8014FF0 + bl xxx_format_and_draw ldr r3, [r5] ldr r1, [r3, 0x8] lsls r1, 2 @@ -680,7 +680,7 @@ sub_802BB28: str r4, [sp] movs r0, 0x6 movs r1, 0x14 - bl sub_8014FF0 + bl xxx_format_and_draw ldr r0, [r5] ldr r0, [r0, 0x24] bl sub_80073E0 diff --git a/asm/code_80428A0.s b/asm/code_80428A0.s index c85bf60..70dee43 100644 --- a/asm/code_80428A0.s +++ b/asm/code_80428A0.s @@ -2824,7 +2824,7 @@ _080441A4: .align 2, 0 _080441AC: .4byte gUnknown_203B418 _080441B0: .4byte 0x00000644 -_080441B4: .4byte gUnknown_203B460 +_080441B4: .4byte gTeamInventory_203B460 _080441B8: .4byte gRecruitedPokemonRef thumb_func_end sub_8044124 @@ -4249,7 +4249,7 @@ sub_8044CC8: adds r0, r1 b _08044D34 .align 2, 0 -_08044CE8: .4byte gUnknown_203B460 +_08044CE8: .4byte gTeamInventory_203B460 _08044CEC: adds r0, r1, 0 cmp r0, 0x80 @@ -4319,10 +4319,10 @@ sub_8044D40: strb r0, [r1, 0x2] strb r0, [r1, 0x1] strb r0, [r1] - bl sub_80910B4 + bl FillInventoryGaps b _08044D88 .align 2, 0 -_08044D70: .4byte gUnknown_203B460 +_08044D70: .4byte gTeamInventory_203B460 _08044D74: lsls r0, r1, 24 lsrs r0, 24 @@ -4419,7 +4419,7 @@ _08044E10: strb r0, [r1, 0x2] strb r0, [r1, 0x1] strb r0, [r1] - bl sub_80910B4 + bl FillInventoryGaps _08044E1C: pop {r4} pop {r0} @@ -4440,7 +4440,7 @@ sub_8044E24: ldr r0, [r4, 0x70] mov r8, r0 ldrb r0, [r5, 0x2] - bl sub_80915A0 + bl IsHMItem lsls r0, 24 cmp r0, 0 bne _08044EBA @@ -6369,7 +6369,7 @@ sub_8045C28: bl sub_8090A8C movs r7, 0 adds r0, r4, 0 - bl sub_8091544 + bl IsNotSpecialItem lsls r0, 24 cmp r0, 0 beq _08045C72 @@ -6519,7 +6519,7 @@ _08045D58: lsls r0, 24 lsrs r0, 24 adds r4, r0, 0 - bl sub_80914E4 + bl CanSellItem lsls r0, 24 cmp r0, 0 bne _08045D6E @@ -6640,8 +6640,8 @@ _08045E40: lsls r0, 1 bl PlaySoundEffect adds r0, r5, 0 - bl sub_80915D4 - bl sub_80913A0 + bl GetMoneyValue + bl AddToTeamMoney ldr r0, _08045E74 adds r1, r5, 0 bl sub_8045BF8 @@ -6679,7 +6679,7 @@ _08045E94: .align 2, 0 _08045EA8: .4byte gUnknown_203B418 _08045EAC: .4byte 0x0000065b -_08045EB0: .4byte gUnknown_203B460 +_08045EB0: .4byte gTeamInventory_203B460 _08045EB4: ldr r0, [sp, 0xAC] adds r0, 0x60 @@ -6924,7 +6924,7 @@ _0804608C: .4byte gUnknown_202DE58 _08046090: .4byte gUnknown_80F8FC4 _08046094: adds r0, r5, 0 - bl sub_8091290 + bl AddItemToInventory lsls r0, 24 cmp r0, 0 beq _080460C0 @@ -7007,7 +7007,7 @@ _08046110: cmp r0, 0 beq _08046186 ldrb r0, [r6, 0x2] - bl sub_80914E4 + bl CanSellItem lsls r0, 24 cmp r0, 0 beq _08046186 @@ -7019,7 +7019,7 @@ _08046110: cmp r7, 0 beq _08046186 adds r0, r6, 0 - bl sub_8090C7C + bl GetStackBuyPrice ldr r1, _08046168 ldr r2, [r1] ldr r1, _0804616C @@ -7029,7 +7029,7 @@ _08046168: .4byte gUnknown_203B418 _0804616C: .4byte 0x0000068c _08046170: adds r0, r6, 0 - bl sub_8090CCC + bl GetStackSellPrice ldr r1, _080461BC ldr r2, [r1] movs r1, 0xD2 @@ -7107,7 +7107,7 @@ _080461F2: cmp r0, 0 beq _0804624E ldrb r0, [r4, 0x2] - bl sub_80914E4 + bl CanSellItem lsls r0, 24 cmp r0, 0 beq _0804624E @@ -7119,7 +7119,7 @@ _080461F2: cmp r7, 0 beq _0804624E adds r0, r4, 0 - bl sub_8090C7C + bl GetStackBuyPrice ldr r1, _08046230 ldr r2, [r1] ldr r1, _08046234 @@ -7130,7 +7130,7 @@ _08046230: .4byte gUnknown_203B418 _08046234: .4byte 0x0000068c _08046238: adds r0, r4, 0 - bl sub_8090CCC + bl GetStackSellPrice ldr r1, _0804628C ldr r2, [r1] movs r3, 0xD2 @@ -8672,7 +8672,7 @@ _08046DC8: _08046E1E: cmp r7, 0 bne _08046D96 - bl sub_80910B4 + bl FillInventoryGaps cmp r6, 0 beq _08046ED4 bl sub_8083600 @@ -8749,7 +8749,7 @@ _08046ED4: pop {r0} bx r0 .align 2, 0 -_08046EDC: .4byte gUnknown_203B460 +_08046EDC: .4byte gTeamInventory_203B460 _08046EE0: .4byte sub_80861A8 _08046EE4: .4byte gUnknown_203B418 _08046EE8: .4byte 0x0001356c @@ -8775,7 +8775,7 @@ sub_8046F00: lsls r0, 16 lsrs r7, r0, 16 ldrb r0, [r4, 0x2] - bl sub_80915A0 + bl IsHMItem lsls r0, 24 cmp r0, 0 bne _08046F6E @@ -8856,7 +8856,7 @@ _08046FAE: adds r5, 0x1 cmp r5, 0x13 ble _08046F90 - bl sub_80910B4 + bl FillInventoryGaps movs r5, 0 movs r6, 0 _08046FBC: @@ -8895,7 +8895,7 @@ _08046FF4: pop {r0} bx r0 .align 2, 0 -_08047000: .4byte gUnknown_203B460 +_08047000: .4byte gTeamInventory_203B460 _08047004: .4byte gUnknown_203B418 _08047008: .4byte 0x0001357c thumb_func_end sub_8046F84 @@ -8922,7 +8922,7 @@ _0804702C: adds r5, 0x1 cmp r5, 0x13 ble _08047012 - bl sub_80910B4 + bl FillInventoryGaps movs r5, 0 _08047038: ldr r0, _0804707C @@ -8957,7 +8957,7 @@ _0804706C: pop {r0} bx r0 .align 2, 0 -_08047078: .4byte gUnknown_203B460 +_08047078: .4byte gTeamInventory_203B460 _0804707C: .4byte gUnknown_203B418 _08047080: .4byte 0x0001357c thumb_func_end sub_804700C @@ -8985,7 +8985,7 @@ _080470A2: adds r5, 0x1 cmp r5, 0x13 ble _08047090 - bl sub_80910B4 + bl FillInventoryGaps movs r5, 0 _080470B0: ldr r0, _080470EC @@ -9016,7 +9016,7 @@ _080470E2: movs r0, 0x1 b _080470FC .align 2, 0 -_080470E8: .4byte gUnknown_203B460 +_080470E8: .4byte gTeamInventory_203B460 _080470EC: .4byte gUnknown_203B418 _080470F0: .4byte 0x0001357c _080470F4: @@ -9049,8 +9049,8 @@ _0804710A: cmp r0, 0x69 bne _08047132 adds r0, r4, 0 - bl sub_80915D4 - bl sub_80913A0 + bl GetMoneyValue + bl AddToTeamMoney strb r5, [r4, 0x2] strb r5, [r4, 0x1] strb r5, [r4] @@ -9067,12 +9067,12 @@ _08047142: adds r6, 0x1 cmp r6, 0x13 ble _0804710A - bl sub_80910B4 + bl FillInventoryGaps pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_08047154: .4byte gUnknown_203B460 +_08047154: .4byte gTeamInventory_203B460 thumb_func_end sub_8047104 thumb_func_start sub_8047158 @@ -9106,7 +9106,7 @@ _08047180: pop {r0} bx r0 .align 2, 0 -_0804718C: .4byte gUnknown_203B460 +_0804718C: .4byte gTeamInventory_203B460 thumb_func_end sub_8047158 thumb_func_start sub_8047190 diff --git a/asm/code_8048480.s b/asm/code_8048480.s index c24da61..df967ae 100644 --- a/asm/code_8048480.s +++ b/asm/code_8048480.s @@ -584,7 +584,7 @@ _08048984: .4byte gUnknown_80FE3E8 _08048988: mov r1, r8 ldrb r0, [r1, 0x2] - bl sub_80915A0 + bl IsHMItem lsls r0, 24 cmp r0, 0 beq _080489A0 @@ -1095,7 +1095,7 @@ _08048D78: cmp r0, 0x1 bne _08048DB0 ldrb r0, [r2, 0x2] - bl sub_8091570 + bl IsEdibleItem lsls r0, 24 cmp r0, 0 beq _08048DB0 @@ -20335,7 +20335,7 @@ _08052196: movs r0, 0 b _080521CA .align 2, 0 -_080521B4: .4byte gUnknown_203B460 +_080521B4: .4byte gTeamInventory_203B460 _080521B8: .4byte gRecruitedPokemonRef _080521BC: .4byte 0x00008df8 _080521C0: .4byte 0x00008e38 diff --git a/asm/code_8057824.s b/asm/code_8057824.s index f69391b..6324830 100644 --- a/asm/code_8057824.s +++ b/asm/code_8057824.s @@ -8250,7 +8250,7 @@ _0805B7C2: bl sub_80522F4 b _0805B7E8 .align 2, 0 -_0805B7D4: .4byte gUnknown_203B460 +_0805B7D4: .4byte gTeamInventory_203B460 _0805B7D8: .4byte gUnknown_80FDC9C _0805B7DC: ldr r0, _0805B7F8 @@ -8840,7 +8840,7 @@ _0805BC30: bl sub_80522F4 b _0805BC60 .align 2, 0 -_0805BC44: .4byte gUnknown_203B460 +_0805BC44: .4byte gTeamInventory_203B460 _0805BC48: .4byte gUnknown_203B418 _0805BC4C: .4byte 0x0001357c _0805BC50: .4byte gUnknown_80FC8F0 @@ -12726,7 +12726,7 @@ _0805DEFC: .4byte gUnknown_203B46C _0805DF00: .4byte gRealInputs _0805DF04: .4byte gUnknown_202F22D _0805DF08: .4byte 0x01000200 -_0805DF0C: .4byte gUnknown_203B460 +_0805DF0C: .4byte gTeamInventory_203B460 _0805DF10: .4byte gUnknown_203B418 _0805DF14: .4byte 0x0001820a _0805DF18: .4byte gUnknown_202EE00 @@ -16153,7 +16153,7 @@ _0805FA62: movs r0, 0x73 movs r1, 0 movs r3, 0x2 - bl sub_8014FF0 + bl xxx_format_and_draw ldr r0, _0805FBC8 ldr r0, [r0] movs r1, 0x98 @@ -16167,7 +16167,7 @@ _0805FA62: movs r0, 0x73 movs r1, 0xC movs r3, 0x2 - bl sub_8014FF0 + bl xxx_format_and_draw ldr r5, _0805FBD0 movs r0, 0 bl sub_807E580 @@ -16182,7 +16182,7 @@ _0805FA62: movs r0, 0x73 movs r1, 0x18 movs r3, 0x2 - bl sub_8014FF0 + bl xxx_format_and_draw ldr r0, [sp, 0x4] str r0, [r4] ldr r0, [sp, 0x8] @@ -16195,7 +16195,7 @@ _0805FA62: movs r0, 0x73 movs r1, 0x24 movs r3, 0x2 - bl sub_8014FF0 + bl xxx_format_and_draw movs r7, 0 mov r8, r4 _0805FB3A: @@ -16230,7 +16230,7 @@ _0805FB3A: movs r0, 0x4 adds r1, r7, 0 movs r3, 0x2 - bl sub_8014FF0 + bl xxx_format_and_draw adds r7, 0xC cmp r7, 0x2F bgt _0805FB8C @@ -16259,7 +16259,7 @@ _0805FBB8: .4byte gFieldMenuGroundPtr _0805FBBC: .4byte gPlayTimeRef _0805FBC0: .4byte gUnknown_202DE30 _0805FBC4: .4byte gUnknown_80F9174 -_0805FBC8: .4byte gUnknown_203B460 +_0805FBC8: .4byte gTeamInventory_203B460 _0805FBCC: .4byte gUnknown_80F9190 _0805FBD0: .4byte gAvailablePokemonNames _0805FBD4: .4byte gUnknown_80F91A8 @@ -16747,7 +16747,7 @@ _0805FF66: b _0805FFE8 .align 2, 0 _0805FFA8: .4byte gUnknown_202F240 -_0805FFAC: .4byte gUnknown_203B460 +_0805FFAC: .4byte gTeamInventory_203B460 _0805FFB0: .4byte gUnknown_203B418 _0805FFB4: .4byte 0x0001357c _0805FFB8: .4byte gUnknown_202F258 @@ -16904,7 +16904,7 @@ _080600D8: lsls r0, 1 bl PlaySoundEffect bl sub_8047158 - bl sub_80912C8 + bl ConvertMoneyItemToMoney movs r0, 0 ldr r2, _08060140 str r0, [r2] @@ -17196,7 +17196,7 @@ _0806033C: .align 2, 0 _0806034C: .4byte gUnknown_202EE10 _08060350: .4byte gUnknown_202F248 -_08060354: .4byte gUnknown_203B460 +_08060354: .4byte gTeamInventory_203B460 _08060358: .4byte gUnknown_202F240 _0806035C: .4byte gRealInputs _08060360: .4byte gUnknown_203B418 @@ -17454,7 +17454,7 @@ _08060564: adds r0, r6, 0 movs r1, 0 movs r3, 0 - bl sub_8014FF0 + bl xxx_format_and_draw movs r4, 0 adds r6, r5, 0 movs r7, 0 @@ -17486,14 +17486,14 @@ _08060592: movs r0, 0x8 adds r2, r5, 0 movs r3, 0 - bl sub_8014FF0 + bl xxx_format_and_draw adds r4, 0x1 cmp r4, 0x9 ble _0806057E b _08060794 .align 2, 0 _080605C0: .4byte gTeamToolboxAPtr -_080605C4: .4byte gUnknown_203B460 +_080605C4: .4byte gTeamInventory_203B460 _080605C8: .4byte gUnknown_8106B60 _080605CC: ldr r0, _08060630 @@ -17503,7 +17503,7 @@ _080605CC: adds r0, r6, 0 movs r1, 0 movs r3, 0 - bl sub_8014FF0 + bl xxx_format_and_draw movs r4, 0 adds r6, r5, 0 movs r7, 0 @@ -17538,14 +17538,14 @@ _080605FC: movs r0, 0x8 adds r2, r5, 0 movs r3, 0 - bl sub_8014FF0 + bl xxx_format_and_draw adds r4, 0x1 cmp r4, 0x9 ble _080605E6 b _08060794 .align 2, 0 _08060630: .4byte gTeamToolboxBPtr -_08060634: .4byte gUnknown_203B460 +_08060634: .4byte gTeamInventory_203B460 _08060638: .4byte gUnknown_8106B60 _0806063C: mov r1, r9 @@ -17564,7 +17564,7 @@ _0806063C: adds r0, r6, 0 movs r1, 0 movs r3, 0 - bl sub_8014FF0 + bl xxx_format_and_draw ldrb r1, [r7] movs r0, 0x1 ands r0, r1 @@ -17587,7 +17587,7 @@ _0806063C: movs r0, 0x8 adds r2, r4, 0 movs r3, 0 - bl sub_8014FF0 + bl xxx_format_and_draw _08060698: ldr r1, [sp, 0x70] cmp r1, 0 @@ -17615,7 +17615,7 @@ _080606B0: adds r0, r6, 0 movs r1, 0 movs r3, 0 - bl sub_8014FF0 + bl xxx_format_and_draw ldrb r1, [r7] movs r0, 0x1 ands r0, r1 @@ -17638,7 +17638,7 @@ _080606B0: movs r0, 0x8 adds r2, r4, 0 movs r3, 0 - bl sub_8014FF0 + bl xxx_format_and_draw b _08060794 .align 2, 0 _0806070C: .4byte gAvailablePokemonNames @@ -17676,7 +17676,7 @@ _08060718: adds r0, r6, 0 movs r1, 0 movs r3, 0 - bl sub_8014FF0 + bl xxx_format_and_draw ldrb r1, [r7] movs r0, 0x1 ands r0, r1 @@ -17700,7 +17700,7 @@ _08060718: movs r0, 0x8 adds r2, r5, 0 movs r3, 0 - bl sub_8014FF0 + bl xxx_format_and_draw _08060794: ldr r2, _080607F4 movs r3, 0x18 @@ -17726,7 +17726,7 @@ _080607A6: movs r0, 0x4 movs r1, 0x2 movs r3, 0x1 - bl sub_8014FF0 + bl xxx_format_and_draw movs r0, 0x1 bl sub_80073E0 _080607D0: @@ -17952,7 +17952,7 @@ _08060964: .4byte gUnknown_202F238 _08060968: .4byte gUnknown_202EE6C _0806096C: .4byte gUnknown_203B418 _08060970: .4byte 0x0000065b -_08060974: .4byte gUnknown_203B460 +_08060974: .4byte gTeamInventory_203B460 _08060978: mov r0, r10 adds r0, 0x60 @@ -18122,7 +18122,7 @@ _08060ABE: bl sub_8044FF0 b _08060B3C .align 2, 0 -_08060AD4: .4byte gUnknown_203B460 +_08060AD4: .4byte gTeamInventory_203B460 _08060AD8: .4byte gUnknown_202F238 _08060ADC: .4byte gUnknown_203B418 _08060AE0: .4byte 0x0001357c @@ -18150,7 +18150,7 @@ _08060AE8: .align 2, 0 _08060B10: .4byte gUnknown_203B418 _08060B14: .4byte 0x0000065b -_08060B18: .4byte gUnknown_203B460 +_08060B18: .4byte gTeamInventory_203B460 _08060B1C: ldrb r1, [r7, 0x2] movs r0, 0x37 @@ -18296,7 +18296,7 @@ _08060C32: .align 2, 0 _08060C50: .4byte gUnknown_203B418 _08060C54: .4byte 0x0001357c -_08060C58: .4byte gUnknown_203B460 +_08060C58: .4byte gTeamInventory_203B460 _08060C5C: .4byte 0x0000065b _08060C60: ldrb r1, [r7, 0x2] @@ -18526,7 +18526,7 @@ _08060E1A: .align 2, 0 _08060E28: .4byte gUnknown_203B418 _08060E2C: .4byte 0x0000065b -_08060E30: .4byte gUnknown_203B460 +_08060E30: .4byte gTeamInventory_203B460 _08060E34: .4byte 0x0001357c thumb_func_end sub_8060D64 @@ -19065,7 +19065,7 @@ _0806125C: movs r0, 0xC movs r1, 0 movs r3, 0 - bl sub_8014FF0 + bl xxx_format_and_draw _08061286: movs r6, 0 cmp r6, r7 @@ -19253,7 +19253,7 @@ _080613EE: movs r0, 0x9 ldr r2, _08061428 movs r3, 0 - bl sub_8014FF0 + bl xxx_format_and_draw b _08061438 .align 2, 0 _0806141C: .4byte gUnknown_8106BD0 @@ -19265,7 +19265,7 @@ _0806142C: movs r0, 0x9 ldr r2, _08061458 movs r3, 0 - bl sub_8014FF0 + bl xxx_format_and_draw _08061438: adds r6, 0x1 cmp r6, r7 @@ -19957,7 +19957,7 @@ _080619B8: mov r1, r8 ldr r2, _080619E0 adds r3, r7, 0 - bl sub_8014FF0 + bl xxx_format_and_draw b _080619F4 .align 2, 0 _080619DC: .4byte gAvailablePokemonNames @@ -19969,7 +19969,7 @@ _080619E4: mov r1, r8 ldr r2, _08061A34 adds r3, r7, 0 - bl sub_8014FF0 + bl xxx_format_and_draw _080619F4: adds r6, 0x1 movs r0, 0xC @@ -21569,7 +21569,7 @@ _08062650: movs r0, 0x10 movs r1, 0 movs r3, 0 - bl sub_8014FF0 + bl xxx_format_and_draw mov r0, r10 bl GetIQSkillDescription adds r2, r0, 0 @@ -21578,7 +21578,7 @@ _08062650: movs r0, 0x8 movs r1, 0x10 movs r3, 0 - bl sub_8014FF0 + bl xxx_format_and_draw movs r0, 0 bl sub_80073E0 mov r0, r10 @@ -21699,7 +21699,7 @@ _0806276C: movs r0, 0x10 movs r1, 0 movs r3, 0 - bl sub_8014FF0 + bl xxx_format_and_draw mov r0, r10 bl GetTacticsDescription adds r2, r0, 0 @@ -21708,7 +21708,7 @@ _0806276C: movs r0, 0x8 movs r1, 0x10 movs r3, 0 - bl sub_8014FF0 + bl xxx_format_and_draw movs r0, 0 bl sub_80073E0 mov r0, r10 @@ -21852,7 +21852,7 @@ sub_806285C: movs r0, 0x10 movs r1, 0 movs r3, 0 - bl sub_8014FF0 + bl xxx_format_and_draw mov r0, r10 bl sub_808E51C adds r2, r0, 0 @@ -21861,7 +21861,7 @@ sub_806285C: movs r0, 0x8 movs r1, 0x10 movs r3, 0 - bl sub_8014FF0 + bl xxx_format_and_draw movs r0, 0 bl sub_80073E0 add r4, sp, 0x4 @@ -22180,7 +22180,7 @@ sub_8062B74: movs r0, 0xC movs r1, 0 movs r3, 0x2 - bl sub_8014FF0 + bl xxx_format_and_draw movs r1, 0x10 mov r8, r1 mov r0, r9 @@ -22213,7 +22213,7 @@ _08062BDE: movs r0, 0xC mov r1, r8 movs r3, 0x2 - bl sub_8014FF0 + bl xxx_format_and_draw b _08062C8A .align 2, 0 _08062BF0: .4byte gUnknown_8106C90 @@ -22285,7 +22285,7 @@ _08062C6C: mov r1, r8 ldr r2, _08062CA4 movs r3, 0x2 - bl sub_8014FF0 + bl xxx_format_and_draw movs r0, 0xC add r8, r0 _08062C80: @@ -22331,7 +22331,7 @@ sub_8062CA8: movs r0, 0xC movs r1, 0 movs r3, 0x2 - bl sub_8014FF0 + bl xxx_format_and_draw movs r7, 0x8 movs r6, 0x12 adds r0, r5, 0 @@ -22380,7 +22380,7 @@ _08062D18: _08062D2C: adds r1, r6, 0 movs r3, 0x2 - bl sub_8014FF0 + bl xxx_format_and_draw b _08062D52 .align 2, 0 _08062D38: .4byte gUnknown_8106C9C @@ -22393,7 +22393,7 @@ _08062D3C: adds r0, r7, 0 adds r1, r6, 0 movs r3, 0x2 - bl sub_8014FF0 + bl xxx_format_and_draw _08062D52: movs r0, 0x2 bl sub_80073E0 @@ -23391,7 +23391,7 @@ _08063526: movs r0, 0x4 movs r1, 0 movs r3, 0x2 - bl sub_8014FF0 + bl xxx_format_and_draw movs r0, 0x2 bl sub_80073E0 add sp, 0x24 @@ -23440,7 +23440,7 @@ sub_8063578: adds r0, r4, 0 movs r1, 0 mov r3, r8 - bl sub_8014FF0 + bl xxx_format_and_draw movs r1, 0 mov r9, r1 ldr r0, [sp, 0x10] @@ -23523,7 +23523,7 @@ _08063658: adds r1, r4, 0 ldr r2, _08063694 mov r3, r8 - bl sub_8014FF0 + bl xxx_format_and_draw _08063668: adds r7, 0x8 adds r5, 0x8 @@ -24002,13 +24002,13 @@ sub_80639E4: movs r0, 0x10 movs r1, 0 movs r3, 0 - bl sub_8014FF0 + bl xxx_format_and_draw ldr r2, [r5, 0x4] str r4, [sp] movs r0, 0x4 movs r1, 0x10 movs r3, 0 - bl sub_8014FF0 + bl xxx_format_and_draw movs r0, 0 bl sub_80073E0 ldr r0, _08063A6C @@ -27169,7 +27169,7 @@ _080652D2: movs r0, 0x10 movs r1, 0 movs r3, 0 - bl sub_8014FF0 + bl xxx_format_and_draw adds r0, r4, 0 movs r1, 0 bl sub_8013800 @@ -27179,7 +27179,7 @@ _080652D2: str r7, [sp] movs r0, 0x8 movs r3, 0 - bl sub_8014FF0 + bl xxx_format_and_draw adds r0, r4, 0 movs r1, 0x1 bl sub_8013800 @@ -27189,7 +27189,7 @@ _080652D2: str r7, [sp] movs r0, 0x8 movs r3, 0 - bl sub_8014FF0 + bl xxx_format_and_draw adds r0, r4, 0 movs r1, 0x2 bl sub_8013800 @@ -27199,7 +27199,7 @@ _080652D2: str r7, [sp] movs r0, 0x8 movs r3, 0 - bl sub_8014FF0 + bl xxx_format_and_draw movs r5, 0x4 adds r0, r4, 0 movs r1, 0x3 @@ -27210,7 +27210,7 @@ _080652D2: str r7, [sp] movs r0, 0x8 movs r3, 0 - bl sub_8014FF0 + bl xxx_format_and_draw ldr r1, _080653D8 ldr r0, [r1] movs r1, 0xCB @@ -27233,7 +27233,7 @@ _080652D2: str r7, [sp] movs r0, 0x8 movs r3, 0 - bl sub_8014FF0 + bl xxx_format_and_draw b _0806540E .align 2, 0 _080653D0: .4byte gUnknown_202EE10 @@ -27256,7 +27256,7 @@ _080653F4: str r7, [sp] movs r0, 0x8 movs r3, 0 - bl sub_8014FF0 + bl xxx_format_and_draw _0806540E: ldr r0, _08065444 adds r1, r5, 0 @@ -27268,7 +27268,7 @@ _0806540E: str r0, [sp] movs r0, 0x8 movs r3, 0 - bl sub_8014FF0 + bl xxx_format_and_draw movs r0, 0 bl sub_80073E0 add sp, 0xC8 @@ -27379,7 +27379,7 @@ sub_806544C: movs r0, 0x10 movs r1, 0 movs r3, 0 - bl sub_8014FF0 + bl xxx_format_and_draw adds r0, r4, 0 movs r1, 0 bl sub_8013800 @@ -27392,7 +27392,7 @@ sub_806544C: str r5, [sp] movs r0, 0x8 movs r3, 0 - bl sub_8014FF0 + bl xxx_format_and_draw adds r0, r4, 0 movs r1, 0x1 bl sub_8013800 @@ -27404,7 +27404,7 @@ sub_806544C: str r5, [sp] movs r0, 0x8 movs r3, 0 - bl sub_8014FF0 + bl xxx_format_and_draw movs r0, 0 bl sub_80073E0 add sp, 0xC8 @@ -27531,28 +27531,28 @@ CreateFieldGameOptionsMenu: movs r0, 0x10 movs r1, 0 movs r3, 0 - bl sub_8014FF0 + bl xxx_format_and_draw ldr r1, [sp, 0x4] ldr r0, _080656B4 ldr r2, [r0] str r6, [sp] movs r0, 0x8 movs r3, 0 - bl sub_8014FF0 + bl xxx_format_and_draw ldr r1, [sp, 0x8] ldr r0, _080656B8 ldr r2, [r0] str r6, [sp] movs r0, 0x8 movs r3, 0 - bl sub_8014FF0 + bl xxx_format_and_draw ldr r1, [sp, 0xC] ldr r0, _080656BC ldr r2, [r0] str r6, [sp] movs r0, 0x8 movs r3, 0 - bl sub_8014FF0 + bl xxx_format_and_draw movs r0, 0 bl sub_80073E0 add sp, 0xD4 @@ -27693,42 +27693,42 @@ CreateFieldDungeonMenu: movs r0, 0x10 movs r1, 0 movs r3, 0 - bl sub_8014FF0 + bl xxx_format_and_draw ldr r1, [sp, 0x4] ldr r0, _08065848 ldr r2, [r0] str r5, [sp] movs r0, 0x8 movs r3, 0 - bl sub_8014FF0 + bl xxx_format_and_draw ldr r1, [sp, 0x8] ldr r0, _0806584C ldr r2, [r0] str r5, [sp] movs r0, 0x8 movs r3, 0 - bl sub_8014FF0 + bl xxx_format_and_draw ldr r1, [sp, 0xC] ldr r0, _08065850 ldr r2, [r0] str r5, [sp] movs r0, 0x8 movs r3, 0 - bl sub_8014FF0 + bl xxx_format_and_draw ldr r1, [sp, 0x10] ldr r0, _08065854 ldr r2, [r0] str r5, [sp] movs r0, 0x8 movs r3, 0 - bl sub_8014FF0 + bl xxx_format_and_draw ldr r1, [sp, 0x14] ldr r0, _08065858 ldr r2, [r0] str r5, [sp] movs r0, 0x8 movs r3, 0 - bl sub_8014FF0 + bl xxx_format_and_draw ldr r0, _0806585C ldrb r0, [r0] adds r4, r7, 0 @@ -27976,14 +27976,14 @@ _08065A0A: movs r0, 0x10 movs r1, 0 movs r3, 0 - bl sub_8014FF0 + bl xxx_format_and_draw ldr r1, [r6] ldr r0, _08065A84 ldr r2, [r0] str r4, [sp] movs r0, 0x8 movs r3, 0 - bl sub_8014FF0 + bl xxx_format_and_draw ldr r0, _08065A88 ldrb r1, [r0, 0x8] lsls r3, r1, 2 @@ -28413,7 +28413,7 @@ sub_8065CAC: movs r0, 0x10 movs r1, 0 movs r3, 0 - bl sub_8014FF0 + bl xxx_format_and_draw movs r4, 0 ldr r5, _08065DB8 _08065D7A: @@ -28426,7 +28426,7 @@ _08065D7A: str r0, [sp] movs r0, 0x8 movs r3, 0 - bl sub_8014FF0 + bl xxx_format_and_draw adds r4, 0x1 cmp r4, 0x6 ble _08065D7A @@ -28582,7 +28582,7 @@ _08065E0C: str r7, [sp] movs r1, 0 movs r3, 0 - bl sub_8014FF0 + bl xxx_format_and_draw ldr r1, _08065F38 ldr r2, [sp, 0xC8] lsls r0, r2, 5 @@ -28593,7 +28593,7 @@ _08065E0C: movs r0, 0x8 movs r1, 0x10 movs r3, 0 - bl sub_8014FF0 + bl xxx_format_and_draw movs r0, 0 bl sub_80073E0 _08065EF4: @@ -29005,7 +29005,7 @@ _08066208: mov r1, r8 add r2, sp, 0x4 movs r3, 0 - bl sub_8014FF0 + bl xxx_format_and_draw _08066244: subs r7, 0x1 adds r5, 0x2 @@ -29103,7 +29103,7 @@ _080662C4: movs r1, 0x14 add r2, sp, 0x4 movs r3, 0 - bl sub_8014FF0 + bl xxx_format_and_draw movs r0, 0 bl sub_80073E0 movs r0, 0x45 @@ -29205,7 +29205,7 @@ _080663A0: adds r1, r6, 0 add r2, sp, 0x4 movs r3, 0 - bl sub_8014FF0 + bl xxx_format_and_draw movs r0, 0 bl sub_80073E0 movs r0, 0xD @@ -29702,7 +29702,7 @@ _08066798: ldr r0, _080667CC b _080667DE .align 2, 0 -_080667C0: .4byte gUnknown_203B460 +_080667C0: .4byte gTeamInventory_203B460 _080667C4: .4byte gUnknown_202DE58 _080667C8: .4byte 0x00000133 _080667CC: .4byte gUnknown_80F8D04 @@ -29797,7 +29797,7 @@ _08066856: bl sub_80522A8 b _080668BE .align 2, 0 -_0806688C: .4byte gUnknown_203B460 +_0806688C: .4byte gTeamInventory_203B460 _08066890: .4byte gUnknown_202DE58 _08066894: .4byte gUnknown_80F8C7C _08066898: @@ -29934,7 +29934,7 @@ _08066968: _080669A8: .4byte 0xffffff00 _080669AC: mov r0, sp - bl sub_8091290 + bl AddItemToInventory _080669B2: ldr r0, [sp, 0x4] str r0, [r7, 0x60] @@ -30079,7 +30079,7 @@ sub_8066AC0: ldr r0, _08066AF4 b _08066B10 .align 2, 0 -_08066AF0: .4byte gUnknown_203B460 +_08066AF0: .4byte gTeamInventory_203B460 _08066AF4: .4byte gUnknown_80F8D60 _08066AF8: ldrb r1, [r5] @@ -30123,7 +30123,7 @@ _08066B24: strb r4, [r5, 0x1] strb r4, [r5] mov r0, sp - bl sub_8091290 + bl AddItemToInventory ldr r0, _08066BC4 bl PlaySoundEffect ldr r0, _08066BC8 @@ -30420,7 +30420,7 @@ _08066DC4: strb r6, [r5, 0x2] strb r6, [r5, 0x1] strb r6, [r5] - bl sub_80910B4 + bl FillInventoryGaps ldr r0, _08066E00 bl PlaySoundEffect ldr r0, _08066E04 @@ -30596,9 +30596,9 @@ _08066F30: b _08066F46 _08066F40: mov r0, sp - bl sub_8091290 + bl AddItemToInventory _08066F46: - bl sub_80910B4 + bl FillInventoryGaps ldr r4, _08066F90 add r1, sp, 0x4 adds r0, r4, 0 @@ -30776,9 +30776,9 @@ _080670B4: b _080670CA _080670C4: add r0, sp, 0x4 - bl sub_8091290 + bl AddItemToInventory _080670CA: - bl sub_80910B4 + bl FillInventoryGaps ldr r0, _08067100 bl PlaySoundEffect ldr r0, _08067104 @@ -31008,7 +31008,7 @@ _080672A8: strb r0, [r4, 0x2] strb r0, [r4, 0x1] strb r0, [r4] - bl sub_80910B4 + bl FillInventoryGaps b _080672F6 .align 2, 0 _080672C0: .4byte 0xffffff00 @@ -32570,7 +32570,7 @@ sub_8067F00: movs r0, 0xC movs r1, 0 movs r3, 0 - bl sub_8014FF0 + bl xxx_format_and_draw movs r1, 0 mov r10, r1 b _08067FF6 @@ -32633,7 +32633,7 @@ _08067FA4: movs r0, 0x7 mov r1, r8 movs r3, 0 - bl sub_8014FF0 + bl xxx_format_and_draw b _08067FE6 .align 2, 0 _08067FCC: .4byte gUnknown_202DE58 @@ -32645,7 +32645,7 @@ _08067FD8: movs r0, 0x7 mov r1, r8 movs r3, 0 - bl sub_8014FF0 + bl xxx_format_and_draw _08067FE6: movs r2, 0x1 add r10, r2 @@ -32677,7 +32677,7 @@ _08068000: movs r0, 0x8 movs r1, 0x2 movs r3, 0x1 - bl sub_8014FF0 + bl xxx_format_and_draw b _0806804C .align 2, 0 _08068028: .4byte gUnknown_8106E48 @@ -32694,7 +32694,7 @@ _08068034: movs r0, 0x8 movs r1, 0x2 movs r3, 0x1 - bl sub_8014FF0 + bl xxx_format_and_draw _0806804C: movs r0, 0x1 bl sub_80073E0 @@ -34220,8 +34220,8 @@ _08068C06: cmp r0, 0x69 bne _08068C50 adds r0, r4, 0 - bl sub_80915D4 - bl sub_80913A0 + bl GetMoneyValue + bl AddToTeamMoney strb r5, [r4, 0x2] strb r5, [r4, 0x1] strb r5, [r4] @@ -44950,7 +44950,7 @@ _0806DEC8: bl sub_807A5D0 b _0806DEF2 .align 2, 0 -_0806DED4: .4byte gUnknown_203B460 +_0806DED4: .4byte gTeamInventory_203B460 _0806DED8: .4byte gUnknown_203B418 _0806DEDC: .4byte 0x00000679 _0806DEE0: .4byte 0x00000676 diff --git a/asm/code_807001C.s b/asm/code_807001C.s index 71cd91a..52b13ab 100644 --- a/asm/code_807001C.s +++ b/asm/code_807001C.s @@ -7475,7 +7475,7 @@ _080738A4: bl sub_8044C94 b _080738CE .align 2, 0 -_080738C0: .4byte gUnknown_203B460 +_080738C0: .4byte gTeamInventory_203B460 _080738C4: adds r0, r6, 0 adds r0, 0x44 @@ -8170,8 +8170,8 @@ _08073DF4: bl PlaySoundEffect _08073DFC: adds r0, r5, 0 - bl sub_80915D4 - bl sub_80913A0 + bl GetMoneyValue + bl AddToTeamMoney ldr r0, _08073E1C adds r1, r5, 0 bl sub_8045BF8 @@ -8219,7 +8219,7 @@ _08073E48: .align 2, 0 _08073E64: .4byte gUnknown_203B418 _08073E68: .4byte 0x0000065b -_08073E6C: .4byte gUnknown_203B460 +_08073E6C: .4byte gTeamInventory_203B460 _08073E70: mov r0, r10 adds r0, 0x60 @@ -8454,7 +8454,7 @@ _0807402C: .4byte gUnknown_202DE58 _08074030: .4byte gUnknown_80F9018 _08074034: adds r0, r5, 0 - bl sub_8091290 + bl AddItemToInventory lsls r0, 24 cmp r0, 0 beq _08074060 @@ -30546,7 +30546,7 @@ _0807F04E: ldr r0, [r4] adds r0, r5 ldr r0, [r0] - bl sub_80913A0 + bl AddToTeamMoney ldr r0, [r4] ldr r2, _0807F17C adds r1, r0, r2 @@ -30616,7 +30616,7 @@ _0807F09A: lsrs r0, 16 lsls r0, 24 lsrs r0, 24 - bl sub_80914E4 + bl CanSellItem lsls r0, 24 add r3, sp, 0x8 cmp r0, 0 @@ -30761,14 +30761,14 @@ _0807F204: movs r0, 0x2 b _0807F31C .align 2, 0 -_0807F224: .4byte gUnknown_203B460 +_0807F224: .4byte gTeamInventory_203B460 _0807F228: .4byte gUnknown_80FE520 _0807F22C: movs r0, 0xA6 lsls r0, 1 bl PlaySoundEffect negs r0, r4 - bl sub_80913A0 + bl AddToTeamMoney movs r6, 0 _0807F23C: movs r5, 0 @@ -30793,7 +30793,7 @@ _0807F240: bl sub_8045108 adds r4, r0, 0 ldrb r0, [r4, 0x2] - bl sub_80914E4 + bl CanSellItem lsls r0, 24 cmp r0, 0 beq _0807F27E @@ -30820,7 +30820,7 @@ _0807F28C: cmp r0, 0 beq _0807F2B2 ldrb r0, [r4, 0x2] - bl sub_80914E4 + bl CanSellItem lsls r0, 24 cmp r0, 0 beq _0807F2B2 @@ -30855,7 +30855,7 @@ _0807F2BA: cmp r0, 0 beq _0807F2F8 ldrb r0, [r4, 0x2] - bl sub_80914E4 + bl CanSellItem lsls r0, 24 cmp r0, 0 beq _0807F2F8 @@ -30888,7 +30888,7 @@ _0807F31C: pop {r1} bx r1 .align 2, 0 -_0807F324: .4byte gUnknown_203B460 +_0807F324: .4byte gTeamInventory_203B460 _0807F328: .4byte gUnknown_203B418 _0807F32C: .4byte 0x000135cc _0807F330: .4byte 0x00000694 @@ -31014,7 +31014,7 @@ _0807F41C: .4byte gUnknown_203B418 _0807F420: .4byte 0x0000066e _0807F424: .4byte 0x0000066f _0807F428: .4byte gUnknown_80FE4B8 -_0807F42C: .4byte gUnknown_203B460 +_0807F42C: .4byte gTeamInventory_203B460 _0807F430: .4byte 0x000135cc _0807F434: .4byte 0x00000694 _0807F438: .4byte 0x0000068c @@ -32841,7 +32841,7 @@ _08080290: cmp r0, 0 beq _080802C2 ldrb r0, [r2, 0x2] - bl sub_8091544 + bl IsNotSpecialItem lsls r0, 24 cmp r0, 0 beq _080802C2 @@ -32870,7 +32870,7 @@ _080802C8: mov r0, r8 adds r0, 0x62 ldrb r0, [r0] - bl sub_8091544 + bl IsNotSpecialItem lsls r0, 24 cmp r0, 0 beq _080802FA @@ -32896,7 +32896,7 @@ _08080300: bl sub_80522F4 b _0808034A .align 2, 0 -_0808030C: .4byte gUnknown_203B460 +_0808030C: .4byte gTeamInventory_203B460 _08080310: .4byte gUnknown_80FDC40 _08080314: adds r0, r6, 0 @@ -33137,7 +33137,7 @@ _080804B6: ldr r0, _080804C8 b _080804D4 .align 2, 0 -_080804C0: .4byte gUnknown_203B460 +_080804C0: .4byte gTeamInventory_203B460 _080804C4: .4byte gUnknown_80F4E0E _080804C8: .4byte gUnknown_80FD788 _080804CC: @@ -33888,7 +33888,7 @@ sub_8080A5C: str r0, [sp, 0x8] movs r0, 0 strb r0, [r2] - bl sub_80910B4 + bl FillInventoryGaps movs r1, 0xC8 lsls r1, 1 adds r0, r4, 0 @@ -41223,7 +41223,7 @@ _080844FC: .4byte gUnknown_203B418 _08084500: .4byte 0x0000068a _08084504: .4byte gUnknown_80FA32C _08084508: .4byte gUnknown_202DE58 -_0808450C: .4byte gUnknown_203B460 +_0808450C: .4byte gTeamInventory_203B460 _08084510: .4byte gUnknown_80FA448 _08084514: lsls r1, r3, 2 @@ -41233,7 +41233,7 @@ _08084514: strb r0, [r1, 0x2] strb r0, [r1, 0x1] strb r0, [r1] - bl sub_80910B4 + bl FillInventoryGaps ldr r0, _08084538 ldr r1, [r0] movs r0, 0 @@ -44550,7 +44550,7 @@ _08086104: movs r0, 0x1 b _0808611C .align 2, 0 -_08086108: .4byte gUnknown_203B460 +_08086108: .4byte gTeamInventory_203B460 _0808610C: .4byte gUnknown_203B418 _08086110: .4byte 0x0001357c _08086114: diff --git a/asm/code_8090208.s b/asm/code_8090208.s index 56fef8f..19e7efa 100644 --- a/asm/code_8090208.s +++ b/asm/code_8090208.s @@ -132,7 +132,7 @@ sub_809034C: lsls r2, 24 lsrs r2, 24 str r2, [sp, 0xE8] - bl sub_8090A34 + bl GetNumberOfFilledInventorySlots str r0, [sp, 0xEC] movs r5, 0 movs r0, 0 @@ -395,7 +395,7 @@ _08090578: mov r2, r10 adds r0, r2, r6 ldrb r0, [r0] - bl sub_80911A4 + bl GetItemPossessionCount cmp r0, 0 beq _080905A6 _0809059E: @@ -685,7 +685,7 @@ _080907F0: .4byte gUnknown_8115DD4 _080907F4: .4byte gUnknown_8115E00 _080907F8: .4byte gUnknown_8115E28 _080907FC: .4byte gUnknown_8115E54 -_08090800: .4byte gUnknown_203B460 +_08090800: .4byte gTeamInventory_203B460 _08090804: .4byte gUnknown_8115E80 _08090808: .4byte gUnknown_8108F50 _0809080C: diff --git a/asm/code_8092334.s b/asm/code_8092334.s index 28ab356..2b93365 100644 --- a/asm/code_8092334.s +++ b/asm/code_8092334.s @@ -3167,7 +3167,7 @@ sub_8093DE8: adds r0, r4, 0 movs r1, 0 adds r3, r5, 0 - bl sub_8014FF0 + bl xxx_format_and_draw movs r3, 0x13 ldrh r1, [r6, 0x2] ldr r4, _08093E8C @@ -3187,7 +3187,7 @@ _08093E3A: movs r0, 0x4 adds r1, r3, 0 adds r3, r5, 0 - bl sub_8014FF0 + bl xxx_format_and_draw adds r0, r6, 0 adds r1, r5, 0 bl sub_8093E90 @@ -3243,14 +3243,14 @@ sub_8093E90: movs r0, 0x4 movs r1, 0x4A adds r3, r5, 0 - bl sub_8014FF0 + bl xxx_format_and_draw ldr r0, _08093F08 ldr r2, [r0] str r4, [sp] movs r0, 0x4 movs r1, 0x56 adds r3, r5, 0 - bl sub_8014FF0 + bl xxx_format_and_draw adds r0, r6, 0 bl sub_8092B00 lsls r0, 24 @@ -3261,7 +3261,7 @@ sub_8093E90: movs r0, 0x40 movs r1, 0x56 adds r3, r5, 0 - bl sub_8014FF0 + bl xxx_format_and_draw adds r0, r6, 0 bl sub_8092BC0 ldr r1, _08093F0C @@ -3273,7 +3273,7 @@ sub_8093E90: .align 2, 0 _08093F00: .4byte gAvailablePokemonNames _08093F04: .4byte gUnknown_810CF00 -_08093F08: .4byte gUnknown_810CF0C +_08093F08: .4byte gPtrTypeText _08093F0C: .4byte gUnknown_202DE30 thumb_func_end sub_8093E90 @@ -4189,7 +4189,7 @@ sub_8094558: movs r1, 0 adds r2, r4, 0 adds r3, r7, 0 - bl sub_8014FF0 + bl xxx_format_and_draw ldr r4, _080945D0 adds r1, r6, 0 adds r1, 0x18 @@ -4201,7 +4201,7 @@ sub_8094558: movs r0, 0x4 movs r1, 0x10 adds r3, r7, 0 - bl sub_8014FF0 + bl xxx_format_and_draw movs r5, 0x1A adds r0, r4, 0 adds r1, r6, 0 @@ -4251,7 +4251,7 @@ _080945EA: adds r1, r5, 0 add r2, sp, 0x4 adds r3, r7, 0 - bl sub_8014FF0 + bl xxx_format_and_draw adds r5, 0xA movs r1, 0x14 ldrsh r0, [r6, r1] @@ -4268,7 +4268,7 @@ _080945EA: adds r1, r5, 0 add r2, sp, 0x4 adds r3, r7, 0 - bl sub_8014FF0 + bl xxx_format_and_draw adds r5, 0x10 ldr r1, _08094660 ldr r0, [r6, 0x20] @@ -4286,7 +4286,7 @@ _080945EA: movs r0, 0x4 adds r1, r5, 0 adds r3, r7, 0 - bl sub_8014FF0 + bl xxx_format_and_draw b _0809467A .align 2, 0 _0809465C: .4byte gUnknown_8113870 @@ -4300,7 +4300,7 @@ _08094668: movs r0, 0x4 adds r1, r5, 0 adds r3, r7, 0 - bl sub_8014FF0 + bl xxx_format_and_draw _0809467A: adds r5, 0xA ldr r4, _080946D0 @@ -4315,7 +4315,7 @@ _0809467A: movs r0, 0x4 adds r1, r5, 0 adds r3, r7, 0 - bl sub_8014FF0 + bl xxx_format_and_draw adds r5, 0xA adds r0, r6, 0 adds r0, 0x26 @@ -4339,7 +4339,7 @@ _0809467A: movs r0, 0x4 adds r1, r5, 0 adds r3, r7, 0 - bl sub_8014FF0 + bl xxx_format_and_draw b _080946EC .align 2, 0 _080946CC: .4byte gUnknown_8113898 @@ -4353,7 +4353,7 @@ _080946DC: movs r0, 0x4 adds r1, r5, 0 adds r3, r7, 0 - bl sub_8014FF0 + bl xxx_format_and_draw _080946EC: adds r0, r6, 0 adds r0, 0x2D @@ -4371,7 +4371,7 @@ _080946EC: movs r0, 0x4 adds r1, r5, 0 adds r3, r7, 0 - bl sub_8014FF0 + bl xxx_format_and_draw b _08094730 .align 2, 0 _08094714: .4byte gUnknown_81138E4 @@ -4384,7 +4384,7 @@ _08094720: movs r0, 0x4 adds r1, r5, 0 adds r3, r7, 0 - bl sub_8014FF0 + bl xxx_format_and_draw _08094730: adds r5, 0xA ldr r2, _0809476C @@ -4410,7 +4410,7 @@ _08094730: movs r0, 0x4 adds r1, r5, 0 adds r3, r7, 0 - bl sub_8014FF0 + bl xxx_format_and_draw b _08094784 .align 2, 0 _08094768: .4byte gUnknown_8113900 @@ -4423,7 +4423,7 @@ _08094774: movs r0, 0x4 adds r1, r5, 0 adds r3, r7, 0 - bl sub_8014FF0 + bl xxx_format_and_draw _08094784: adds r0, r6, 0 adds r0, 0x2E @@ -4441,7 +4441,7 @@ _08094784: movs r0, 0x4 adds r1, r5, 0 adds r3, r7, 0 - bl sub_8014FF0 + bl xxx_format_and_draw b _080947C8 .align 2, 0 _080947AC: .4byte gUnknown_8113918 @@ -4454,7 +4454,7 @@ _080947B8: movs r0, 0x4 adds r1, r5, 0 adds r3, r7, 0 - bl sub_8014FF0 + bl xxx_format_and_draw _080947C8: adds r5, 0x10 adds r2, r6, 0 @@ -4485,7 +4485,7 @@ _080947F6: movs r0, 0x4 adds r1, r5, 0 adds r3, r7, 0 - bl sub_8014FF0 + bl xxx_format_and_draw adds r0, r7, 0 bl sub_80073E0 add sp, 0xCC diff --git a/asm/code_80958E8.s b/asm/code_80958E8.s index 896c0dd..40e970d 100644 --- a/asm/code_80958E8.s +++ b/asm/code_80958E8.s @@ -561,12 +561,12 @@ _08095F34: _08095F48: lsrs r4, 24 adds r0, r4, 0 - bl sub_8090A60 + bl IsThrowableItem lsls r0, 24 cmp r0, 0 bne _08095F6A adds r0, r4, 0 - bl sub_8091524 + bl IsNotMoneyOrUsedTMItem lsls r0, 24 cmp r0, 0 beq _08095F6A @@ -2244,7 +2244,7 @@ _08096B6A: bge _08096B56 b _08096B92 .align 2, 0 -_08096B74: .4byte gUnknown_203B460 +_08096B74: .4byte gTeamInventory_203B460 _08096B78: ldrb r0, [r3] cmp r0, 0x9 diff --git a/asm/code_8098BDC.s b/asm/code_8098BDC.s index fb72947..e068e60 100644 --- a/asm/code_8098BDC.s +++ b/asm/code_8098BDC.s @@ -6500,7 +6500,7 @@ _0809C2CA: adds r0, r1 ldrb r4, [r0, 0x2] adds r0, r4, 0 - bl sub_8091570 + bl IsEdibleItem lsls r0, 24 cmp r0, 0 beq _0809C30C @@ -6509,7 +6509,7 @@ _0809C2CA: movs r2, 0 bl sub_8090DC4 adds r0, r5, 0 - bl sub_80911F8 + bl ShiftItemsDownFrom ldr r0, [r6] movs r2, 0x86 lsls r2, 3 @@ -6517,7 +6517,7 @@ _0809C2CA: movs r1, 0x1 b _0809C318 .align 2, 0 -_0809C304: .4byte gUnknown_203B460 +_0809C304: .4byte gTeamInventory_203B460 _0809C308: .4byte gUnknown_202DE58 _0809C30C: ldr r0, [r6] @@ -7637,7 +7637,7 @@ sub_809CBA4: push {lr} lsls r0, 24 lsrs r0, 24 - bl sub_8091130 + bl FindItemInInventory cmp r0, 0 bge _0809CBB6 movs r0, 0 @@ -7693,7 +7693,7 @@ sub_809CBBC: .align 2, 0 _0809CC0C: .4byte gUnknown_81163E4 _0809CC10: .4byte gItemParametersData -_0809CC14: .4byte gUnknown_203B460 +_0809CC14: .4byte gTeamInventory_203B460 _0809CC18: .4byte 0x0001869f _0809CC1C: str r1, [r2] @@ -7709,7 +7709,7 @@ _0809CC20: adds r1, r4, 0 movs r2, 0 bl sub_8090E14 - bl sub_8090A34 + bl GetNumberOfFilledInventorySlots cmp r0, 0x13 ble _0809CC52 cmp r5, 0 @@ -7727,7 +7727,7 @@ _0809CC52: ldrb r0, [r4, 0x2] movs r1, 0 bl sub_809124C - bl sub_80910B4 + bl FillInventoryGaps _0809CC5E: cmp r7, 0 beq _0809CC80 @@ -7779,10 +7779,10 @@ sub_809CC90: b _0809CCD6 .align 2, 0 _0809CCBC: .4byte gUnknown_81163BC -_0809CCC0: .4byte gUnknown_203B460 +_0809CCC0: .4byte gTeamInventory_203B460 _0809CCC4: .4byte 0x0001869f _0809CCC8: - bl sub_8090A34 + bl GetNumberOfFilledInventorySlots cmp r0, 0x13 ble _0809CCD4 movs r0, 0x2 diff --git a/asm/code_809D148.s b/asm/code_809D148.s index 0527650..b571869 100644 --- a/asm/code_809D148.s +++ b/asm/code_809D148.s @@ -7038,12 +7038,12 @@ _080A0E3A: ldrh r0, [r0, 0x2] lsls r0, 24 lsrs r0, 24 - bl sub_8091130 + bl FindItemInInventory cmp r0, 0 bge _080A0E4E bl _0809EAE0 _080A0E4E: - bl sub_80911F8 + bl ShiftItemsDownFrom bl _0809EAE0 _080A0E56: add r0, sp, 0x8 @@ -8685,13 +8685,13 @@ _080A1C16: _080A1C28: .4byte gUnknown_81167BC _080A1C2C: .4byte gUnknown_2039D98 _080A1C30: - bl sub_8090A34 + bl GetNumberOfFilledInventorySlots cmp r0, 0x13 ble _080A1C70 ldr r0, _080A1C64 ldrb r4, [r0, 0x2] adds r0, r4, 0 - bl sub_8091524 + bl IsNotMoneyOrUsedTMItem lsls r0, 24 cmp r0, 0 bne _080A1C4A @@ -8713,14 +8713,14 @@ _080A1C5E: b _080A236A .align 2, 0 _080A1C64: .4byte gUnknown_81167E4 -_080A1C68: .4byte gUnknown_203B460 +_080A1C68: .4byte gTeamInventory_203B460 _080A1C6C: .4byte 0x000003e6 _080A1C70: ldr r0, _080A1C80 ldrb r0, [r0, 0x2] movs r1, 0 bl sub_809124C - bl sub_80910B4 + bl FillInventoryGaps b _080A236A .align 2, 0 _080A1C80: .4byte gUnknown_81167E4 @@ -9039,7 +9039,7 @@ _080A1EE8: bne _080A1EBE _080A1F28: ldr r0, _080A1F38 - bl sub_80913A0 + bl AddToTeamMoney b _080A236A .align 2, 0 _080A1F30: .4byte gUnknown_202DE58 @@ -9127,12 +9127,12 @@ _080A1FDA: ldr r7, _080A2010 movs r5, 0x2 _080A1FE0: - bl sub_8090A34 + bl GetNumberOfFilledInventorySlots cmp r0, 0x13 ble _080A2018 ldrb r4, [r6, 0x2] adds r0, r4, 0 - bl sub_8091524 + bl IsNotMoneyOrUsedTMItem lsls r0, 24 cmp r0, 0 beq _080A2024 @@ -9150,12 +9150,12 @@ _080A1FE0: .align 2, 0 _080A200C: .4byte gUnknown_8116844 _080A2010: .4byte 0x000003e6 -_080A2014: .4byte gUnknown_203B460 +_080A2014: .4byte gTeamInventory_203B460 _080A2018: ldrb r0, [r6, 0x2] movs r1, 0 bl sub_809124C - bl sub_80910B4 + bl FillInventoryGaps _080A2024: subs r5, 0x1 cmp r5, 0 diff --git a/asm/event_flag.s b/asm/event_flag.s index 1affa18..6777a5b 100644 --- a/asm/event_flag.s +++ b/asm/event_flag.s @@ -487,7 +487,7 @@ _08001754: lsls r1, 2 b _0800176C .align 2, 0 -_08001760: .4byte gUnknown_203B460 +_08001760: .4byte gTeamInventory_203B460 _08001764: ldr r0, _08001774 ldr r0, [r0] @@ -498,7 +498,7 @@ _0800176C: ldr r0, [r0] b _0800177A .align 2, 0 -_08001774: .4byte gUnknown_203B460 +_08001774: .4byte gTeamInventory_203B460 _08001778: movs r0, 0 _0800177A: @@ -652,7 +652,7 @@ _080018A4: ldr r0, [r0] b _080018CE .align 2, 0 -_080018B4: .4byte gUnknown_203B460 +_080018B4: .4byte gTeamInventory_203B460 _080018B8: ldr r0, _080018C8 ldr r0, [r0] @@ -662,7 +662,7 @@ _080018B8: ldr r0, [r0] b _080018CE .align 2, 0 -_080018C8: .4byte gUnknown_203B460 +_080018C8: .4byte gTeamInventory_203B460 _080018CC: movs r0, 0 _080018CE: @@ -757,7 +757,7 @@ _08001972: adds r0, r1 b _0800198E .align 2, 0 -_08001980: .4byte gUnknown_203B460 +_08001980: .4byte gTeamInventory_203B460 _08001984: ldr r0, _08001998 ldr r0, [r0] @@ -772,7 +772,7 @@ _08001990: pop {r0} bx r0 .align 2, 0 -_08001998: .4byte gUnknown_203B460 +_08001998: .4byte gTeamInventory_203B460 thumb_func_end sub_80018D8 thumb_func_start sub_800199C @@ -871,7 +871,7 @@ _08001A4E: lsls r1, 2 b _08001A64 .align 2, 0 -_08001A58: .4byte gUnknown_203B460 +_08001A58: .4byte gTeamInventory_203B460 _08001A5C: ldr r0, _08001A70 ldr r0, [r0] @@ -886,7 +886,7 @@ _08001A68: pop {r0} bx r0 .align 2, 0 -_08001A70: .4byte gUnknown_203B460 +_08001A70: .4byte gTeamInventory_203B460 thumb_func_end sub_800199C thumb_func_start sub_8001A74 @@ -1400,7 +1400,7 @@ _08001E3E: movs r1, 0x1 bl sub_80973A8 movs r0, 0xE7 - bl sub_8091130 + bl FindItemInInventory movs r1, 0x1 negs r1, r1 cmp r0, r1 @@ -1499,7 +1499,7 @@ _08001F06: bl ScenarioCalc _08001F20: movs r0, 0xE2 - bl sub_8091130 + bl FindItemInInventory movs r1, 0x1 negs r1, r1 cmp r0, r1 @@ -1698,7 +1698,7 @@ _080020D4: pop {r0} bx r0 .align 2, 0 -_080020DC: .4byte gUnknown_203B460 +_080020DC: .4byte gTeamInventory_203B460 _080020E0: .4byte 0x0000021e _080020E4: .4byte 0x00000113 thumb_func_end sub_8001D88 diff --git a/asm/felicity_bank.s b/asm/felicity_bank.s index c60b295..7711bc9 100644 --- a/asm/felicity_bank.s +++ b/asm/felicity_bank.s @@ -93,7 +93,7 @@ _080165B4: b _08016632 .align 2, 0 _080165FC: .4byte gUnknown_203B204 -_08016600: .4byte gUnknown_203B460 +_08016600: .4byte gTeamInventory_203B460 _08016604: .4byte gFelicityDialogue _08016608: ldr r0, _08016648 @@ -168,7 +168,7 @@ _08016668: ldr r2, [r1] b _08016844 .align 2, 0 -_08016698: .4byte gUnknown_203B460 +_08016698: .4byte gTeamInventory_203B460 _0801669C: .4byte gFelicityDialogue _080166A0: ldr r0, _080166BC @@ -221,7 +221,7 @@ _080166DC: adds r2, 0x1C b _0801683C .align 2, 0 -_08016700: .4byte gUnknown_203B460 +_08016700: .4byte gTeamInventory_203B460 _08016704: .4byte gFelicityDialogue _08016708: movs r5, 0x99 @@ -301,7 +301,7 @@ _0801676E: movs r0, 0x1 b _080168AE .align 2, 0 -_080167A0: .4byte gUnknown_203B460 +_080167A0: .4byte gTeamInventory_203B460 _080167A4: .4byte 0x0098967f _080167A8: ldr r3, [r2] @@ -341,7 +341,7 @@ _080167CC: adds r2, 0x30 b _0801683C .align 2, 0 -_080167F4: .4byte gUnknown_203B460 +_080167F4: .4byte gTeamInventory_203B460 _080167F8: .4byte 0x0001869e _080167FC: .4byte gFelicityDialogue _08016800: @@ -439,7 +439,7 @@ _080168B2: bl CreateFelicityMoneySavingsHeader b _080168EC .align 2, 0 -_080168BC: .4byte gUnknown_203B460 +_080168BC: .4byte gTeamInventory_203B460 _080168C0: .4byte 0x0001869f _080168C4: ldr r3, [r2] diff --git a/asm/friend_area_action_menu.s b/asm/friend_area_action_menu.s index 998bb5c..f984e29 100644 --- a/asm/friend_area_action_menu.s +++ b/asm/friend_area_action_menu.s @@ -142,7 +142,7 @@ _08027552: adds r2, r3 movs r0, 0xA str r0, [r2] - bl sub_8090A34 + bl GetNumberOfFilledInventorySlots cmp r0, 0 bne _08027588 ldr r0, [r4] @@ -165,7 +165,7 @@ _08027588: adds r2, r3 movs r0, 0xB str r0, [r2] - bl sub_8090A34 + bl GetNumberOfFilledInventorySlots cmp r0, 0x13 bgt _080275AE ldr r0, [r4] @@ -320,7 +320,7 @@ sub_80276A8: adds r1, r2, r3 movs r0, 0xA str r0, [r1] - bl sub_8090A34 + bl GetNumberOfFilledInventorySlots cmp r0, 0 bne _080276E4 ldr r0, [r5] @@ -697,7 +697,7 @@ _080279D8: adds r0, 0x14 bl sub_8091274 _080279F0: - bl sub_80910B4 + bl FillInventoryGaps ldr r0, [r4] movs r1, 0 strb r1, [r0, 0x14] diff --git a/asm/friend_list_menu.s b/asm/friend_list_menu.s index 46903a6..d2e6283 100644 --- a/asm/friend_list_menu.s +++ b/asm/friend_list_menu.s @@ -334,7 +334,7 @@ _0801F074: b _0801F12E .align 2, 0 _0801F0C8: .4byte gUnknown_203B270 -_0801F0CC: .4byte gUnknown_203B460 +_0801F0CC: .4byte gTeamInventory_203B460 _0801F0D0: ldr r0, _0801F0E0 ldr r1, [r0] @@ -599,7 +599,7 @@ sub_801F280: str r0, [sp] movs r0, 0xC movs r1, 0 - bl sub_8014FF0 + bl xxx_format_and_draw movs r7, 0 ldr r0, [r4] movs r1, 0x36 @@ -691,7 +691,7 @@ _0801F372: adds r0, r4, 0 adds r1, r6, 0 ldr r2, _0801F3F4 - bl sub_8014FF0 + bl xxx_format_and_draw _0801F386: adds r7, 0x1 mov r1, r8 @@ -728,7 +728,7 @@ _0801F394: str r0, [sp] movs r0, 0x8 movs r1, 0 - bl sub_8014FF0 + bl xxx_format_and_draw ldr r0, [r4] ldr r0, [r0, 0x54] bl sub_80073E0 @@ -1535,7 +1535,7 @@ _0801F9F0: str r4, [sp] movs r0, 0x10 movs r1, 0 - bl sub_8014FF0 + bl xxx_format_and_draw ldr r3, [r5] ldr r1, [r3, 0xC] lsls r1, 2 @@ -1548,7 +1548,7 @@ _0801F9F0: str r4, [sp] movs r0, 0x4 movs r1, 0x10 - bl sub_8014FF0 + bl xxx_format_and_draw ldr r0, [r5] ldr r0, [r0, 0x5C] bl sub_80073E0 @@ -1922,7 +1922,7 @@ _0801FD68: movs r0, 0x3 b _0801FD76 .align 2, 0 -_0801FD6C: .4byte gUnknown_203B460 +_0801FD6C: .4byte gTeamInventory_203B460 _0801FD70: bl sub_8021130 _0801FD74: @@ -4213,7 +4213,7 @@ _08020FB8: bl sub_801FDA8 b _080210BE .align 2, 0 -_08020FD8: .4byte gUnknown_203B460 +_08020FD8: .4byte gTeamInventory_203B460 _08020FDC: ldr r4, _08020FFC ldr r1, [r4] @@ -4599,7 +4599,7 @@ _080212BC: bl PlayMenuSoundEffect b _080212F2 .align 2, 0 -_080212E8: .4byte gUnknown_203B460 +_080212E8: .4byte gTeamInventory_203B460 _080212EC: movs r0, 0 bl PlayMenuSoundEffect @@ -4915,7 +4915,7 @@ _08021502: .align 2, 0 _08021568: .4byte gUnknown_203B280 _0802156C: .4byte gUnknown_80DC494 -_08021570: .4byte gUnknown_203B460 +_08021570: .4byte gTeamInventory_203B460 _08021574: mov r0, r10 ldr r1, _08021598 @@ -6907,7 +6907,7 @@ _080224F8: bl sub_8021D44 b _08022532 .align 2, 0 -_08022524: .4byte gUnknown_203B460 +_08022524: .4byte gTeamInventory_203B460 _08022528: .4byte gUnknown_203B290 _0802252C: movs r0, 0xA @@ -7034,7 +7034,7 @@ _08022612: bl sub_8021D44 b _0802265E .align 2, 0 -_0802262C: .4byte gUnknown_203B460 +_0802262C: .4byte gTeamInventory_203B460 _08022630: ldr r0, _08022644 ldr r0, [r0] @@ -7295,7 +7295,7 @@ _08022820: adds r0, r4, 0 adds r1, r5, 0 bl strcpy - bl sub_8090A34 + bl GetNumberOfFilledInventorySlots cmp r0, 0 bne _08022850 movs r0, 0x12 @@ -8097,7 +8097,7 @@ _08022E94: b _08022EEE .align 2, 0 _08022EB4: .4byte gUnknown_203B294 -_08022EB8: .4byte gUnknown_203B460 +_08022EB8: .4byte gTeamInventory_203B460 _08022EBC: bl sub_801A8AC ldr r1, _08022EE0 @@ -8116,7 +8116,7 @@ _08022EBC: b _08022EEE .align 2, 0 _08022EE0: .4byte gUnknown_203B294 -_08022EE4: .4byte gUnknown_203B460 +_08022EE4: .4byte gTeamInventory_203B460 _08022EE8: movs r0, 0x16 bl sub_8022924 @@ -8224,7 +8224,7 @@ _08022F68: beq _08022FD0 ldr r0, [r4] ldr r0, [r0, 0x4C] - bl sub_80911F8 + bl ShiftItemsDownFrom _08022FD0: movs r0, 0 bl sub_8099690 @@ -8242,7 +8242,7 @@ _08022FD0: .align 2, 0 _08022FEC: .4byte gUnknown_203B294 _08022FF0: .4byte gUnknown_202DE58 -_08022FF4: .4byte gUnknown_203B460 +_08022FF4: .4byte gTeamInventory_203B460 _08022FF8: .4byte _08022FFC .align 2, 0 _08022FFC: @@ -8339,8 +8339,8 @@ _080230B0: _080230B8: ldr r0, [r4] ldr r0, [r0, 0x4C] - bl sub_80911F8 - bl sub_8090A34 + bl ShiftItemsDownFrom + bl GetNumberOfFilledInventorySlots cmp r0, 0 bne _080230DA movs r0, 0 @@ -11772,15 +11772,15 @@ _08024B74: ldr r0, [r1, 0x14] cmp r0, 0x14 beq _08024BCA - bl sub_8091234 + bl ClearItemSlotAt _08024BCA: ldr r0, [r5] ldr r0, [r0, 0x18] cmp r0, 0x14 beq _08024BD6 - bl sub_8091234 + bl ClearItemSlotAt _08024BD6: - bl sub_80910B4 + bl FillInventoryGaps ldr r0, _08024C14 bl sub_801199C movs r0, 0xD2 @@ -12230,7 +12230,7 @@ _08024F36: .align 2, 0 _08024F48: .4byte gUnknown_203B2B0 _08024F4C: - bl sub_8090A34 + bl GetNumberOfFilledInventorySlots cmp r0, 0 bne _08024F5C movs r0, 0xF @@ -12283,7 +12283,7 @@ _08024FA6: bl sub_80247EC b _08024FCC _08024FAE: - bl sub_8090A34 + bl GetNumberOfFilledInventorySlots cmp r0, 0x1 bgt _08024FBE movs r0, 0x10 @@ -12336,7 +12336,7 @@ _08024FF0: b _08025052 .align 2, 0 _08025014: .4byte gUnknown_203B2B0 -_08025018: .4byte gUnknown_203B460 +_08025018: .4byte gTeamInventory_203B460 _0802501C: bl sub_801A8AC ldr r1, _08025040 @@ -12354,7 +12354,7 @@ _0802501C: b _08025052 .align 2, 0 _08025040: .4byte gUnknown_203B2B0 -_08025044: .4byte gUnknown_203B460 +_08025044: .4byte gTeamInventory_203B460 _08025048: bl sub_801A928 movs r0, 0x5 @@ -12401,7 +12401,7 @@ _08025074: b _080250E6 .align 2, 0 _080250A0: .4byte gUnknown_203B2B0 -_080250A4: .4byte gUnknown_203B460 +_080250A4: .4byte gTeamInventory_203B460 _080250A8: movs r0, 0x2 bl PlayMenuSoundEffect @@ -12423,7 +12423,7 @@ _080250B0: b _080250E6 .align 2, 0 _080250D4: .4byte gUnknown_203B2B0 -_080250D8: .4byte gUnknown_203B460 +_080250D8: .4byte gTeamInventory_203B460 _080250DC: bl sub_801A928 movs r0, 0xA @@ -12651,7 +12651,7 @@ _08025276: movs r0, 0 b _08025292 .align 2, 0 -_08025284: .4byte gUnknown_203B460 +_08025284: .4byte gTeamInventory_203B460 _08025288: ldr r0, _080252B0 ldr r0, [r0] @@ -12673,7 +12673,7 @@ _08025292: pop {r0} bx r0 .align 2, 0 -_080252B0: .4byte gUnknown_203B460 +_080252B0: .4byte gTeamInventory_203B460 _080252B4: .4byte gUnknown_203B2B0 thumb_func_end sub_8025254 @@ -13260,7 +13260,7 @@ sub_8025728: adds r1, 0x4 movs r0, 0xA str r0, [r1] - bl sub_8090A34 + bl GetNumberOfFilledInventorySlots cmp r0, 0 bne _08025774 ldr r0, [r5] @@ -13279,7 +13279,7 @@ _08025774: adds r1, 0xD4 movs r0, 0xB str r0, [r1] - bl sub_8090A34 + bl GetNumberOfFilledInventorySlots cmp r0, 0x13 bgt _08025796 ldr r0, [r5] @@ -13498,7 +13498,7 @@ sub_802591C: adds r1, 0xCC movs r0, 0xA str r0, [r1] - bl sub_8090A34 + bl GetNumberOfFilledInventorySlots cmp r0, 0 bne _08025952 ldr r0, [r5] @@ -13741,7 +13741,7 @@ _08025B28: adds r0, 0x18 bl sub_8091274 _08025B40: - bl sub_80910B4 + bl FillInventoryGaps ldr r0, [r4] movs r1, 0 strb r1, [r0, 0x18] @@ -13878,7 +13878,7 @@ _08025C34: b _08025CAE .align 2, 0 _08025C60: .4byte gUnknown_203B2B4 -_08025C64: .4byte gUnknown_203B460 +_08025C64: .4byte gTeamInventory_203B460 _08025C68: bl sub_801A8AC ldr r4, _08025C9C @@ -13904,7 +13904,7 @@ _08025C68: b _08025CAE .align 2, 0 _08025C9C: .4byte gUnknown_203B2B4 -_08025CA0: .4byte gUnknown_203B460 +_08025CA0: .4byte gTeamInventory_203B460 _08025CA4: bl sub_801A928 movs r0, 0x2 @@ -13958,8 +13958,8 @@ _08025CF8: ldr r5, _08025D6C ldr r0, [r5] ldr r0, [r0, 0x10] - bl sub_80911F8 - bl sub_80910B4 + bl ShiftItemsDownFrom + bl FillInventoryGaps ldr r1, [r5] ldrb r0, [r1, 0x18] cmp r0, 0 @@ -14162,7 +14162,7 @@ sub_8025E68: movs r0, 0x4 movs r1, 0x3 adds r3, r6, 0 - bl sub_8014FF0 + bl xxx_format_and_draw adds r0, r6, 0 bl sub_80073E0 add sp, 0x14 @@ -15053,7 +15053,7 @@ _080265EC: adds r2, r3 movs r0, 0xB str r0, [r2] - bl sub_8090A34 + bl GetNumberOfFilledInventorySlots cmp r0, 0 bne _0802661A ldr r0, [r4] @@ -15076,7 +15076,7 @@ _0802661A: adds r2, r3 movs r0, 0xC str r0, [r2] - bl sub_8090A34 + bl GetNumberOfFilledInventorySlots cmp r0, 0x13 bgt _08026640 ldr r0, [r4] @@ -15271,7 +15271,7 @@ sub_802678C: adds r1, r2, r3 movs r0, 0xB str r0, [r1] - bl sub_8090A34 + bl GetNumberOfFilledInventorySlots cmp r0, 0 bne _080267C8 ldr r0, [r5] @@ -15567,7 +15567,7 @@ _08026A10: adds r0, 0x14 bl sub_8091274 _08026A28: - bl sub_80910B4 + bl FillInventoryGaps ldr r0, [r4] movs r1, 0 strb r1, [r0, 0x14] @@ -15781,7 +15781,7 @@ _08026B94: b _08026C0E .align 2, 0 _08026BC0: .4byte gUnknown_203B2B8 -_08026BC4: .4byte gUnknown_203B460 +_08026BC4: .4byte gTeamInventory_203B460 _08026BC8: bl sub_801A8AC ldr r4, _08026BFC @@ -15807,7 +15807,7 @@ _08026BC8: b _08026C0E .align 2, 0 _08026BFC: .4byte gUnknown_203B2B8 -_08026C00: .4byte gUnknown_203B460 +_08026C00: .4byte gTeamInventory_203B460 _08026C04: bl sub_801A928 movs r0, 0x2 @@ -15861,8 +15861,8 @@ _08026C58: ldr r5, _08026CCC ldr r0, [r5] ldr r0, [r0, 0xC] - bl sub_80911F8 - bl sub_80910B4 + bl ShiftItemsDownFrom + bl FillInventoryGaps ldr r1, [r5] ldrb r0, [r1, 0x14] cmp r0, 0 @@ -16045,7 +16045,7 @@ sub_8026DAC: movs r0, 0x4 movs r1, 0x3 adds r3, r6, 0 - bl sub_8014FF0 + bl xxx_format_and_draw adds r0, r6, 0 bl sub_80073E0 add sp, 0x14 @@ -16195,7 +16195,7 @@ sub_8026F04: movs r0, 0 b _08026F32 _08026F14: - bl sub_8090A34 + bl GetNumberOfFilledInventorySlots cmp r0, 0x13 bgt _08026F20 movs r0, 0x1 @@ -16223,12 +16223,12 @@ sub_8026F38: adds r4, r5, 0 adds r4, 0x28 ldrb r0, [r4] - bl sub_8091524 + bl IsNotMoneyOrUsedTMItem lsls r0, 24 cmp r0, 0 beq _08026F74 ldrb r0, [r4] - bl sub_8090A60 + bl IsThrowableItem lsls r0, 24 cmp r0, 0 beq _08026F80 @@ -16250,7 +16250,7 @@ _08026F74: movs r0, 0 b _08026F96 .align 2, 0 -_08026F78: .4byte gUnknown_203B460 +_08026F78: .4byte gTeamInventory_203B460 _08026F7C: .4byte 0x000003e7 _08026F80: ldr r0, _08026F9C @@ -16270,7 +16270,7 @@ _08026F96: pop {r1} bx r1 .align 2, 0 -_08026F9C: .4byte gUnknown_203B460 +_08026F9C: .4byte gTeamInventory_203B460 _08026FA0: .4byte 0x000003e6 thumb_func_end sub_8026F38 @@ -16296,7 +16296,7 @@ _08026FC4: ldr r0, [r4] adds r0, 0x14 bl sub_8091274 - bl sub_80910B4 + bl FillInventoryGaps ldr r0, [r4] movs r1, 0 strb r1, [r0, 0x14] @@ -16317,7 +16317,7 @@ _08026FF8: bl PlaySound ldr r0, [r4] ldrb r0, [r0, 0x14] - bl sub_8090A60 + bl IsThrowableItem lsls r0, 24 cmp r0, 0 beq _0802702C @@ -16334,7 +16334,7 @@ _08026FF8: b _0802703E .align 2, 0 _08027024: .4byte 0x0000014d -_08027028: .4byte gUnknown_203B460 +_08027028: .4byte gTeamInventory_203B460 _0802702C: ldr r0, _08027060 ldr r1, [r0] @@ -16362,7 +16362,7 @@ _0802703E: bl sub_8026074 b _0802706E .align 2, 0 -_08027060: .4byte gUnknown_203B460 +_08027060: .4byte gTeamInventory_203B460 _08027064: .4byte gUnknown_203B2B8 _08027068: movs r0, 0x19 diff --git a/asm/items.s b/asm/items.s index 639ee66..5587b92 100644 --- a/asm/items.s +++ b/asm/items.s @@ -72,7 +72,7 @@ _08090E90: bne _08090EB0 ldr r4, _08090EAC adds r0, r5, 0 - bl sub_80915D4 + bl GetMoneyValue adds r2, r0, 0 mov r0, sp adds r1, r4, 0 @@ -182,13 +182,13 @@ _08090F6C: bcc _08090F8A cmp r1, 0x2 bhi _08090F7E - bl sub_8090BE4 + bl GetStackBuyValue adds r1, r0, 0 b _08090F8C _08090F7E: cmp r1, 0x4 bhi _08090F8A - bl sub_8090C30 + bl GetStackSellValue adds r1, r0, 0 b _08090F8C _08090F8A: @@ -349,2170 +349,4 @@ _08091080: bx r1 thumb_func_end sub_8090FEC - thumb_func_start sub_80910B4 -sub_80910B4: - push {r4-r7,lr} - movs r2, 0 - movs r4, 0 - ldr r7, _080910C0 - movs r3, 0 - b _080910DA - .align 2, 0 -_080910C0: .4byte gUnknown_203B460 -_080910C4: - cmp r2, r4 - ble _080910D4 - ldr r0, [r7] - lsls r1, r4, 2 - adds r1, r0, r1 - adds r0, r3 - ldr r0, [r0] - str r0, [r1] -_080910D4: - adds r3, 0x4 - adds r2, 0x1 - adds r4, 0x1 -_080910DA: - cmp r2, 0x13 - bgt _08091106 - ldr r0, [r7] - adds r0, r3, r0 - ldrb r1, [r0] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - bne _08091106 - ldr r5, _0809112C - movs r6, 0x1 -_080910F0: - adds r3, 0x4 - adds r2, 0x1 - cmp r2, 0x13 - bgt _08091106 - ldr r0, [r5] - adds r0, r3, r0 - ldrb r1, [r0] - adds r0, r6, 0 - ands r0, r1 - cmp r0, 0 - beq _080910F0 -_08091106: - cmp r2, 0x14 - bne _080910C4 - cmp r4, 0x13 - bgt _08091124 - ldr r3, _0809112C - movs r2, 0 -_08091112: - lsls r1, r4, 2 - ldr r0, [r3] - adds r1, r0 - strb r2, [r1, 0x2] - strb r2, [r1, 0x1] - strb r2, [r1] - adds r4, 0x1 - cmp r4, 0x13 - ble _08091112 -_08091124: - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0809112C: .4byte gUnknown_203B460 - thumb_func_end sub_80910B4 - - thumb_func_start sub_8091130 -sub_8091130: - push {r4,r5,lr} - lsls r0, 24 - lsrs r4, r0, 24 - movs r3, 0 - ldr r0, _08091154 - ldr r2, [r0] - movs r5, 0x1 -_0809113E: - ldrb r1, [r2] - adds r0, r5, 0 - ands r0, r1 - cmp r0, 0 - beq _08091158 - ldrb r0, [r2, 0x2] - cmp r0, r4 - bne _08091158 - adds r0, r3, 0 - b _08091164 - .align 2, 0 -_08091154: .4byte gUnknown_203B460 -_08091158: - adds r2, 0x4 - adds r3, 0x1 - cmp r3, 0x13 - ble _0809113E - movs r0, 0x1 - negs r0, r0 -_08091164: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_8091130 - - thumb_func_start sub_809116C -sub_809116C: - push {r4-r6,lr} - lsls r0, 24 - lsrs r5, r0, 24 - movs r4, 0 - ldr r0, _080911A0 - ldr r2, [r0] - movs r6, 0x1 - movs r3, 0x13 -_0809117C: - ldrb r1, [r2] - adds r0, r6, 0 - ands r0, r1 - cmp r0, 0 - beq _0809118E - ldrb r0, [r2, 0x2] - cmp r0, r5 - bne _0809118E - adds r4, 0x1 -_0809118E: - adds r2, 0x4 - subs r3, 0x1 - cmp r3, 0 - bge _0809117C - adds r0, r4, 0 - pop {r4-r6} - pop {r1} - bx r1 - .align 2, 0 -_080911A0: .4byte gUnknown_203B460 - thumb_func_end sub_809116C - - thumb_func_start sub_80911A4 -sub_80911A4: - push {r4-r7,lr} - lsls r0, 24 - lsrs r5, r0, 24 - adds r0, r5, 0 - bl sub_809116C - adds r4, r0, 0 - movs r3, 0 - ldr r0, _080911F4 - ldr r7, [r0] - movs r6, 0x1 -_080911BA: - movs r0, 0x58 - muls r0, r3 - adds r2, r7, r0 - ldrh r1, [r2] - adds r0, r6, 0 - ands r0, r1 - cmp r0, 0 - beq _080911E2 - lsrs r0, r1, 1 - ands r0, r6 - cmp r0, 0 - beq _080911E2 - adds r0, r2, 0 - adds r0, 0x28 - ldrb r0, [r0] - cmp r0, 0 - beq _080911E2 - cmp r0, r5 - bne _080911E2 - adds r4, 0x1 -_080911E2: - adds r3, 0x1 - movs r0, 0xCE - lsls r0, 1 - cmp r3, r0 - ble _080911BA - adds r0, r4, 0 - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_080911F4: .4byte gRecruitedPokemonRef - thumb_func_end sub_80911A4 - - thumb_func_start sub_80911F8 -sub_80911F8: - push {r4,r5,lr} - adds r2, r0, 0 - ldr r4, _08091230 - cmp r2, 0x12 - bgt _0809121C - adds r5, r4, 0 - lsls r0, r2, 2 - adds r3, r0, 0x4 -_08091208: - ldr r0, [r5] - lsls r1, r2, 2 - adds r1, r0, r1 - adds r0, r3 - ldr r0, [r0] - str r0, [r1] - adds r3, 0x4 - adds r2, 0x1 - cmp r2, 0x12 - ble _08091208 -_0809121C: - ldr r0, [r4] - adds r0, 0x4E - movs r1, 0 - strb r1, [r0] - ldr r0, [r4] - adds r0, 0x4C - strb r1, [r0] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08091230: .4byte gUnknown_203B460 - thumb_func_end sub_80911F8 - - thumb_func_start sub_8091234 -sub_8091234: - ldr r3, _08091248 - ldr r1, [r3] - lsls r0, 2 - adds r1, r0 - movs r2, 0 - strb r2, [r1, 0x2] - ldr r1, [r3] - adds r1, r0 - strb r2, [r1] - bx lr - .align 2, 0 -_08091248: .4byte gUnknown_203B460 - thumb_func_end sub_8091234 - - thumb_func_start sub_809124C -sub_809124C: - push {lr} - sub sp, 0x4 - adds r3, r0, 0 - adds r2, r1, 0 - lsls r3, 24 - lsrs r3, 24 - lsls r2, 24 - lsrs r2, 24 - mov r0, sp - adds r1, r3, 0 - bl sub_8090A8C - mov r0, sp - bl sub_8091290 - lsls r0, 24 - lsrs r0, 24 - add sp, 0x4 - pop {r1} - bx r1 - thumb_func_end sub_809124C - - thumb_func_start sub_8091274 -sub_8091274: - push {lr} - sub sp, 0x4 - adds r1, r0, 0 - mov r0, sp - bl sub_8090B64 - mov r0, sp - bl sub_8091290 - lsls r0, 24 - lsrs r0, 24 - add sp, 0x4 - pop {r1} - bx r1 - thumb_func_end sub_8091274 - - thumb_func_start sub_8091290 -sub_8091290: - push {r4-r6,lr} - adds r4, r0, 0 - movs r3, 0 - ldr r5, _080912B4 - movs r6, 0x1 -_0809129A: - lsls r1, r3, 2 - ldr r0, [r5] - adds r2, r1, r0 - ldrb r1, [r2] - adds r0, r6, 0 - ands r0, r1 - cmp r0, 0 - bne _080912B8 - ldr r0, [r4] - str r0, [r2] - movs r0, 0 - b _080912C0 - .align 2, 0 -_080912B4: .4byte gUnknown_203B460 -_080912B8: - adds r3, 0x1 - cmp r3, 0x13 - ble _0809129A - movs r0, 0x1 -_080912C0: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_8091290 - - thumb_func_start sub_80912C8 -sub_80912C8: - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - movs r5, 0 - movs r6, 0 -_080912D6: - ldr r0, _0809139C - lsls r1, r5, 2 - ldr r0, [r0] - adds r4, r0, r1 - ldrb r1, [r4] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _080912FE - ldrb r0, [r4, 0x2] - cmp r0, 0x69 - bne _080912FE - adds r0, r4, 0 - bl sub_80915D4 - bl sub_80913A0 - strb r6, [r4, 0x2] - strb r6, [r4, 0x1] - strb r6, [r4] -_080912FE: - adds r5, 0x1 - cmp r5, 0x13 - ble _080912D6 - bl sub_80910B4 - movs r5, 0 -_0809130A: - movs r0, 0x1 - negs r0, r0 - mov r9, r0 - lsls r2, r5, 2 - ldr r1, _0809139C - mov r8, r1 - ldr r0, [r1] - adds r3, r2, r0 - ldrb r1, [r3] - movs r0, 0x1 - ands r0, r1 - mov r10, r2 - adds r7, r5, 0x1 - cmp r0, 0 - beq _08091382 - ldrb r0, [r3, 0x2] - bl GetItemOrder - adds r6, r0, 0 - adds r4, r7, 0 - cmp r7, 0x13 - bgt _08091368 -_08091336: - lsls r5, r4, 2 - mov r1, r8 - ldr r0, [r1] - adds r2, r5, r0 - ldrb r1, [r2] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _08091362 - ldrb r0, [r2, 0x2] - bl GetItemOrder - cmp r6, r0 - ble _08091362 - mov r9, r4 - mov r1, r8 - ldr r0, [r1] - adds r0, r5 - ldrb r0, [r0, 0x2] - bl GetItemOrder - adds r6, r0, 0 -_08091362: - adds r4, 0x1 - cmp r4, 0x13 - ble _08091336 -_08091368: - mov r4, r9 - cmp r4, 0 - blt _08091382 - ldr r0, _0809139C - ldr r1, [r0] - mov r0, r10 - adds r2, r1, r0 - ldr r3, [r2] - lsls r0, r4, 2 - adds r1, r0 - ldr r0, [r1] - str r0, [r2] - str r3, [r1] -_08091382: - adds r5, r7, 0 - cmp r5, 0x13 - ble _0809130A - bl sub_80910B4 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0809139C: .4byte gUnknown_203B460 - thumb_func_end sub_80912C8 - - thumb_func_start sub_80913A0 -sub_80913A0: - push {lr} - ldr r1, _080913C4 - ldr r1, [r1] - movs r3, 0x98 - lsls r3, 2 - adds r2, r1, r3 - ldr r1, [r2] - adds r1, r0 - str r1, [r2] - ldr r0, _080913C8 - cmp r1, r0 - bgt _080913BE - cmp r1, 0 - bge _080913C0 - movs r0, 0 -_080913BE: - str r0, [r2] -_080913C0: - pop {r0} - bx r0 - .align 2, 0 -_080913C4: .4byte gUnknown_203B460 -_080913C8: .4byte 0x0001869f - thumb_func_end sub_80913A0 - - thumb_func_start GetItemMove -GetItemMove: - lsls r0, 24 - ldr r1, _080913DC - ldr r1, [r1] - lsrs r0, 19 - adds r0, r1 - ldrh r0, [r0, 0x18] - bx lr - .align 2, 0 -_080913DC: .4byte gItemParametersData - thumb_func_end GetItemMove - - thumb_func_start sub_80913E0 -sub_80913E0: - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x5C - adds r6, r0, 0 - adds r5, r1, 0 - mov r8, r2 - ldrb r0, [r6, 0x2] - bl GetItemDescription - ldrb r1, [r6, 0x2] - add r0, sp, 0x4 - movs r2, 0 - bl sub_8090DC4 - ldrb r0, [r6, 0x2] - cmp r0, 0x7C - bne _08091414 - ldr r0, _080914D4 - ldrb r1, [r6, 0x1] - adds r1, 0x7D - lsls r1, 24 - lsrs r1, 24 - movs r2, 0 - bl sub_8090DC4 -_08091414: - adds r0, r5, 0 - bl sub_80073B8 - movs r7, 0 - str r7, [sp] - movs r0, 0x10 - movs r1, 0 - add r2, sp, 0x4 - adds r3, r5, 0 - bl sub_8014FF0 - ldrb r0, [r6, 0x2] - bl GetItemDescription - adds r2, r0, 0 - str r7, [sp] - movs r0, 0x8 - movs r1, 0x18 - adds r3, r5, 0 - bl sub_8014FF0 - ldrb r0, [r6, 0x2] - bl GetItemType - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x5 - bne _080914B6 - add r4, sp, 0x54 - ldrb r0, [r6, 0x2] - bl GetItemMove - adds r1, r0, 0 - lsls r1, 16 - lsrs r1, 16 - adds r0, r4, 0 - bl sub_8092A88 - movs r0, 0x7 - str r0, [sp] - adds r0, r5, 0 - movs r1, 0x4 - movs r2, 0x52 - movs r3, 0xC8 - bl sub_80078A4 - ldr r0, _080914D8 - ldr r2, [r0] - str r7, [sp] - movs r0, 0x4 - movs r1, 0x54 - adds r3, r5, 0 - bl sub_8014FF0 - adds r0, r4, 0 - bl sub_8092B00 - lsls r0, 24 - lsrs r0, 24 - bl GetUnformattedTypeString - adds r2, r0, 0 - str r7, [sp] - movs r0, 0x40 - movs r1, 0x54 - adds r3, r5, 0 - bl sub_8014FF0 - adds r0, r4, 0 - bl sub_8092BF4 - ldr r1, _080914DC - str r0, [r1] - ldr r0, _080914E0 - ldr r2, [r0] - str r7, [sp] - movs r0, 0x80 - movs r1, 0x54 - adds r3, r5, 0 - bl sub_8014FF0 -_080914B6: - adds r0, r5, 0 - bl sub_80073E0 - ldrb r0, [r6, 0x2] - bl GetItemDescription - mov r1, r8 - bl sub_8097DF0 - add sp, 0x5C - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_080914D4: .4byte gUnknown_202DE58 -_080914D8: .4byte gUnknown_810CF0C -_080914DC: .4byte gUnknown_202DE30 -_080914E0: .4byte gUnknown_8115970 - thumb_func_end sub_80913E0 - - thumb_func_start sub_80914E4 -sub_80914E4: - push {r4,lr} - lsls r0, 24 - lsrs r0, 24 - adds r4, r0, 0 - cmp r0, 0 - beq _0809151A - cmp r0, 0x69 - beq _0809151A - cmp r0, 0x79 - beq _0809151A - cmp r0, 0x77 - beq _0809151A - cmp r0, 0x78 - beq _0809151A - cmp r0, 0x7A - beq _0809151A - bl GetItemSellPrice - cmp r0, 0 - beq _0809151A - adds r0, r4, 0 - bl GetItemBuyPrice - cmp r0, 0 - beq _0809151A - movs r0, 0x1 - b _0809151C -_0809151A: - movs r0, 0 -_0809151C: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_80914E4 - - thumb_func_start sub_8091524 -sub_8091524: - push {lr} - lsls r0, 24 - lsrs r0, 24 - adds r1, r0, 0 - cmp r0, 0 - beq _0809153C - cmp r0, 0x69 - beq _0809153C - cmp r1, 0x7C - beq _0809153C - movs r0, 0x1 - b _0809153E -_0809153C: - movs r0, 0 -_0809153E: - pop {r1} - bx r1 - thumb_func_end sub_8091524 - - thumb_func_start sub_8091544 -sub_8091544: - push {lr} - lsls r0, 24 - lsrs r0, 24 - adds r1, r0, 0 - cmp r0, 0 - beq _08091568 - cmp r0, 0x69 - beq _08091568 - cmp r0, 0x79 - beq _08091568 - cmp r0, 0x77 - beq _08091568 - cmp r0, 0x78 - beq _08091568 - cmp r1, 0x7A - beq _08091568 - movs r0, 0x1 - b _0809156A -_08091568: - movs r0, 0 -_0809156A: - pop {r1} - bx r1 - thumb_func_end sub_8091544 - - thumb_func_start sub_8091570 -sub_8091570: - push {r4,lr} - lsls r0, 24 - lsrs r4, r0, 24 - adds r0, r4, 0 - bl GetItemType - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x2 - beq _08091596 - adds r0, r4, 0 - bl GetItemType - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x3 - beq _08091596 - movs r0, 0 - b _08091598 -_08091596: - movs r0, 0x1 -_08091598: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_8091570 - - thumb_func_start sub_80915A0 -sub_80915A0: - push {lr} - lsls r0, 24 - lsrs r0, 24 - adds r1, r0, 0 - cmp r0, 0xE0 - beq _080915CC - cmp r0, 0xE1 - beq _080915CC - cmp r0, 0xE2 - beq _080915CC - cmp r0, 0xE3 - beq _080915CC - cmp r0, 0xE4 - beq _080915CC - cmp r0, 0xE5 - beq _080915CC - cmp r0, 0xE6 - beq _080915CC - cmp r1, 0xE7 - beq _080915CC - movs r0, 0 - b _080915CE -_080915CC: - movs r0, 0x1 -_080915CE: - pop {r1} - bx r1 - thumb_func_end sub_80915A0 - - thumb_func_start sub_80915D4 -sub_80915D4: - ldr r1, _080915E0 - ldrb r0, [r0, 0x1] - lsls r0, 2 - adds r0, r1 - ldr r0, [r0] - bx lr - .align 2, 0 -_080915E0: .4byte gUnknown_810A3F0 - thumb_func_end sub_80915D4 - - thumb_func_start sub_80915E4 -sub_80915E4: - ldr r1, _080915F0 - ldrb r0, [r0, 0x1] - lsls r0, 2 - adds r0, r1 - ldr r0, [r0] - bx lr - .align 2, 0 -_080915F0: .4byte gUnknown_810A3F0 - thumb_func_end sub_80915E4 - - thumb_func_start sub_80915F4 -sub_80915F4: - push {r4-r7,lr} - mov r7, r8 - push {r7} - adds r6, r0, 0 - adds r7, r3, 0 - lsls r1, 24 - lsrs r5, r1, 24 - lsls r2, 24 - lsrs r2, 24 - mov r8, r2 - ldr r0, _080916B8 - strh r0, [r7] - movs r0, 0 - strh r0, [r7, 0x2] - adds r0, r5, 0 - bl sub_8091764 - lsls r0, 24 - cmp r0, 0 - bne _0809161E - b _08091756 -_0809161E: - movs r1, 0x8 - ldrsh r0, [r6, r1] - movs r1, 0 - bl GetPokemonType - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - movs r2, 0x8 - ldrsh r0, [r6, r2] - movs r1, 0x1 - bl GetPokemonType - lsls r0, 24 - lsrs r0, 24 - adds r2, r5, 0 - subs r2, 0x55 - ldr r5, _080916BC - lsls r2, 1 - lsls r1, r4, 3 - adds r1, r4 - lsls r1, 2 - adds r1, r2, r1 - adds r1, r5 - movs r4, 0 - ldrsh r3, [r1, r4] - lsls r1, r0, 3 - adds r1, r0 - lsls r1, 2 - adds r2, r1 - adds r2, r5 - movs r1, 0 - ldrsh r0, [r2, r1] - movs r2, 0x14 - ldrsh r1, [r6, r2] - adds r3, r0 - ldrh r4, [r6, 0x14] - adds r3, r4 - strh r3, [r6, 0x14] - movs r2, 0x14 - ldrsh r0, [r6, r2] - subs r1, r0, r1 - lsls r3, 16 - cmp r3, 0 - bgt _0809167C - movs r0, 0x1 - strh r0, [r6, 0x14] -_0809167C: - movs r4, 0x14 - ldrsh r0, [r6, r4] - ldr r2, _080916C0 - cmp r0, r2 - ble _08091688 - strh r2, [r6, 0x14] -_08091688: - movs r0, 0 - cmp r1, 0x8 - bgt _0809169C - movs r0, 0x1 - cmp r1, 0x4 - bgt _0809169C - movs r0, 0x3 - cmp r1, 0x2 - ble _0809169C - movs r0, 0x2 -_0809169C: - strh r0, [r7] - mov r1, r8 - cmp r1, 0 - bne _08091756 - cmp r0, 0 - bne _080916C4 - movs r0, 0x10 - bl RandomCapped - cmp r0, 0xA - bne _080916C4 - movs r0, 0xF - b _080916D2 - .align 2, 0 -_080916B8: .4byte 0x0000ffff -_080916BC: .4byte gUnknown_810A580 -_080916C0: .4byte 0x000003e7 -_080916C4: - movs r0, 0x4 - bl RandomCapped - ldr r1, _080916EC - lsls r0, 1 - adds r0, r1 - ldrh r0, [r0] -_080916D2: - strh r0, [r7, 0x2] - ldrh r1, [r7, 0x2] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _080916F6 - ldrb r0, [r6, 0x18] - cmp r0, 0xFE - bhi _080916F0 - adds r0, 0x1 - strb r0, [r6, 0x18] - b _080916F6 - .align 2, 0 -_080916EC: .4byte gUnknown_81097E0 -_080916F0: - ldr r0, _0809170C - ands r0, r1 - strh r0, [r7, 0x2] -_080916F6: - ldrh r1, [r7, 0x2] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _08091716 - ldrb r0, [r6, 0x19] - cmp r0, 0xFE - bhi _08091710 - adds r0, 0x1 - strb r0, [r6, 0x19] - b _08091716 - .align 2, 0 -_0809170C: .4byte 0x0000fffe -_08091710: - ldr r0, _0809172C - ands r0, r1 - strh r0, [r7, 0x2] -_08091716: - ldrh r1, [r7, 0x2] - movs r0, 0x4 - ands r0, r1 - cmp r0, 0 - beq _08091736 - ldrb r0, [r6, 0x1A] - cmp r0, 0xFE - bhi _08091730 - adds r0, 0x1 - strb r0, [r6, 0x1A] - b _08091736 - .align 2, 0 -_0809172C: .4byte 0x0000fffd -_08091730: - ldr r0, _0809174C - ands r0, r1 - strh r0, [r7, 0x2] -_08091736: - ldrh r1, [r7, 0x2] - movs r0, 0x8 - ands r0, r1 - cmp r0, 0 - beq _08091756 - ldrb r0, [r6, 0x1B] - cmp r0, 0xFE - bhi _08091750 - adds r0, 0x1 - strb r0, [r6, 0x1B] - b _08091756 - .align 2, 0 -_0809174C: .4byte 0x0000fffb -_08091750: - ldr r0, _08091760 - ands r0, r1 - strh r0, [r7, 0x2] -_08091756: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08091760: .4byte 0x0000fff7 - thumb_func_end sub_80915F4 - - thumb_func_start sub_8091764 -sub_8091764: - push {lr} - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x55 - bls _08091776 - cmp r0, 0x66 - bhi _08091776 - movs r0, 0x1 - b _08091778 -_08091776: - movs r0, 0 -_08091778: - pop {r1} - bx r1 - thumb_func_end sub_8091764 - - thumb_func_start sub_809177C -sub_809177C: - push {r4,lr} - movs r4, 0 -_08091780: - lsls r1, r4, 2 - ldr r0, _080917A4 - ldr r0, [r0] - adds r2, r1, r0 - ldrb r1, [r2] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _080917A8 - ldrb r0, [r2, 0x2] - bl sub_8091764 - lsls r0, 24 - cmp r0, 0 - beq _080917A8 - movs r0, 0x1 - b _080917B0 - .align 2, 0 -_080917A4: .4byte gUnknown_203B460 -_080917A8: - adds r4, 0x1 - cmp r4, 0x13 - ble _08091780 - movs r0, 0 -_080917B0: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_809177C - - thumb_func_start sub_80917B8 -sub_80917B8: - push {r4,lr} - adds r4, r0, 0 - ldrb r0, [r4, 0x2] - bl sub_8090A60 - lsls r0, 24 - cmp r0, 0 - beq _080917E0 - ldr r2, _080917DC - ldr r1, [r2] - ldrb r0, [r4, 0x2] - lsls r0, 1 - adds r1, 0x50 - adds r1, r0 - ldrh r0, [r1] - ldrb r3, [r4, 0x1] - adds r0, r3 - b _080917F0 - .align 2, 0 -_080917DC: .4byte gUnknown_203B460 -_080917E0: - ldr r2, _0809180C - ldr r1, [r2] - ldrb r0, [r4, 0x2] - lsls r0, 1 - adds r1, 0x50 - adds r1, r0 - ldrh r0, [r1] - adds r0, 0x1 -_080917F0: - strh r0, [r1] - ldr r0, [r2] - ldrb r1, [r4, 0x2] - lsls r1, 1 - adds r0, 0x50 - adds r2, r0, r1 - ldrh r0, [r2] - ldr r1, _08091810 - cmp r0, r1 - bls _08091806 - strh r1, [r2] -_08091806: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_0809180C: .4byte gUnknown_203B460 -_08091810: .4byte 0x000003e7 - thumb_func_end sub_80917B8 - - thumb_func_start sub_8091814 -sub_8091814: - push {lr} - movs r3, 0 - ldr r0, _0809183C - ldr r0, [r0] - movs r2, 0x8C - lsls r2, 2 - adds r1, r0, r2 - movs r2, 0x7 -_08091824: - ldrb r0, [r1] - cmp r0, 0 - beq _0809182C - adds r3, 0x1 -_0809182C: - adds r1, 0x4 - subs r2, 0x1 - cmp r2, 0 - bge _08091824 - adds r0, r3, 0 - pop {r1} - bx r1 - .align 2, 0 -_0809183C: .4byte gUnknown_203B460 - thumb_func_end sub_8091814 - - thumb_func_start sub_8091840 -sub_8091840: - lsls r0, 24 - ldr r1, _08091858 - lsrs r0, 22 - movs r2, 0x8C - lsls r2, 2 - adds r0, r2 - ldr r1, [r1] - adds r1, r0 - movs r0, 0 - strb r0, [r1] - strb r0, [r1, 0x1] - bx lr - .align 2, 0 -_08091858: .4byte gUnknown_203B460 - thumb_func_end sub_8091840 - - thumb_func_start sub_809185C -sub_809185C: - lsls r0, 24 - ldr r1, _08091870 - lsrs r0, 22 - movs r2, 0x8C - lsls r2, 2 - adds r0, r2 - ldr r1, [r1] - adds r1, r0 - adds r0, r1, 0 - bx lr - .align 2, 0 -_08091870: .4byte gUnknown_203B460 - thumb_func_end sub_809185C - - thumb_func_start sub_8091874 -sub_8091874: - push {r4-r7,lr} - movs r2, 0 - movs r4, 0 - ldr r7, _08091884 - movs r6, 0x8C - lsls r6, 2 - movs r3, 0 - b _080918A0 - .align 2, 0 -_08091884: .4byte gUnknown_203B460 -_08091888: - cmp r2, r4 - ble _0809189A - ldr r0, [r7] - lsls r1, r4, 2 - adds r0, r6 - adds r1, r0, r1 - adds r0, r3 - ldr r0, [r0] - str r0, [r1] -_0809189A: - adds r3, 0x4 - adds r2, 0x1 - adds r4, 0x1 -_080918A0: - cmp r2, 0x7 - bgt _080918CA - ldr r0, [r7] - adds r0, r3 - adds r0, r6 - ldrb r0, [r0] - cmp r0, 0 - bne _080918CA - ldr r5, _080918E8 - movs r1, 0x8C - lsls r1, 2 -_080918B6: - adds r3, 0x4 - adds r2, 0x1 - cmp r2, 0x7 - bgt _080918CA - ldr r0, [r5] - adds r0, r3 - adds r0, r1 - ldrb r0, [r0] - cmp r0, 0 - beq _080918B6 -_080918CA: - cmp r2, 0x8 - bne _08091888 - cmp r4, 0x7 - bgt _080918E0 -_080918D2: - lsls r0, r4, 24 - lsrs r0, 24 - bl sub_8091840 - adds r4, 0x1 - cmp r4, 0x7 - ble _080918D2 -_080918E0: - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080918E8: .4byte gUnknown_203B460 - thumb_func_end sub_8091874 - - thumb_func_start sub_80918EC -sub_80918EC: - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - movs r0, 0 -_080918F8: - adds r1, r0, 0x1 - mov r8, r1 - mov r6, r8 - cmp r1, 0x7 - bgt _08091964 - ldr r1, _08091978 - mov r9, r1 - lsls r7, r0, 2 - movs r0, 0x8C - lsls r0, 2 - mov r10, r0 -_0809190E: - mov r1, r9 - ldr r0, [r1] - adds r0, r7 - add r0, r10 - ldrb r0, [r0] - bl GetItemOrder - adds r4, r0, 0 - mov r1, r9 - ldr r0, [r1] - lsls r5, r6, 2 - adds r0, r5 - add r0, r10 - ldrb r0, [r0] - bl GetItemOrder - cmp r4, r0 - bgt _0809194C - cmp r4, r0 - bne _0809195E - mov r1, r9 - ldr r0, [r1] - adds r2, r0, r7 - ldr r1, _0809197C - adds r2, r1 - adds r0, r5 - adds r0, r1 - ldrb r1, [r2] - ldrb r0, [r0] - cmp r1, r0 - bcs _0809195E -_0809194C: - mov r1, r9 - ldr r0, [r1] - add r0, r10 - adds r2, r0, r7 - ldr r3, [r2] - adds r0, r5 - ldr r1, [r0] - str r1, [r2] - str r3, [r0] -_0809195E: - adds r6, 0x1 - cmp r6, 0x7 - ble _0809190E -_08091964: - mov r0, r8 - cmp r0, 0x6 - ble _080918F8 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08091978: .4byte gUnknown_203B460 -_0809197C: .4byte 0x00000231 - thumb_func_end sub_80918EC - - thumb_func_start sub_8091980 -sub_8091980: - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x10 - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 - mov r1, sp - ldr r0, _080919F4 - ldm r0!, {r2-r4} - stm r1!, {r2-r4} - ldr r0, [r0] - str r0, [r1] - movs r5, 0 -_0809199C: - lsls r0, r5, 24 - lsrs r0, 24 - bl sub_8091840 - adds r5, 0x1 - cmp r5, 0x7 - ble _0809199C - mov r0, r8 - lsls r7, r0, 2 - ldr r6, _080919F8 - movs r5, 0x7 -_080919B2: - adds r0, r6, 0 - bl RandomCapped - adds r4, r0, 0 - adds r0, r6, 0 - bl RandomCapped - adds r2, r0, 0 - mov r1, sp - adds r0, r1, r7 - ldr r0, [r0] - adds r1, r4, 0 - bl sub_8091E94 - lsls r0, 24 - lsrs r0, 24 - bl sub_80919FC - subs r5, 0x1 - cmp r5, 0 - bge _080919B2 - bl sub_80918EC - mov r0, r8 - bl sub_8091BB4 - add sp, 0x10 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080919F4: .4byte gUnknown_81097E8 -_080919F8: .4byte 0x0000270f - thumb_func_end sub_8091980 - - thumb_func_start sub_80919FC -sub_80919FC: - push {r4,r5,lr} - sub sp, 0x4 - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - mov r0, sp - bl sub_8090B08 - movs r3, 0 - ldr r5, _08091A34 - movs r4, 0x8C - lsls r4, 2 -_08091A14: - ldr r1, [r5] - lsls r2, r3, 2 - adds r0, r1, r2 - adds r0, r4 - ldrb r0, [r0] - cmp r0, 0 - bne _08091A38 - movs r3, 0x8C - lsls r3, 2 - adds r0, r1, r3 - adds r0, r2 - ldr r1, [sp] - str r1, [r0] - movs r0, 0 - b _08091A40 - .align 2, 0 -_08091A34: .4byte gUnknown_203B460 -_08091A38: - adds r3, 0x1 - cmp r3, 0x7 - ble _08091A14 - movs r0, 0x1 -_08091A40: - add sp, 0x4 - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_80919FC - - thumb_func_start sub_8091A48 -sub_8091A48: - push {lr} - movs r3, 0 - ldr r0, _08091A70 - ldr r0, [r0] - movs r2, 0x94 - lsls r2, 2 - adds r1, r0, r2 - movs r2, 0x3 -_08091A58: - ldrb r0, [r1] - cmp r0, 0 - beq _08091A60 - adds r3, 0x1 -_08091A60: - adds r1, 0x4 - subs r2, 0x1 - cmp r2, 0 - bge _08091A58 - adds r0, r3, 0 - pop {r1} - bx r1 - .align 2, 0 -_08091A70: .4byte gUnknown_203B460 - thumb_func_end sub_8091A48 - - thumb_func_start sub_8091A74 -sub_8091A74: - lsls r0, 24 - ldr r1, _08091A8C - lsrs r0, 22 - movs r2, 0x94 - lsls r2, 2 - adds r0, r2 - ldr r1, [r1] - adds r1, r0 - movs r0, 0 - strb r0, [r1] - strb r0, [r1, 0x1] - bx lr - .align 2, 0 -_08091A8C: .4byte gUnknown_203B460 - thumb_func_end sub_8091A74 - - thumb_func_start sub_8091A90 -sub_8091A90: - lsls r0, 24 - ldr r1, _08091AA4 - lsrs r0, 22 - movs r2, 0x94 - lsls r2, 2 - adds r0, r2 - ldr r1, [r1] - adds r1, r0 - adds r0, r1, 0 - bx lr - .align 2, 0 -_08091AA4: .4byte gUnknown_203B460 - thumb_func_end sub_8091A90 - - thumb_func_start sub_8091AA8 -sub_8091AA8: - push {r4-r7,lr} - movs r2, 0 - movs r4, 0 - ldr r7, _08091AB8 - movs r6, 0x94 - lsls r6, 2 - movs r3, 0 - b _08091AD4 - .align 2, 0 -_08091AB8: .4byte gUnknown_203B460 -_08091ABC: - cmp r2, r4 - ble _08091ACE - ldr r0, [r7] - lsls r1, r4, 2 - adds r0, r6 - adds r1, r0, r1 - adds r0, r3 - ldr r0, [r0] - str r0, [r1] -_08091ACE: - adds r3, 0x4 - adds r2, 0x1 - adds r4, 0x1 -_08091AD4: - cmp r2, 0x3 - bgt _08091AFE - ldr r0, [r7] - adds r0, r3 - adds r0, r6 - ldrb r0, [r0] - cmp r0, 0 - bne _08091AFE - ldr r5, _08091B1C - movs r1, 0x94 - lsls r1, 2 -_08091AEA: - adds r3, 0x4 - adds r2, 0x1 - cmp r2, 0x3 - bgt _08091AFE - ldr r0, [r5] - adds r0, r3 - adds r0, r1 - ldrb r0, [r0] - cmp r0, 0 - beq _08091AEA -_08091AFE: - cmp r2, 0x4 - bne _08091ABC - cmp r4, 0x3 - bgt _08091B14 -_08091B06: - lsls r0, r4, 24 - lsrs r0, 24 - bl sub_8091A74 - adds r4, 0x1 - cmp r4, 0x3 - ble _08091B06 -_08091B14: - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08091B1C: .4byte gUnknown_203B460 - thumb_func_end sub_8091AA8 - - thumb_func_start sub_8091B20 -sub_8091B20: - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - movs r0, 0 -_08091B2C: - adds r1, r0, 0x1 - mov r8, r1 - mov r6, r8 - cmp r1, 0x3 - bgt _08091B98 - ldr r1, _08091BAC - mov r9, r1 - lsls r7, r0, 2 - movs r0, 0x94 - lsls r0, 2 - mov r10, r0 -_08091B42: - mov r1, r9 - ldr r0, [r1] - adds r0, r7 - add r0, r10 - ldrb r0, [r0] - bl GetItemOrder - adds r4, r0, 0 - mov r1, r9 - ldr r0, [r1] - lsls r5, r6, 2 - adds r0, r5 - add r0, r10 - ldrb r0, [r0] - bl GetItemOrder - cmp r4, r0 - bgt _08091B80 - cmp r4, r0 - bne _08091B92 - mov r1, r9 - ldr r0, [r1] - adds r2, r0, r7 - ldr r1, _08091BB0 - adds r2, r1 - adds r0, r5 - adds r0, r1 - ldrb r1, [r2] - ldrb r0, [r0] - cmp r1, r0 - bcs _08091B92 -_08091B80: - mov r1, r9 - ldr r0, [r1] - add r0, r10 - adds r2, r0, r7 - ldr r3, [r2] - adds r0, r5 - ldr r1, [r0] - str r1, [r2] - str r3, [r0] -_08091B92: - adds r6, 0x1 - cmp r6, 0x3 - ble _08091B42 -_08091B98: - mov r0, r8 - cmp r0, 0x2 - ble _08091B2C - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08091BAC: .4byte gUnknown_203B460 -_08091BB0: .4byte 0x00000251 - thumb_func_end sub_8091B20 - - thumb_func_start sub_8091BB4 -sub_8091BB4: - push {r4-r7,lr} - sub sp, 0x10 - lsls r0, 24 - lsrs r4, r0, 24 - mov r1, sp - ldr r0, _08091C14 - ldm r0!, {r2,r3,r5} - stm r1!, {r2,r3,r5} - ldr r0, [r0] - str r0, [r1] - movs r5, 0 -_08091BCA: - lsls r0, r5, 24 - lsrs r0, 24 - bl sub_8091A74 - adds r5, 0x1 - cmp r5, 0x3 - ble _08091BCA - lsls r7, r4, 2 - ldr r6, _08091C18 - movs r5, 0x3 -_08091BDE: - adds r0, r6, 0 - bl RandomCapped - adds r4, r0, 0 - adds r0, r6, 0 - bl RandomCapped - adds r2, r0, 0 - mov r1, sp - adds r0, r1, r7 - ldr r0, [r0] - adds r1, r4, 0 - bl sub_8091E94 - lsls r0, 24 - lsrs r0, 24 - bl sub_8091C1C - subs r5, 0x1 - cmp r5, 0 - bge _08091BDE - bl sub_8091B20 - add sp, 0x10 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08091C14: .4byte gUnknown_81097F8 -_08091C18: .4byte 0x0000270f - thumb_func_end sub_8091BB4 - - thumb_func_start sub_8091C1C -sub_8091C1C: - push {r4,r5,lr} - sub sp, 0x4 - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - mov r0, sp - bl sub_8090B08 - movs r3, 0 - ldr r5, _08091C54 - movs r4, 0x94 - lsls r4, 2 -_08091C34: - ldr r1, [r5] - lsls r2, r3, 2 - adds r0, r1, r2 - adds r0, r4 - ldrb r0, [r0] - cmp r0, 0 - bne _08091C58 - movs r3, 0x94 - lsls r3, 2 - adds r0, r1, r3 - adds r0, r2 - ldr r1, [sp] - str r1, [r0] - movs r0, 0 - b _08091C60 - .align 2, 0 -_08091C54: .4byte gUnknown_203B460 -_08091C58: - adds r3, 0x1 - cmp r3, 0x3 - ble _08091C34 - movs r0, 0x1 -_08091C60: - add sp, 0x4 - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_8091C1C - - thumb_func_start sub_8091C68 -sub_8091C68: - push {r4-r6,lr} - sub sp, 0x10 - adds r3, r0, 0 - adds r2, r1, 0 - mov r0, sp - adds r1, r3, 0 - bl sub_809486C - movs r4, 0 - ldr r5, _08091D10 -_08091C7C: - lsls r0, r4, 2 - ldr r1, [r5] - adds r1, r0 - mov r0, sp - bl sub_8091E28 - adds r4, 0x1 - cmp r4, 0x13 - ble _08091C7C - ldr r6, _08091D10 - movs r5, 0x50 - movs r4, 0xEF -_08091C94: - ldr r1, [r6] - adds r1, r5 - mov r0, sp - movs r2, 0xA - bl sub_809488C - adds r5, 0x2 - subs r4, 0x1 - cmp r4, 0 - bge _08091C94 - ldr r6, _08091D10 - movs r5, 0x8C - lsls r5, 2 - movs r4, 0x7 -_08091CB0: - ldr r1, [r6] - adds r1, r5 - mov r0, sp - bl sub_8091DE0 - adds r5, 0x4 - subs r4, 0x1 - cmp r4, 0 - bge _08091CB0 - ldr r6, _08091D10 - movs r5, 0x94 - lsls r5, 2 - movs r4, 0x3 -_08091CCA: - ldr r1, [r6] - adds r1, r5 - mov r0, sp - bl sub_8091DE0 - adds r5, 0x4 - subs r4, 0x1 - cmp r4, 0 - bge _08091CCA - ldr r4, _08091D10 - ldr r1, [r4] - movs r0, 0x98 - lsls r0, 2 - adds r1, r0 - mov r0, sp - movs r2, 0x18 - bl sub_809488C - ldr r1, [r4] - movs r0, 0x99 - lsls r0, 2 - adds r1, r0 - mov r0, sp - movs r2, 0x18 - bl sub_809488C - mov r0, sp - bl nullsub_102 - ldr r0, [sp, 0x8] - add sp, 0x10 - pop {r4-r6} - pop {r1} - bx r1 - .align 2, 0 -_08091D10: .4byte gUnknown_203B460 - thumb_func_end sub_8091C68 - - thumb_func_start sub_8091D14 -sub_8091D14: - push {r4-r6,lr} - sub sp, 0x10 - adds r3, r0, 0 - adds r2, r1, 0 - mov r0, sp - adds r1, r3, 0 - bl sub_809485C - movs r4, 0 - ldr r5, _08091DBC -_08091D28: - lsls r0, r4, 2 - ldr r1, [r5] - adds r1, r0 - mov r0, sp - bl sub_8091E00 - adds r4, 0x1 - cmp r4, 0x13 - ble _08091D28 - ldr r6, _08091DBC - movs r5, 0x50 - movs r4, 0xEF -_08091D40: - ldr r1, [r6] - adds r1, r5 - mov r0, sp - movs r2, 0xA - bl sub_8094924 - adds r5, 0x2 - subs r4, 0x1 - cmp r4, 0 - bge _08091D40 - ldr r6, _08091DBC - movs r5, 0x8C - lsls r5, 2 - movs r4, 0x7 -_08091D5C: - ldr r1, [r6] - adds r1, r5 - mov r0, sp - bl sub_8091DC0 - adds r5, 0x4 - subs r4, 0x1 - cmp r4, 0 - bge _08091D5C - ldr r6, _08091DBC - movs r5, 0x94 - lsls r5, 2 - movs r4, 0x3 -_08091D76: - ldr r1, [r6] - adds r1, r5 - mov r0, sp - bl sub_8091DC0 - adds r5, 0x4 - subs r4, 0x1 - cmp r4, 0 - bge _08091D76 - ldr r4, _08091DBC - ldr r1, [r4] - movs r0, 0x98 - lsls r0, 2 - adds r1, r0 - mov r0, sp - movs r2, 0x18 - bl sub_8094924 - ldr r1, [r4] - movs r0, 0x99 - lsls r0, 2 - adds r1, r0 - mov r0, sp - movs r2, 0x18 - bl sub_8094924 - mov r0, sp - bl nullsub_102 - ldr r0, [sp, 0x8] - add sp, 0x10 - pop {r4-r6} - pop {r1} - bx r1 - .align 2, 0 -_08091DBC: .4byte gUnknown_203B460 - thumb_func_end sub_8091D14 - - thumb_func_start sub_8091DC0 -sub_8091DC0: - push {r4,r5,lr} - adds r5, r0, 0 - adds r4, r1, 0 - movs r2, 0x8 - bl sub_8094924 - adds r4, 0x1 - adds r0, r5, 0 - adds r1, r4, 0 - movs r2, 0x7 - bl sub_8094924 - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_8091DC0 - - thumb_func_start sub_8091DE0 -sub_8091DE0: - push {r4,r5,lr} - adds r5, r0, 0 - adds r4, r1, 0 - movs r2, 0x8 - bl sub_809488C - adds r4, 0x1 - adds r0, r5, 0 - adds r1, r4, 0 - movs r2, 0x7 - bl sub_809488C - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_8091DE0 - - thumb_func_start sub_8091E00 -sub_8091E00: - push {r4,r5,lr} - adds r4, r0, 0 - adds r5, r1, 0 - movs r2, 0x8 - bl sub_8094924 - adds r1, r5, 0x1 - adds r0, r4, 0 - movs r2, 0x7 - bl sub_8094924 - adds r5, 0x2 - adds r0, r4, 0 - adds r1, r5, 0 - movs r2, 0x8 - bl sub_8094924 - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_8091E00 - - thumb_func_start sub_8091E28 -sub_8091E28: - push {r4,r5,lr} - adds r4, r0, 0 - adds r5, r1, 0 - movs r2, 0x8 - bl sub_809488C - adds r1, r5, 0x1 - adds r0, r4, 0 - movs r2, 0x7 - bl sub_809488C - adds r5, 0x2 - adds r0, r4, 0 - adds r1, r5, 0 - movs r2, 0x8 - bl sub_809488C - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_8091E28 - - thumb_func_start sub_8091E50 -sub_8091E50: - lsls r0, 24 - ldr r1, _08091E5C - lsrs r0, 22 - adds r0, r1 - ldr r0, [r0] - bx lr - .align 2, 0 -_08091E5C: .4byte gUnknown_810AF50 - thumb_func_end sub_8091E50 - - thumb_func_start sub_8091E60 -sub_8091E60: - push {r4,lr} - lsls r0, 24 - lsrs r3, r0, 24 - lsls r0, r1, 24 - lsrs r4, r0, 24 - cmp r3, 0x3E - bhi _08091E8C - ldr r2, _08091E88 - lsrs r0, 27 - lsls r1, r3, 5 - adds r0, r1 - adds r0, r2 - ldrb r0, [r0] - movs r1, 0x7 - ands r1, r4 - asrs r0, r1 - movs r1, 0x1 - ands r0, r1 - b _08091E8E - .align 2, 0 -_08091E88: .4byte gUnknown_8108F64 -_08091E8C: - movs r0, 0 -_08091E8E: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_8091E60 - - thumb_func_start sub_8091E94 -sub_8091E94: - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - ldr r4, _08091EE4 - add sp, r4 - mov r8, r1 - mov r10, r2 - ldr r1, _08091EE8 - subs r0, 0x1 - lsls r0, 2 - adds r0, r1 - movs r3, 0 - add r1, sp, 0x18 - mov r9, r1 - ldr r2, _08091EEC - mov r12, r2 - add r6, sp, 0x1F8 - ldr r2, [r0] - adds r7, r6, 0 - movs r4, 0 -_08091EC0: - ldrh r1, [r2] - cmp r1, r12 - bls _08091EF4 - ldrh r0, [r2] - ldr r1, _08091EF0 - adds r0, r1 - cmp r0, 0 - beq _08091EFC - movs r5, 0 - adds r1, r7, r4 -_08091ED4: - strh r5, [r1] - adds r1, 0x2 - adds r4, 0x2 - adds r3, 0x1 - subs r0, 0x1 - cmp r0, 0 - bne _08091ED4 - b _08091EFC - .align 2, 0 -_08091EE4: .4byte 0xfffffc10 -_08091EE8: .4byte gUnknown_8108E58 -_08091EEC: .4byte 0x0000752f -_08091EF0: .4byte 0xffff8ad0 -_08091EF4: - adds r0, r6, r4 - strh r1, [r0] - adds r4, 0x2 - adds r3, 0x1 -_08091EFC: - adds r2, 0x2 - cmp r3, 0xFB - ble _08091EC0 - movs r3, 0xB - add r2, sp, 0x1F8 - mov r1, sp -_08091F08: - ldrh r0, [r2] - strh r0, [r1] - adds r2, 0x2 - adds r1, 0x2 - subs r3, 0x1 - cmp r3, 0 - bge _08091F08 - mov r2, r9 - add r1, sp, 0x210 - movs r3, 0xEF -_08091F1C: - ldrh r0, [r1] - strh r0, [r2] - adds r1, 0x2 - adds r2, 0x2 - subs r3, 0x1 - cmp r3, 0 - bge _08091F1C - movs r7, 0xC - movs r6, 0 - mov r0, sp - movs r2, 0 - ldrsh r0, [r0, r2] - cmp r0, 0 - beq _08091F4A - mov r0, sp - movs r1, 0 - ldrsh r0, [r0, r1] - cmp r0, r8 - blt _08091F4A - movs r7, 0 - b _08091F66 -_08091F46: - mov r8, r5 - b _08091F9C -_08091F4A: - adds r6, 0x1 - cmp r6, 0xB - bgt _08091F66 - lsls r0, r6, 1 - mov r2, sp - adds r1, r2, r0 - movs r2, 0 - ldrsh r0, [r1, r2] - cmp r0, 0 - beq _08091F4A - cmp r0, r8 - blt _08091F4A - lsls r0, r6, 24 - lsrs r7, r0, 24 -_08091F66: - movs r0, 0x46 - mov r8, r0 - cmp r7, 0xC - beq _08091F9C - movs r6, 0 - mov r4, r9 -_08091F72: - movs r1, 0 - ldrsh r0, [r4, r1] - cmp r0, 0 - beq _08091F94 - lsls r0, r6, 24 - lsrs r5, r0, 24 - adds r0, r5, 0 - bl GetItemType - lsls r0, 24 - lsrs r0, 24 - cmp r0, r7 - bne _08091F94 - movs r2, 0 - ldrsh r0, [r4, r2] - cmp r0, r10 - bge _08091F46 -_08091F94: - adds r4, 0x2 - adds r6, 0x1 - cmp r6, 0xEF - ble _08091F72 -_08091F9C: - mov r0, r8 - movs r3, 0xFC - lsls r3, 2 - add sp, r3 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_8091E94 - - thumb_func_start sub_8091FB4 -sub_8091FB4: - push {r4-r6,lr} - movs r6, 0 -_08091FB8: - ldr r0, _08092038 - lsls r1, r6, 2 - ldr r0, [r0] - adds r4, r0, r1 - ldrb r1, [r4] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _08091FE8 - movs r0, 0xF7 - ands r0, r1 - movs r5, 0 - strb r0, [r4] - ldrb r0, [r4, 0x2] - cmp r0, 0x69 - bne _08091FE8 - adds r0, r4, 0 - bl sub_80915D4 - bl sub_80913A0 - strb r5, [r4, 0x2] - strb r5, [r4, 0x1] - strb r5, [r4] -_08091FE8: - adds r6, 0x1 - cmp r6, 0x13 - ble _08091FB8 - bl sub_80910B4 - movs r6, 0 -_08091FF4: - movs r0, 0x58 - adds r1, r6, 0 - muls r1, r0 - ldr r0, _0809203C - ldr r0, [r0] - adds r2, r1, r0 - ldrb r1, [r2] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _08092026 - adds r4, r2, 0 - adds r4, 0x28 - ldrb r0, [r4] - cmp r0, 0 - beq _08092026 - cmp r0, 0x69 - bne _08092026 - adds r0, r4, 0 - bl sub_80915E4 - bl sub_80913A0 - movs r0, 0 - strb r0, [r4] -_08092026: - adds r6, 0x1 - movs r0, 0xCE - lsls r0, 1 - cmp r6, r0 - ble _08091FF4 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_08092038: .4byte gUnknown_203B460 -_0809203C: .4byte gRecruitedPokemonRef - thumb_func_end sub_8091FB4 - .align 2,0 diff --git a/asm/items_1.s b/asm/items_1.s new file mode 100644 index 0000000..50b1f34 --- /dev/null +++ b/asm/items_1.s @@ -0,0 +1,1435 @@ + .include "constants/gba_constants.inc" + .include "asm/macros.inc" + + .syntax unified + + .text + + thumb_func_start sub_80915F4 +sub_80915F4: + push {r4-r7,lr} + mov r7, r8 + push {r7} + adds r6, r0, 0 + adds r7, r3, 0 + lsls r1, 24 + lsrs r5, r1, 24 + lsls r2, 24 + lsrs r2, 24 + mov r8, r2 + ldr r0, _080916B8 + strh r0, [r7] + movs r0, 0 + strh r0, [r7, 0x2] + adds r0, r5, 0 + bl sub_8091764 + lsls r0, 24 + cmp r0, 0 + bne _0809161E + b _08091756 +_0809161E: + movs r1, 0x8 + ldrsh r0, [r6, r1] + movs r1, 0 + bl GetPokemonType + adds r4, r0, 0 + lsls r4, 24 + lsrs r4, 24 + movs r2, 0x8 + ldrsh r0, [r6, r2] + movs r1, 0x1 + bl GetPokemonType + lsls r0, 24 + lsrs r0, 24 + adds r2, r5, 0 + subs r2, 0x55 + ldr r5, _080916BC + lsls r2, 1 + lsls r1, r4, 3 + adds r1, r4 + lsls r1, 2 + adds r1, r2, r1 + adds r1, r5 + movs r4, 0 + ldrsh r3, [r1, r4] + lsls r1, r0, 3 + adds r1, r0 + lsls r1, 2 + adds r2, r1 + adds r2, r5 + movs r1, 0 + ldrsh r0, [r2, r1] + movs r2, 0x14 + ldrsh r1, [r6, r2] + adds r3, r0 + ldrh r4, [r6, 0x14] + adds r3, r4 + strh r3, [r6, 0x14] + movs r2, 0x14 + ldrsh r0, [r6, r2] + subs r1, r0, r1 + lsls r3, 16 + cmp r3, 0 + bgt _0809167C + movs r0, 0x1 + strh r0, [r6, 0x14] +_0809167C: + movs r4, 0x14 + ldrsh r0, [r6, r4] + ldr r2, _080916C0 + cmp r0, r2 + ble _08091688 + strh r2, [r6, 0x14] +_08091688: + movs r0, 0 + cmp r1, 0x8 + bgt _0809169C + movs r0, 0x1 + cmp r1, 0x4 + bgt _0809169C + movs r0, 0x3 + cmp r1, 0x2 + ble _0809169C + movs r0, 0x2 +_0809169C: + strh r0, [r7] + mov r1, r8 + cmp r1, 0 + bne _08091756 + cmp r0, 0 + bne _080916C4 + movs r0, 0x10 + bl RandomCapped + cmp r0, 0xA + bne _080916C4 + movs r0, 0xF + b _080916D2 + .align 2, 0 +_080916B8: .4byte 0x0000ffff +_080916BC: .4byte gUnknown_810A580 +_080916C0: .4byte 0x000003e7 +_080916C4: + movs r0, 0x4 + bl RandomCapped + ldr r1, _080916EC + lsls r0, 1 + adds r0, r1 + ldrh r0, [r0] +_080916D2: + strh r0, [r7, 0x2] + ldrh r1, [r7, 0x2] + movs r0, 0x1 + ands r0, r1 + cmp r0, 0 + beq _080916F6 + ldrb r0, [r6, 0x18] + cmp r0, 0xFE + bhi _080916F0 + adds r0, 0x1 + strb r0, [r6, 0x18] + b _080916F6 + .align 2, 0 +_080916EC: .4byte gUnknown_81097E0 +_080916F0: + ldr r0, _0809170C + ands r0, r1 + strh r0, [r7, 0x2] +_080916F6: + ldrh r1, [r7, 0x2] + movs r0, 0x2 + ands r0, r1 + cmp r0, 0 + beq _08091716 + ldrb r0, [r6, 0x19] + cmp r0, 0xFE + bhi _08091710 + adds r0, 0x1 + strb r0, [r6, 0x19] + b _08091716 + .align 2, 0 +_0809170C: .4byte 0x0000fffe +_08091710: + ldr r0, _0809172C + ands r0, r1 + strh r0, [r7, 0x2] +_08091716: + ldrh r1, [r7, 0x2] + movs r0, 0x4 + ands r0, r1 + cmp r0, 0 + beq _08091736 + ldrb r0, [r6, 0x1A] + cmp r0, 0xFE + bhi _08091730 + adds r0, 0x1 + strb r0, [r6, 0x1A] + b _08091736 + .align 2, 0 +_0809172C: .4byte 0x0000fffd +_08091730: + ldr r0, _0809174C + ands r0, r1 + strh r0, [r7, 0x2] +_08091736: + ldrh r1, [r7, 0x2] + movs r0, 0x8 + ands r0, r1 + cmp r0, 0 + beq _08091756 + ldrb r0, [r6, 0x1B] + cmp r0, 0xFE + bhi _08091750 + adds r0, 0x1 + strb r0, [r6, 0x1B] + b _08091756 + .align 2, 0 +_0809174C: .4byte 0x0000fffb +_08091750: + ldr r0, _08091760 + ands r0, r1 + strh r0, [r7, 0x2] +_08091756: + pop {r3} + mov r8, r3 + pop {r4-r7} + pop {r0} + bx r0 + .align 2, 0 +_08091760: .4byte 0x0000fff7 + thumb_func_end sub_80915F4 + + thumb_func_start sub_8091764 +sub_8091764: + push {lr} + lsls r0, 24 + lsrs r0, 24 + cmp r0, 0x55 + bls _08091776 + cmp r0, 0x66 + bhi _08091776 + movs r0, 0x1 + b _08091778 +_08091776: + movs r0, 0 +_08091778: + pop {r1} + bx r1 + thumb_func_end sub_8091764 + + thumb_func_start sub_809177C +sub_809177C: + push {r4,lr} + movs r4, 0 +_08091780: + lsls r1, r4, 2 + ldr r0, _080917A4 + ldr r0, [r0] + adds r2, r1, r0 + ldrb r1, [r2] + movs r0, 0x1 + ands r0, r1 + cmp r0, 0 + beq _080917A8 + ldrb r0, [r2, 0x2] + bl sub_8091764 + lsls r0, 24 + cmp r0, 0 + beq _080917A8 + movs r0, 0x1 + b _080917B0 + .align 2, 0 +_080917A4: .4byte gTeamInventory_203B460 +_080917A8: + adds r4, 0x1 + cmp r4, 0x13 + ble _08091780 + movs r0, 0 +_080917B0: + pop {r4} + pop {r1} + bx r1 + thumb_func_end sub_809177C + + thumb_func_start sub_80917B8 +sub_80917B8: + push {r4,lr} + adds r4, r0, 0 + ldrb r0, [r4, 0x2] + bl IsThrowableItem + lsls r0, 24 + cmp r0, 0 + beq _080917E0 + ldr r2, _080917DC + ldr r1, [r2] + ldrb r0, [r4, 0x2] + lsls r0, 1 + adds r1, 0x50 + adds r1, r0 + ldrh r0, [r1] + ldrb r3, [r4, 0x1] + adds r0, r3 + b _080917F0 + .align 2, 0 +_080917DC: .4byte gTeamInventory_203B460 +_080917E0: + ldr r2, _0809180C + ldr r1, [r2] + ldrb r0, [r4, 0x2] + lsls r0, 1 + adds r1, 0x50 + adds r1, r0 + ldrh r0, [r1] + adds r0, 0x1 +_080917F0: + strh r0, [r1] + ldr r0, [r2] + ldrb r1, [r4, 0x2] + lsls r1, 1 + adds r0, 0x50 + adds r2, r0, r1 + ldrh r0, [r2] + ldr r1, _08091810 + cmp r0, r1 + bls _08091806 + strh r1, [r2] +_08091806: + pop {r4} + pop {r0} + bx r0 + .align 2, 0 +_0809180C: .4byte gTeamInventory_203B460 +_08091810: .4byte 0x000003e7 + thumb_func_end sub_80917B8 + + thumb_func_start sub_8091814 +sub_8091814: + push {lr} + movs r3, 0 + ldr r0, _0809183C + ldr r0, [r0] + movs r2, 0x8C + lsls r2, 2 + adds r1, r0, r2 + movs r2, 0x7 +_08091824: + ldrb r0, [r1] + cmp r0, 0 + beq _0809182C + adds r3, 0x1 +_0809182C: + adds r1, 0x4 + subs r2, 0x1 + cmp r2, 0 + bge _08091824 + adds r0, r3, 0 + pop {r1} + bx r1 + .align 2, 0 +_0809183C: .4byte gTeamInventory_203B460 + thumb_func_end sub_8091814 + + thumb_func_start sub_8091840 +sub_8091840: + lsls r0, 24 + ldr r1, _08091858 + lsrs r0, 22 + movs r2, 0x8C + lsls r2, 2 + adds r0, r2 + ldr r1, [r1] + adds r1, r0 + movs r0, 0 + strb r0, [r1] + strb r0, [r1, 0x1] + bx lr + .align 2, 0 +_08091858: .4byte gTeamInventory_203B460 + thumb_func_end sub_8091840 + + thumb_func_start sub_809185C +sub_809185C: + lsls r0, 24 + ldr r1, _08091870 + lsrs r0, 22 + movs r2, 0x8C + lsls r2, 2 + adds r0, r2 + ldr r1, [r1] + adds r1, r0 + adds r0, r1, 0 + bx lr + .align 2, 0 +_08091870: .4byte gTeamInventory_203B460 + thumb_func_end sub_809185C + + thumb_func_start sub_8091874 +sub_8091874: + push {r4-r7,lr} + movs r2, 0 + movs r4, 0 + ldr r7, _08091884 + movs r6, 0x8C + lsls r6, 2 + movs r3, 0 + b _080918A0 + .align 2, 0 +_08091884: .4byte gTeamInventory_203B460 +_08091888: + cmp r2, r4 + ble _0809189A + ldr r0, [r7] + lsls r1, r4, 2 + adds r0, r6 + adds r1, r0, r1 + adds r0, r3 + ldr r0, [r0] + str r0, [r1] +_0809189A: + adds r3, 0x4 + adds r2, 0x1 + adds r4, 0x1 +_080918A0: + cmp r2, 0x7 + bgt _080918CA + ldr r0, [r7] + adds r0, r3 + adds r0, r6 + ldrb r0, [r0] + cmp r0, 0 + bne _080918CA + ldr r5, _080918E8 + movs r1, 0x8C + lsls r1, 2 +_080918B6: + adds r3, 0x4 + adds r2, 0x1 + cmp r2, 0x7 + bgt _080918CA + ldr r0, [r5] + adds r0, r3 + adds r0, r1 + ldrb r0, [r0] + cmp r0, 0 + beq _080918B6 +_080918CA: + cmp r2, 0x8 + bne _08091888 + cmp r4, 0x7 + bgt _080918E0 +_080918D2: + lsls r0, r4, 24 + lsrs r0, 24 + bl sub_8091840 + adds r4, 0x1 + cmp r4, 0x7 + ble _080918D2 +_080918E0: + pop {r4-r7} + pop {r0} + bx r0 + .align 2, 0 +_080918E8: .4byte gTeamInventory_203B460 + thumb_func_end sub_8091874 + + thumb_func_start sub_80918EC +sub_80918EC: + push {r4-r7,lr} + mov r7, r10 + mov r6, r9 + mov r5, r8 + push {r5-r7} + movs r0, 0 +_080918F8: + adds r1, r0, 0x1 + mov r8, r1 + mov r6, r8 + cmp r1, 0x7 + bgt _08091964 + ldr r1, _08091978 + mov r9, r1 + lsls r7, r0, 2 + movs r0, 0x8C + lsls r0, 2 + mov r10, r0 +_0809190E: + mov r1, r9 + ldr r0, [r1] + adds r0, r7 + add r0, r10 + ldrb r0, [r0] + bl GetItemOrder + adds r4, r0, 0 + mov r1, r9 + ldr r0, [r1] + lsls r5, r6, 2 + adds r0, r5 + add r0, r10 + ldrb r0, [r0] + bl GetItemOrder + cmp r4, r0 + bgt _0809194C + cmp r4, r0 + bne _0809195E + mov r1, r9 + ldr r0, [r1] + adds r2, r0, r7 + ldr r1, _0809197C + adds r2, r1 + adds r0, r5 + adds r0, r1 + ldrb r1, [r2] + ldrb r0, [r0] + cmp r1, r0 + bcs _0809195E +_0809194C: + mov r1, r9 + ldr r0, [r1] + add r0, r10 + adds r2, r0, r7 + ldr r3, [r2] + adds r0, r5 + ldr r1, [r0] + str r1, [r2] + str r3, [r0] +_0809195E: + adds r6, 0x1 + cmp r6, 0x7 + ble _0809190E +_08091964: + mov r0, r8 + cmp r0, 0x6 + ble _080918F8 + pop {r3-r5} + mov r8, r3 + mov r9, r4 + mov r10, r5 + pop {r4-r7} + pop {r0} + bx r0 + .align 2, 0 +_08091978: .4byte gTeamInventory_203B460 +_0809197C: .4byte 0x00000231 + thumb_func_end sub_80918EC + + thumb_func_start sub_8091980 +sub_8091980: + push {r4-r7,lr} + mov r7, r8 + push {r7} + sub sp, 0x10 + lsls r0, 24 + lsrs r0, 24 + mov r8, r0 + mov r1, sp + ldr r0, _080919F4 + ldm r0!, {r2-r4} + stm r1!, {r2-r4} + ldr r0, [r0] + str r0, [r1] + movs r5, 0 +_0809199C: + lsls r0, r5, 24 + lsrs r0, 24 + bl sub_8091840 + adds r5, 0x1 + cmp r5, 0x7 + ble _0809199C + mov r0, r8 + lsls r7, r0, 2 + ldr r6, _080919F8 + movs r5, 0x7 +_080919B2: + adds r0, r6, 0 + bl RandomCapped + adds r4, r0, 0 + adds r0, r6, 0 + bl RandomCapped + adds r2, r0, 0 + mov r1, sp + adds r0, r1, r7 + ldr r0, [r0] + adds r1, r4, 0 + bl sub_8091E94 + lsls r0, 24 + lsrs r0, 24 + bl sub_80919FC + subs r5, 0x1 + cmp r5, 0 + bge _080919B2 + bl sub_80918EC + mov r0, r8 + bl sub_8091BB4 + add sp, 0x10 + pop {r3} + mov r8, r3 + pop {r4-r7} + pop {r0} + bx r0 + .align 2, 0 +_080919F4: .4byte gUnknown_81097E8 +_080919F8: .4byte 0x0000270f + thumb_func_end sub_8091980 + + thumb_func_start sub_80919FC +sub_80919FC: + push {r4,r5,lr} + sub sp, 0x4 + adds r1, r0, 0 + lsls r1, 24 + lsrs r1, 24 + mov r0, sp + bl sub_8090B08 + movs r3, 0 + ldr r5, _08091A34 + movs r4, 0x8C + lsls r4, 2 +_08091A14: + ldr r1, [r5] + lsls r2, r3, 2 + adds r0, r1, r2 + adds r0, r4 + ldrb r0, [r0] + cmp r0, 0 + bne _08091A38 + movs r3, 0x8C + lsls r3, 2 + adds r0, r1, r3 + adds r0, r2 + ldr r1, [sp] + str r1, [r0] + movs r0, 0 + b _08091A40 + .align 2, 0 +_08091A34: .4byte gTeamInventory_203B460 +_08091A38: + adds r3, 0x1 + cmp r3, 0x7 + ble _08091A14 + movs r0, 0x1 +_08091A40: + add sp, 0x4 + pop {r4,r5} + pop {r1} + bx r1 + thumb_func_end sub_80919FC + + thumb_func_start sub_8091A48 +sub_8091A48: + push {lr} + movs r3, 0 + ldr r0, _08091A70 + ldr r0, [r0] + movs r2, 0x94 + lsls r2, 2 + adds r1, r0, r2 + movs r2, 0x3 +_08091A58: + ldrb r0, [r1] + cmp r0, 0 + beq _08091A60 + adds r3, 0x1 +_08091A60: + adds r1, 0x4 + subs r2, 0x1 + cmp r2, 0 + bge _08091A58 + adds r0, r3, 0 + pop {r1} + bx r1 + .align 2, 0 +_08091A70: .4byte gTeamInventory_203B460 + thumb_func_end sub_8091A48 + + thumb_func_start sub_8091A74 +sub_8091A74: + lsls r0, 24 + ldr r1, _08091A8C + lsrs r0, 22 + movs r2, 0x94 + lsls r2, 2 + adds r0, r2 + ldr r1, [r1] + adds r1, r0 + movs r0, 0 + strb r0, [r1] + strb r0, [r1, 0x1] + bx lr + .align 2, 0 +_08091A8C: .4byte gTeamInventory_203B460 + thumb_func_end sub_8091A74 + + thumb_func_start sub_8091A90 +sub_8091A90: + lsls r0, 24 + ldr r1, _08091AA4 + lsrs r0, 22 + movs r2, 0x94 + lsls r2, 2 + adds r0, r2 + ldr r1, [r1] + adds r1, r0 + adds r0, r1, 0 + bx lr + .align 2, 0 +_08091AA4: .4byte gTeamInventory_203B460 + thumb_func_end sub_8091A90 + + thumb_func_start sub_8091AA8 +sub_8091AA8: + push {r4-r7,lr} + movs r2, 0 + movs r4, 0 + ldr r7, _08091AB8 + movs r6, 0x94 + lsls r6, 2 + movs r3, 0 + b _08091AD4 + .align 2, 0 +_08091AB8: .4byte gTeamInventory_203B460 +_08091ABC: + cmp r2, r4 + ble _08091ACE + ldr r0, [r7] + lsls r1, r4, 2 + adds r0, r6 + adds r1, r0, r1 + adds r0, r3 + ldr r0, [r0] + str r0, [r1] +_08091ACE: + adds r3, 0x4 + adds r2, 0x1 + adds r4, 0x1 +_08091AD4: + cmp r2, 0x3 + bgt _08091AFE + ldr r0, [r7] + adds r0, r3 + adds r0, r6 + ldrb r0, [r0] + cmp r0, 0 + bne _08091AFE + ldr r5, _08091B1C + movs r1, 0x94 + lsls r1, 2 +_08091AEA: + adds r3, 0x4 + adds r2, 0x1 + cmp r2, 0x3 + bgt _08091AFE + ldr r0, [r5] + adds r0, r3 + adds r0, r1 + ldrb r0, [r0] + cmp r0, 0 + beq _08091AEA +_08091AFE: + cmp r2, 0x4 + bne _08091ABC + cmp r4, 0x3 + bgt _08091B14 +_08091B06: + lsls r0, r4, 24 + lsrs r0, 24 + bl sub_8091A74 + adds r4, 0x1 + cmp r4, 0x3 + ble _08091B06 +_08091B14: + pop {r4-r7} + pop {r0} + bx r0 + .align 2, 0 +_08091B1C: .4byte gTeamInventory_203B460 + thumb_func_end sub_8091AA8 + + thumb_func_start sub_8091B20 +sub_8091B20: + push {r4-r7,lr} + mov r7, r10 + mov r6, r9 + mov r5, r8 + push {r5-r7} + movs r0, 0 +_08091B2C: + adds r1, r0, 0x1 + mov r8, r1 + mov r6, r8 + cmp r1, 0x3 + bgt _08091B98 + ldr r1, _08091BAC + mov r9, r1 + lsls r7, r0, 2 + movs r0, 0x94 + lsls r0, 2 + mov r10, r0 +_08091B42: + mov r1, r9 + ldr r0, [r1] + adds r0, r7 + add r0, r10 + ldrb r0, [r0] + bl GetItemOrder + adds r4, r0, 0 + mov r1, r9 + ldr r0, [r1] + lsls r5, r6, 2 + adds r0, r5 + add r0, r10 + ldrb r0, [r0] + bl GetItemOrder + cmp r4, r0 + bgt _08091B80 + cmp r4, r0 + bne _08091B92 + mov r1, r9 + ldr r0, [r1] + adds r2, r0, r7 + ldr r1, _08091BB0 + adds r2, r1 + adds r0, r5 + adds r0, r1 + ldrb r1, [r2] + ldrb r0, [r0] + cmp r1, r0 + bcs _08091B92 +_08091B80: + mov r1, r9 + ldr r0, [r1] + add r0, r10 + adds r2, r0, r7 + ldr r3, [r2] + adds r0, r5 + ldr r1, [r0] + str r1, [r2] + str r3, [r0] +_08091B92: + adds r6, 0x1 + cmp r6, 0x3 + ble _08091B42 +_08091B98: + mov r0, r8 + cmp r0, 0x2 + ble _08091B2C + pop {r3-r5} + mov r8, r3 + mov r9, r4 + mov r10, r5 + pop {r4-r7} + pop {r0} + bx r0 + .align 2, 0 +_08091BAC: .4byte gTeamInventory_203B460 +_08091BB0: .4byte 0x00000251 + thumb_func_end sub_8091B20 + + thumb_func_start sub_8091BB4 +sub_8091BB4: + push {r4-r7,lr} + sub sp, 0x10 + lsls r0, 24 + lsrs r4, r0, 24 + mov r1, sp + ldr r0, _08091C14 + ldm r0!, {r2,r3,r5} + stm r1!, {r2,r3,r5} + ldr r0, [r0] + str r0, [r1] + movs r5, 0 +_08091BCA: + lsls r0, r5, 24 + lsrs r0, 24 + bl sub_8091A74 + adds r5, 0x1 + cmp r5, 0x3 + ble _08091BCA + lsls r7, r4, 2 + ldr r6, _08091C18 + movs r5, 0x3 +_08091BDE: + adds r0, r6, 0 + bl RandomCapped + adds r4, r0, 0 + adds r0, r6, 0 + bl RandomCapped + adds r2, r0, 0 + mov r1, sp + adds r0, r1, r7 + ldr r0, [r0] + adds r1, r4, 0 + bl sub_8091E94 + lsls r0, 24 + lsrs r0, 24 + bl sub_8091C1C + subs r5, 0x1 + cmp r5, 0 + bge _08091BDE + bl sub_8091B20 + add sp, 0x10 + pop {r4-r7} + pop {r0} + bx r0 + .align 2, 0 +_08091C14: .4byte gUnknown_81097F8 +_08091C18: .4byte 0x0000270f + thumb_func_end sub_8091BB4 + + thumb_func_start sub_8091C1C +sub_8091C1C: + push {r4,r5,lr} + sub sp, 0x4 + adds r1, r0, 0 + lsls r1, 24 + lsrs r1, 24 + mov r0, sp + bl sub_8090B08 + movs r3, 0 + ldr r5, _08091C54 + movs r4, 0x94 + lsls r4, 2 +_08091C34: + ldr r1, [r5] + lsls r2, r3, 2 + adds r0, r1, r2 + adds r0, r4 + ldrb r0, [r0] + cmp r0, 0 + bne _08091C58 + movs r3, 0x94 + lsls r3, 2 + adds r0, r1, r3 + adds r0, r2 + ldr r1, [sp] + str r1, [r0] + movs r0, 0 + b _08091C60 + .align 2, 0 +_08091C54: .4byte gTeamInventory_203B460 +_08091C58: + adds r3, 0x1 + cmp r3, 0x3 + ble _08091C34 + movs r0, 0x1 +_08091C60: + add sp, 0x4 + pop {r4,r5} + pop {r1} + bx r1 + thumb_func_end sub_8091C1C + + thumb_func_start sub_8091C68 +sub_8091C68: + push {r4-r6,lr} + sub sp, 0x10 + adds r3, r0, 0 + adds r2, r1, 0 + mov r0, sp + adds r1, r3, 0 + bl sub_809486C + movs r4, 0 + ldr r5, _08091D10 +_08091C7C: + lsls r0, r4, 2 + ldr r1, [r5] + adds r1, r0 + mov r0, sp + bl sub_8091E28 + adds r4, 0x1 + cmp r4, 0x13 + ble _08091C7C + ldr r6, _08091D10 + movs r5, 0x50 + movs r4, 0xEF +_08091C94: + ldr r1, [r6] + adds r1, r5 + mov r0, sp + movs r2, 0xA + bl sub_809488C + adds r5, 0x2 + subs r4, 0x1 + cmp r4, 0 + bge _08091C94 + ldr r6, _08091D10 + movs r5, 0x8C + lsls r5, 2 + movs r4, 0x7 +_08091CB0: + ldr r1, [r6] + adds r1, r5 + mov r0, sp + bl sub_8091DE0 + adds r5, 0x4 + subs r4, 0x1 + cmp r4, 0 + bge _08091CB0 + ldr r6, _08091D10 + movs r5, 0x94 + lsls r5, 2 + movs r4, 0x3 +_08091CCA: + ldr r1, [r6] + adds r1, r5 + mov r0, sp + bl sub_8091DE0 + adds r5, 0x4 + subs r4, 0x1 + cmp r4, 0 + bge _08091CCA + ldr r4, _08091D10 + ldr r1, [r4] + movs r0, 0x98 + lsls r0, 2 + adds r1, r0 + mov r0, sp + movs r2, 0x18 + bl sub_809488C + ldr r1, [r4] + movs r0, 0x99 + lsls r0, 2 + adds r1, r0 + mov r0, sp + movs r2, 0x18 + bl sub_809488C + mov r0, sp + bl nullsub_102 + ldr r0, [sp, 0x8] + add sp, 0x10 + pop {r4-r6} + pop {r1} + bx r1 + .align 2, 0 +_08091D10: .4byte gTeamInventory_203B460 + thumb_func_end sub_8091C68 + + thumb_func_start sub_8091D14 +sub_8091D14: + push {r4-r6,lr} + sub sp, 0x10 + adds r3, r0, 0 + adds r2, r1, 0 + mov r0, sp + adds r1, r3, 0 + bl sub_809485C + movs r4, 0 + ldr r5, _08091DBC +_08091D28: + lsls r0, r4, 2 + ldr r1, [r5] + adds r1, r0 + mov r0, sp + bl sub_8091E00 + adds r4, 0x1 + cmp r4, 0x13 + ble _08091D28 + ldr r6, _08091DBC + movs r5, 0x50 + movs r4, 0xEF +_08091D40: + ldr r1, [r6] + adds r1, r5 + mov r0, sp + movs r2, 0xA + bl sub_8094924 + adds r5, 0x2 + subs r4, 0x1 + cmp r4, 0 + bge _08091D40 + ldr r6, _08091DBC + movs r5, 0x8C + lsls r5, 2 + movs r4, 0x7 +_08091D5C: + ldr r1, [r6] + adds r1, r5 + mov r0, sp + bl sub_8091DC0 + adds r5, 0x4 + subs r4, 0x1 + cmp r4, 0 + bge _08091D5C + ldr r6, _08091DBC + movs r5, 0x94 + lsls r5, 2 + movs r4, 0x3 +_08091D76: + ldr r1, [r6] + adds r1, r5 + mov r0, sp + bl sub_8091DC0 + adds r5, 0x4 + subs r4, 0x1 + cmp r4, 0 + bge _08091D76 + ldr r4, _08091DBC + ldr r1, [r4] + movs r0, 0x98 + lsls r0, 2 + adds r1, r0 + mov r0, sp + movs r2, 0x18 + bl sub_8094924 + ldr r1, [r4] + movs r0, 0x99 + lsls r0, 2 + adds r1, r0 + mov r0, sp + movs r2, 0x18 + bl sub_8094924 + mov r0, sp + bl nullsub_102 + ldr r0, [sp, 0x8] + add sp, 0x10 + pop {r4-r6} + pop {r1} + bx r1 + .align 2, 0 +_08091DBC: .4byte gTeamInventory_203B460 + thumb_func_end sub_8091D14 + + thumb_func_start sub_8091DC0 +sub_8091DC0: + push {r4,r5,lr} + adds r5, r0, 0 + adds r4, r1, 0 + movs r2, 0x8 + bl sub_8094924 + adds r4, 0x1 + adds r0, r5, 0 + adds r1, r4, 0 + movs r2, 0x7 + bl sub_8094924 + pop {r4,r5} + pop {r0} + bx r0 + thumb_func_end sub_8091DC0 + + thumb_func_start sub_8091DE0 +sub_8091DE0: + push {r4,r5,lr} + adds r5, r0, 0 + adds r4, r1, 0 + movs r2, 0x8 + bl sub_809488C + adds r4, 0x1 + adds r0, r5, 0 + adds r1, r4, 0 + movs r2, 0x7 + bl sub_809488C + pop {r4,r5} + pop {r0} + bx r0 + thumb_func_end sub_8091DE0 + + thumb_func_start sub_8091E00 +sub_8091E00: + push {r4,r5,lr} + adds r4, r0, 0 + adds r5, r1, 0 + movs r2, 0x8 + bl sub_8094924 + adds r1, r5, 0x1 + adds r0, r4, 0 + movs r2, 0x7 + bl sub_8094924 + adds r5, 0x2 + adds r0, r4, 0 + adds r1, r5, 0 + movs r2, 0x8 + bl sub_8094924 + pop {r4,r5} + pop {r0} + bx r0 + thumb_func_end sub_8091E00 + + thumb_func_start sub_8091E28 +sub_8091E28: + push {r4,r5,lr} + adds r4, r0, 0 + adds r5, r1, 0 + movs r2, 0x8 + bl sub_809488C + adds r1, r5, 0x1 + adds r0, r4, 0 + movs r2, 0x7 + bl sub_809488C + adds r5, 0x2 + adds r0, r4, 0 + adds r1, r5, 0 + movs r2, 0x8 + bl sub_809488C + pop {r4,r5} + pop {r0} + bx r0 + thumb_func_end sub_8091E28 + + thumb_func_start sub_8091E50 +sub_8091E50: + lsls r0, 24 + ldr r1, _08091E5C + lsrs r0, 22 + adds r0, r1 + ldr r0, [r0] + bx lr + .align 2, 0 +_08091E5C: .4byte gUnknown_810AF50 + thumb_func_end sub_8091E50 + + thumb_func_start sub_8091E60 +sub_8091E60: + push {r4,lr} + lsls r0, 24 + lsrs r3, r0, 24 + lsls r0, r1, 24 + lsrs r4, r0, 24 + cmp r3, 0x3E + bhi _08091E8C + ldr r2, _08091E88 + lsrs r0, 27 + lsls r1, r3, 5 + adds r0, r1 + adds r0, r2 + ldrb r0, [r0] + movs r1, 0x7 + ands r1, r4 + asrs r0, r1 + movs r1, 0x1 + ands r0, r1 + b _08091E8E + .align 2, 0 +_08091E88: .4byte gUnknown_8108F64 +_08091E8C: + movs r0, 0 +_08091E8E: + pop {r4} + pop {r1} + bx r1 + thumb_func_end sub_8091E60 + + thumb_func_start sub_8091E94 +sub_8091E94: + push {r4-r7,lr} + mov r7, r10 + mov r6, r9 + mov r5, r8 + push {r5-r7} + ldr r4, _08091EE4 + add sp, r4 + mov r8, r1 + mov r10, r2 + ldr r1, _08091EE8 + subs r0, 0x1 + lsls r0, 2 + adds r0, r1 + movs r3, 0 + add r1, sp, 0x18 + mov r9, r1 + ldr r2, _08091EEC + mov r12, r2 + add r6, sp, 0x1F8 + ldr r2, [r0] + adds r7, r6, 0 + movs r4, 0 +_08091EC0: + ldrh r1, [r2] + cmp r1, r12 + bls _08091EF4 + ldrh r0, [r2] + ldr r1, _08091EF0 + adds r0, r1 + cmp r0, 0 + beq _08091EFC + movs r5, 0 + adds r1, r7, r4 +_08091ED4: + strh r5, [r1] + adds r1, 0x2 + adds r4, 0x2 + adds r3, 0x1 + subs r0, 0x1 + cmp r0, 0 + bne _08091ED4 + b _08091EFC + .align 2, 0 +_08091EE4: .4byte 0xfffffc10 +_08091EE8: .4byte gUnknown_8108E58 +_08091EEC: .4byte 0x0000752f +_08091EF0: .4byte 0xffff8ad0 +_08091EF4: + adds r0, r6, r4 + strh r1, [r0] + adds r4, 0x2 + adds r3, 0x1 +_08091EFC: + adds r2, 0x2 + cmp r3, 0xFB + ble _08091EC0 + movs r3, 0xB + add r2, sp, 0x1F8 + mov r1, sp +_08091F08: + ldrh r0, [r2] + strh r0, [r1] + adds r2, 0x2 + adds r1, 0x2 + subs r3, 0x1 + cmp r3, 0 + bge _08091F08 + mov r2, r9 + add r1, sp, 0x210 + movs r3, 0xEF +_08091F1C: + ldrh r0, [r1] + strh r0, [r2] + adds r1, 0x2 + adds r2, 0x2 + subs r3, 0x1 + cmp r3, 0 + bge _08091F1C + movs r7, 0xC + movs r6, 0 + mov r0, sp + movs r2, 0 + ldrsh r0, [r0, r2] + cmp r0, 0 + beq _08091F4A + mov r0, sp + movs r1, 0 + ldrsh r0, [r0, r1] + cmp r0, r8 + blt _08091F4A + movs r7, 0 + b _08091F66 +_08091F46: + mov r8, r5 + b _08091F9C +_08091F4A: + adds r6, 0x1 + cmp r6, 0xB + bgt _08091F66 + lsls r0, r6, 1 + mov r2, sp + adds r1, r2, r0 + movs r2, 0 + ldrsh r0, [r1, r2] + cmp r0, 0 + beq _08091F4A + cmp r0, r8 + blt _08091F4A + lsls r0, r6, 24 + lsrs r7, r0, 24 +_08091F66: + movs r0, 0x46 + mov r8, r0 + cmp r7, 0xC + beq _08091F9C + movs r6, 0 + mov r4, r9 +_08091F72: + movs r1, 0 + ldrsh r0, [r4, r1] + cmp r0, 0 + beq _08091F94 + lsls r0, r6, 24 + lsrs r5, r0, 24 + adds r0, r5, 0 + bl GetItemType + lsls r0, 24 + lsrs r0, 24 + cmp r0, r7 + bne _08091F94 + movs r2, 0 + ldrsh r0, [r4, r2] + cmp r0, r10 + bge _08091F46 +_08091F94: + adds r4, 0x2 + adds r6, 0x1 + cmp r6, 0xEF + ble _08091F72 +_08091F9C: + mov r0, r8 + movs r3, 0xFC + lsls r3, 2 + add sp, r3 + pop {r3-r5} + mov r8, r3 + mov r9, r4 + mov r10, r5 + pop {r4-r7} + pop {r1} + bx r1 + thumb_func_end sub_8091E94 + + thumb_func_start sub_8091FB4 +sub_8091FB4: + push {r4-r6,lr} + movs r6, 0 +_08091FB8: + ldr r0, _08092038 + lsls r1, r6, 2 + ldr r0, [r0] + adds r4, r0, r1 + ldrb r1, [r4] + movs r0, 0x1 + ands r0, r1 + cmp r0, 0 + beq _08091FE8 + movs r0, 0xF7 + ands r0, r1 + movs r5, 0 + strb r0, [r4] + ldrb r0, [r4, 0x2] + cmp r0, 0x69 + bne _08091FE8 + adds r0, r4, 0 + bl GetMoneyValue + bl AddToTeamMoney + strb r5, [r4, 0x2] + strb r5, [r4, 0x1] + strb r5, [r4] +_08091FE8: + adds r6, 0x1 + cmp r6, 0x13 + ble _08091FB8 + bl FillInventoryGaps + movs r6, 0 +_08091FF4: + movs r0, 0x58 + adds r1, r6, 0 + muls r1, r0 + ldr r0, _0809203C + ldr r0, [r0] + adds r2, r1, r0 + ldrb r1, [r2] + movs r0, 0x1 + ands r0, r1 + cmp r0, 0 + beq _08092026 + adds r4, r2, 0 + adds r4, 0x28 + ldrb r0, [r4] + cmp r0, 0 + beq _08092026 + cmp r0, 0x69 + bne _08092026 + adds r0, r4, 0 + bl GetMoneyValue2 + bl AddToTeamMoney + movs r0, 0 + strb r0, [r4] +_08092026: + adds r6, 0x1 + movs r0, 0xCE + lsls r0, 1 + cmp r6, r0 + ble _08091FF4 + pop {r4-r6} + pop {r0} + bx r0 + .align 2, 0 +_08092038: .4byte gTeamInventory_203B460 +_0809203C: .4byte gRecruitedPokemonRef + thumb_func_end sub_8091FB4 + + .align 2,0 diff --git a/asm/kangaskhan_storage.s b/asm/kangaskhan_storage.s index cdd121a..58d18fd 100644 --- a/asm/kangaskhan_storage.s +++ b/asm/kangaskhan_storage.s @@ -389,7 +389,7 @@ _0801731C: _0801733C: .4byte gUnknown_203B208 _08017340: .4byte gUnknown_80D5404 _08017344: - bl sub_8090A34 + bl GetNumberOfFilledInventorySlots cmp r0, 0 bne _0801735C bl sub_801A928 @@ -508,7 +508,7 @@ _08017404: movs r0, 0x63 b _0801743A .align 2, 0 -_08017430: .4byte gUnknown_203B460 +_08017430: .4byte gTeamInventory_203B460 _08017434: adds r1, r2, 0 adds r1, 0xB4 @@ -634,7 +634,7 @@ _08017530: lsls r0, 24 cmp r0, 0 bne _08017544 - bl sub_8090A34 + bl GetNumberOfFilledInventorySlots cmp r0, 0x13 ble _08017554 _08017544: diff --git a/asm/kangaskhan_storage_1.s b/asm/kangaskhan_storage_1.s index 190c3ce..29c152c 100644 --- a/asm/kangaskhan_storage_1.s +++ b/asm/kangaskhan_storage_1.s @@ -328,7 +328,7 @@ _08017858: beq _080178BA b _080178C8 _08017862: - bl sub_8090A34 + bl GetNumberOfFilledInventorySlots cmp r0, 0 bne _08017872 movs r0, 0x5 @@ -357,7 +357,7 @@ _0801788E: bl UpdateKangaskhanStorageState b _080178C8 _080178A2: - bl sub_8090A34 + bl GetNumberOfFilledInventorySlots cmp r0, 0x13 ble _080178B2 movs r0, 0x6 @@ -407,8 +407,8 @@ _080178F4: bl sub_80917B8 ldr r0, [r4] ldr r0, [r0, 0x10] - bl sub_80911F8 - bl sub_80910B4 + bl ShiftItemsDownFrom + bl FillInventoryGaps movs r0, 0x13 bl UpdateKangaskhanStorageState b _0801791E @@ -475,7 +475,7 @@ _0801794C: bl UpdateKangaskhanStorageState b _080179A2 .align 2, 0 -_0801798C: .4byte gUnknown_203B460 +_0801798C: .4byte gTeamInventory_203B460 _08017990: .4byte gUnknown_203B208 _08017994: .4byte 0xffffff00 _08017998: .4byte 0xffff00ff @@ -531,13 +531,13 @@ _080179F2: adds r5, 0x1 cmp r5, 0x13 ble _080179D2 - bl sub_80910B4 + bl FillInventoryGaps bl sub_801AE84 movs r0, 0x13 bl UpdateKangaskhanStorageState b _08017A12 .align 2, 0 -_08017A08: .4byte gUnknown_203B460 +_08017A08: .4byte gTeamInventory_203B460 _08017A0C: movs r0, 0xE bl UpdateKangaskhanStorageState @@ -585,7 +585,7 @@ _08017A44: str r0, [sp, 0x4] add r4, sp, 0x4 ldrb r0, [r4] - bl sub_8090A60 + bl IsThrowableItem lsls r0, 24 cmp r0, 0 beq _08017AA2 @@ -606,7 +606,7 @@ _08017A44: .align 2, 0 _08017A88: .4byte 0xffff00ff _08017A8C: .4byte 0xffffff00 -_08017A90: .4byte gUnknown_203B460 +_08017A90: .4byte gTeamInventory_203B460 _08017A94: lsls r1, 24 lsrs r1, 16 @@ -643,13 +643,13 @@ _08017ACE: adds r5, 0x1 cmp r5, 0xEF ble _08017A44 - bl sub_80910B4 + bl FillInventoryGaps bl sub_801CF94 movs r0, 0x1D bl UpdateKangaskhanStorageState b _08017AEE .align 2, 0 -_08017AE4: .4byte gUnknown_203B460 +_08017AE4: .4byte gTeamInventory_203B460 _08017AE8: movs r0, 0x17 bl UpdateKangaskhanStorageState diff --git a/asm/kangaskhan_storage_2.s b/asm/kangaskhan_storage_2.s index efdac5f..58c8bc6 100644 --- a/asm/kangaskhan_storage_2.s +++ b/asm/kangaskhan_storage_2.s @@ -24,7 +24,7 @@ sub_80182E4: str r0, [r1, 0x20] movs r0, 0x2 str r0, [r1, 0x24] - bl sub_8090A34 + bl GetNumberOfFilledInventorySlots cmp r0, 0 beq _0801831C movs r0, 0 @@ -59,7 +59,7 @@ _08018324: lsls r0, 24 cmp r0, 0 bne _08018358 - bl sub_8090A34 + bl GetNumberOfFilledInventorySlots cmp r0, 0x13 ble _08018366 _08018358: @@ -276,7 +276,7 @@ sub_80184D4: str r0, [r1, 0x20] movs r0, 0x3 str r0, [r1, 0x24] - bl sub_8090A34 + bl GetNumberOfFilledInventorySlots cmp r0, 0x13 ble _08018500 ldr r0, [r4] @@ -394,7 +394,7 @@ _080185C8: beq _080185EA b _08018616 _080185CE: - bl sub_8090A34 + bl GetNumberOfFilledInventorySlots cmp r0, 0 beq _080185F6 movs r0, 0 @@ -476,9 +476,9 @@ _0801866A: adds r5, 0x1 cmp r5, 0x13 ble _0801864A - bl sub_80910B4 + bl FillInventoryGaps bl sub_801AE84 - bl sub_8090A34 + bl GetNumberOfFilledInventorySlots cmp r0, 0 bne _08018690 bl sub_801A928 @@ -486,7 +486,7 @@ _0801866A: bl sub_8017F10 b _080186F2 .align 2, 0 -_0801868C: .4byte gUnknown_203B460 +_0801868C: .4byte gTeamInventory_203B460 _08018690: movs r0, 0x5 bl sub_8017F10 @@ -507,7 +507,7 @@ _08018698: b _080186F2 .align 2, 0 _080186B8: .4byte gUnknown_203B20C -_080186BC: .4byte gUnknown_203B460 +_080186BC: .4byte gTeamInventory_203B460 _080186C0: bl sub_801A8AC ldr r1, _080186E0 @@ -524,7 +524,7 @@ _080186C0: b _080186F2 .align 2, 0 _080186E0: .4byte gUnknown_203B20C -_080186E4: .4byte gUnknown_203B460 +_080186E4: .4byte gTeamInventory_203B460 _080186E8: bl sub_801A928 movs r0, 0x1 @@ -578,7 +578,7 @@ _0801872C: orrs r0, r4 str r0, [sp] ldrb r0, [r5] - bl sub_8090A60 + bl IsThrowableItem lsls r0, 24 cmp r0, 0 beq _08018786 @@ -599,7 +599,7 @@ _0801872C: .align 2, 0 _0801876C: .4byte 0xffff00ff _08018770: .4byte 0xffffff00 -_08018774: .4byte gUnknown_203B460 +_08018774: .4byte gTeamInventory_203B460 _08018778: lsls r1, 24 lsrs r1, 16 @@ -636,21 +636,21 @@ _080187B2: adds r6, 0x1 cmp r6, 0xEF ble _0801872C - bl sub_80910B4 + bl FillInventoryGaps bl sub_801CF94 movs r0, 0x1 bl sub_801CF14 lsls r0, 24 cmp r0, 0 bne _08018838 - bl sub_8090A34 + bl GetNumberOfFilledInventorySlots cmp r0, 0x13 bgt _08018838 movs r0, 0xB bl sub_8017F10 b _0801884A .align 2, 0 -_080187DC: .4byte gUnknown_203B460 +_080187DC: .4byte gTeamInventory_203B460 _080187E0: bl sub_801CB24 ldr r4, _08018808 @@ -760,7 +760,7 @@ sub_8018854: lsls r0, 24 cmp r0, 0 bne _080188D2 - bl sub_8090A34 + bl GetNumberOfFilledInventorySlots cmp r0, 0x13 ble _080188F0 _080188D2: @@ -770,7 +770,7 @@ _080188D2: b _080188FC .align 2, 0 _080188E0: .4byte gUnknown_203B20C -_080188E4: .4byte gUnknown_203B460 +_080188E4: .4byte gTeamInventory_203B460 _080188E8: .4byte 0xffffff00 _080188EC: .4byte 0xffff00ff _080188F0: @@ -828,7 +828,7 @@ _0801894E: ldr r4, _08018978 ldr r0, [r4] ldrb r0, [r0, 0xA] - bl sub_8091524 + bl IsNotMoneyOrUsedTMItem lsls r0, 24 cmp r0, 0 beq _0801896C @@ -852,9 +852,9 @@ _0801897C: bl sub_80917B8 ldr r0, [r4] ldr r0, [r0, 0xC] - bl sub_80911F8 - bl sub_80910B4 - bl sub_8090A34 + bl ShiftItemsDownFrom + bl FillInventoryGaps + bl GetNumberOfFilledInventorySlots cmp r0, 0 bne _080189A4 bl sub_801A928 @@ -920,7 +920,7 @@ _08018A0C: beq _08018AB0 b _08018ABE _08018A12: - bl sub_8090A34 + bl GetNumberOfFilledInventorySlots cmp r0, 0x13 ble _08018A2C ldr r0, _08018A28 @@ -935,7 +935,7 @@ _08018A2C: ldr r4, _08018A44 ldr r0, [r4] ldrb r0, [r0, 0xA] - bl sub_8090A60 + bl IsThrowableItem lsls r0, 24 cmp r0, 0 beq _08018A48 @@ -975,7 +975,7 @@ _08018A48: lsls r0, 24 cmp r0, 0 bne _08018A90 - bl sub_8090A34 + bl GetNumberOfFilledInventorySlots cmp r0, 0x13 ble _08018AA8 _08018A90: @@ -984,7 +984,7 @@ _08018A90: bl sub_8017F10 b _08018ABE .align 2, 0 -_08018A9C: .4byte gUnknown_203B460 +_08018A9C: .4byte gTeamInventory_203B460 _08018AA0: .4byte 0xffffff00 _08018AA4: .4byte 0xffff00ff _08018AA8: diff --git a/asm/kecleon_items.s b/asm/kecleon_items.s index 1902345..044ae99 100644 --- a/asm/kecleon_items.s +++ b/asm/kecleon_items.s @@ -489,7 +489,7 @@ _080192B4: .align 2, 0 _080192BC: .4byte gUnknown_203B210 _080192C0: - bl sub_8090A34 + bl GetNumberOfFilledInventorySlots cmp r0, 0x13 ble _080192EC ldr r0, _080192D8 @@ -636,7 +636,7 @@ _080193F4: bl sub_801B3C0 b _080194E8 _080193FE: - bl sub_8090A34 + bl GetNumberOfFilledInventorySlots cmp r0, 0 beq _08019418 ldr r0, _08019424 @@ -655,7 +655,7 @@ _08019418: movs r0, 0x1 b _08019436 .align 2, 0 -_08019424: .4byte gUnknown_203B460 +_08019424: .4byte gTeamInventory_203B460 _08019428: .4byte 0x0001869e _0801942C: .4byte gUnknown_203B210 _08019430: @@ -1099,7 +1099,7 @@ _08019784: bl UpdateKecleonStoreState b _0801984A _08019794: - bl sub_8090A34 + bl GetNumberOfFilledInventorySlots cmp r0, 0x13 ble _080197A4 movs r0, 0xA @@ -1110,7 +1110,7 @@ _080197A4: bl UpdateKecleonStoreState b _0801984A _080197AC: - bl sub_8090A34 + bl GetNumberOfFilledInventorySlots cmp r0, 0 beq _080197EC ldr r0, _080197D8 @@ -1132,10 +1132,10 @@ _080197AC: b _0801984A .align 2, 0 _080197D8: .4byte gUnknown_203B210 -_080197DC: .4byte gUnknown_203B460 +_080197DC: .4byte gTeamInventory_203B460 _080197E0: .4byte 0x0001869e _080197E4: - bl sub_8090A34 + bl GetNumberOfFilledInventorySlots cmp r0, 0 bne _080197F4 _080197EC: @@ -1171,7 +1171,7 @@ _08019822: bl UpdateKecleonStoreState b _0801984A .align 2, 0 -_0801982C: .4byte gUnknown_203B460 +_0801982C: .4byte gTeamInventory_203B460 _08019830: .4byte 0x0001869f _08019834: movs r0, 0x1F @@ -1215,7 +1215,7 @@ _08019874: ldr r0, [r4] ldr r0, [r0, 0x10] negs r0, r0 - bl sub_80913A0 + bl AddToTeamMoney ldr r1, [r4] ldrb r0, [r1, 0x4] cmp r0, 0 @@ -1285,10 +1285,10 @@ _0801990C: ldr r4, _08019930 ldr r0, [r4] ldr r0, [r0, 0x10] - bl sub_80913A0 + bl AddToTeamMoney ldr r0, [r4] ldr r0, [r0, 0x24] - bl sub_80911F8 + bl ShiftItemsDownFrom movs r0, 0xA6 lsls r0, 1 bl PlaySound @@ -1340,21 +1340,21 @@ _0801996C: cmp r0, 0 beq _0801998E ldrb r0, [r2, 0x2] - bl sub_80914E4 + bl CanSellItem lsls r0, 24 cmp r0, 0 beq _0801998E adds r0, r4, 0 - bl sub_8091234 + bl ClearItemSlotAt _0801998E: adds r4, 0x1 cmp r4, 0x13 ble _0801996C - bl sub_80910B4 + bl FillInventoryGaps ldr r0, _080199B8 ldr r0, [r0] ldr r0, [r0, 0x18] - bl sub_80913A0 + bl AddToTeamMoney movs r0, 0xA6 lsls r0, 1 bl PlaySound @@ -1362,7 +1362,7 @@ _0801998E: bl UpdateKecleonStoreState b _080199C2 .align 2, 0 -_080199B4: .4byte gUnknown_203B460 +_080199B4: .4byte gTeamInventory_203B460 _080199B8: .4byte gUnknown_203B210 _080199BC: movs r0, 0x1 @@ -1445,7 +1445,7 @@ _08019A3C: strb r0, [r1, 0x1D] ldr r0, [r4] adds r0, 0x1C - bl sub_8090C7C + bl GetStackBuyPrice ldr r1, [r4] str r0, [r1, 0x10] movs r0, 0x14 @@ -1492,7 +1492,7 @@ _08019AA4: strb r0, [r1, 0x1D] ldr r0, [r4] adds r0, 0x1C - bl sub_8090C7C + bl GetStackBuyPrice ldr r1, [r4] str r0, [r1, 0x10] movs r0, 0x15 diff --git a/asm/other_menus.s b/asm/other_menus.s index 6cefea7..676ba9a 100644 --- a/asm/other_menus.s +++ b/asm/other_menus.s @@ -1299,7 +1299,7 @@ _08037E5A: ldrb r0, [r4] b _08037E76 .align 2, 0 -_08037E6C: .4byte gUnknown_203B460 +_08037E6C: .4byte gTeamInventory_203B460 _08037E70: ldr r0, _08037E8C ldr r1, [r0] @@ -1316,7 +1316,7 @@ _08037E76: pop {r0} bx r0 .align 2, 0 -_08037E8C: .4byte gUnknown_203B460 +_08037E8C: .4byte gTeamInventory_203B460 thumb_func_end sub_8037E38 thumb_func_start sub_8037E90 @@ -1543,7 +1543,7 @@ _08038036: ldrb r0, [r4] b _08038052 .align 2, 0 -_08038048: .4byte gUnknown_203B460 +_08038048: .4byte gTeamInventory_203B460 _0803804C: ldr r0, _08038070 ldr r1, [r0] @@ -1566,7 +1566,7 @@ _08038068: pop {r1} bx r1 .align 2, 0 -_08038070: .4byte gUnknown_203B460 +_08038070: .4byte gTeamInventory_203B460 _08038074: .4byte 0x000003e7 thumb_func_end sub_8038014 diff --git a/asm/pokemon_3.s b/asm/pokemon_3.s index a008794..50a9aec 100644 --- a/asm/pokemon_3.s +++ b/asm/pokemon_3.s @@ -1094,7 +1094,7 @@ _0808F5C8: b _0808F5E6 _0808F5D0: ldrb r0, [r7, 0x4] - bl sub_8091130 + bl FindItemInInventory cmp r0, 0 bge _0808F5E6 ldrh r0, [r4, 0x4] @@ -1184,7 +1184,7 @@ _0808F666: _0808F670: movs r0, 0x31 _0808F672: - bl sub_8091130 + bl FindItemInInventory cmp r0, 0 bge _0808F6CA ldrh r0, [r4, 0x4] @@ -1225,7 +1225,7 @@ _0808F6A4: b _0808F6DE _0808F6BC: movs r0, 0x2F - bl sub_8091130 + bl FindItemInInventory cmp r0, 0 bge _0808F6CA movs r0, 0x1 @@ -1484,7 +1484,7 @@ _0808F8A0: str r5, [sp] movs r1, 0 ldr r3, [sp, 0x50] - bl sub_8014FF0 + bl xxx_format_and_draw ldr r4, _0808F99C mov r1, r10 ldr r0, [r1, 0x2C] @@ -1497,7 +1497,7 @@ _0808F8A0: movs r0, 0x4 mov r1, r9 ldr r3, [sp, 0x50] - bl sub_8014FF0 + bl xxx_format_and_draw movs r2, 0xA add r9, r2 ldr r0, _0808F9A4 @@ -1506,7 +1506,7 @@ _0808F8A0: movs r0, 0x4 mov r1, r9 ldr r3, [sp, 0x50] - bl sub_8014FF0 + bl xxx_format_and_draw movs r3, 0xA add r9, r3 mov r0, r10 @@ -1529,7 +1529,7 @@ _0808F8A0: movs r0, 0x4 mov r1, r9 ldr r3, [sp, 0x50] - bl sub_8014FF0 + bl xxx_format_and_draw _0808F914: movs r3, 0xC add r9, r3 @@ -1544,7 +1544,7 @@ _0808F914: movs r0, 0x4 mov r1, r9 ldr r3, [sp, 0x50] - bl sub_8014FF0 + bl xxx_format_and_draw movs r2, 0xA add r9, r2 ldr r0, _0808F9B0 @@ -1553,7 +1553,7 @@ _0808F914: movs r0, 0x4 mov r1, r9 ldr r3, [sp, 0x50] - bl sub_8014FF0 + bl xxx_format_and_draw ldr r0, _0808F9B4 ldr r2, [r0] mov r0, r10 @@ -1574,7 +1574,7 @@ _0808F964: movs r0, 0x4 mov r1, r9 ldr r3, [sp, 0x50] - bl sub_8014FF0 + bl xxx_format_and_draw mov r1, r10 adds r1, 0x3B ldrb r3, [r1] @@ -1592,7 +1592,7 @@ _0808F964: movs r0, 0x4 mov r1, r9 ldr r3, [sp, 0x50] - bl sub_8014FF0 + bl xxx_format_and_draw b _0808F9D8 .align 2, 0 _0808F998: .4byte gUnknown_8107754 @@ -1616,7 +1616,7 @@ _0808F9C0: movs r0, 0x4 mov r1, r9 ldr r3, [sp, 0x50] - bl sub_8014FF0 + bl xxx_format_and_draw _0808F9D8: movs r3, 0xA add r9, r3 @@ -1627,7 +1627,7 @@ _0808F9D8: movs r0, 0x4 mov r1, r9 ldr r3, [sp, 0x50] - bl sub_8014FF0 + bl xxx_format_and_draw ldr r0, _0808FA4C ldr r2, [r0] ldr r4, _0808FA50 @@ -1649,7 +1649,7 @@ _0808FA0E: movs r0, 0x4 mov r1, r9 ldr r3, [sp, 0x50] - bl sub_8014FF0 + bl xxx_format_and_draw mov r1, r10 adds r1, 0x3C ldrb r3, [r1] @@ -1667,7 +1667,7 @@ _0808FA0E: movs r0, 0x4 mov r1, r9 ldr r3, [sp, 0x50] - bl sub_8014FF0 + bl xxx_format_and_draw b _0808FA74 .align 2, 0 _0808FA44: .4byte gUnknown_810DE38 @@ -1687,7 +1687,7 @@ _0808FA5C: movs r0, 0x4 mov r1, r9 ldr r3, [sp, 0x50] - bl sub_8014FF0 + bl xxx_format_and_draw _0808FA74: movs r0, 0xA add r9, r0 @@ -1719,7 +1719,7 @@ _0808FAA6: movs r0, 0x4 mov r1, r9 ldr r3, [sp, 0x50] - bl sub_8014FF0 + bl xxx_format_and_draw movs r1, 0xC add r9, r1 ldr r1, _0808FB30 @@ -1754,7 +1754,7 @@ _0808FAE0: movs r0, 0x4 mov r1, r9 ldr r3, [sp, 0x50] - bl sub_8014FF0 + bl xxx_format_and_draw movs r2, 0xA add r9, r2 mov r0, r10 @@ -1789,13 +1789,13 @@ _0808FB44: str r4, [sp] movs r1, 0 ldr r3, [sp, 0x50] - bl sub_8014FF0 + bl xxx_format_and_draw ldr r2, _0808FBEC str r4, [sp] movs r0, 0x4 mov r1, r9 ldr r3, [sp, 0x50] - bl sub_8014FF0 + bl xxx_format_and_draw mov r3, r10 ldrb r0, [r3, 0x16] bl GetFormattedTypeString @@ -1804,7 +1804,7 @@ _0808FB44: movs r0, 0x38 mov r1, r9 ldr r3, [sp, 0x50] - bl sub_8014FF0 + bl xxx_format_and_draw mov r1, r10 ldrb r0, [r1, 0x17] cmp r0, 0 @@ -1815,7 +1815,7 @@ _0808FB44: movs r0, 0x60 mov r1, r9 ldr r3, [sp, 0x50] - bl sub_8014FF0 + bl xxx_format_and_draw _0808FB94: movs r2, 0xC add r9, r2 @@ -1824,7 +1824,7 @@ _0808FB94: movs r0, 0x4 mov r1, r9 ldr r3, [sp, 0x50] - bl sub_8014FF0 + bl xxx_format_and_draw movs r3, 0xC add r9, r3 mov r1, r10 @@ -1867,7 +1867,7 @@ _0808FBF4: movs r1, 0 str r1, [sp] ldr r3, [sp, 0x50] - bl sub_8014FF0 + bl xxx_format_and_draw mov r0, r10 adds r0, 0x56 movs r1, 0 @@ -1915,7 +1915,7 @@ _0808FC38: movs r0, 0xC mov r1, r9 ldr r3, [sp, 0x50] - bl sub_8014FF0 + bl xxx_format_and_draw mov r0, r8 cmp r0, 0 ble _0808FC78 @@ -1960,7 +1960,7 @@ _0808FCB0: movs r1, 0 str r1, [sp] ldr r3, [sp, 0x50] - bl sub_8014FF0 + bl xxx_format_and_draw add r4, sp, 0x14 mov r0, r10 movs r2, 0x3E @@ -2044,7 +2044,7 @@ _0808FD64: movs r0, 0xC mov r1, r9 ldr r3, [sp, 0x50] - bl sub_8014FF0 + bl xxx_format_and_draw _0808FD74: movs r2, 0x1 add r8, r2 @@ -2071,7 +2071,7 @@ _0808FD98: movs r0, 0xC movs r1, 0x20 ldr r3, [sp, 0x50] - bl sub_8014FF0 + bl xxx_format_and_draw b _0808FED6 .align 2, 0 _0808FDA4: .4byte gUnknown_810778C @@ -2085,7 +2085,7 @@ _0808FDB0: str r5, [sp] movs r1, 0 ldr r3, [sp, 0x50] - bl sub_8014FF0 + bl xxx_format_and_draw ldr r6, _0808FEF0 mov r2, r10 movs r3, 0 @@ -2103,7 +2103,7 @@ _0808FDB0: movs r0, 0x4 mov r1, r9 ldr r3, [sp, 0x50] - bl sub_8014FF0 + bl xxx_format_and_draw movs r0, 0xA add r9, r0 mov r1, r10 @@ -2124,7 +2124,7 @@ _0808FDB0: movs r0, 0x4 mov r1, r9 ldr r3, [sp, 0x50] - bl sub_8014FF0 + bl xxx_format_and_draw movs r3, 0xA add r9, r3 ldr r0, _0808FF04 @@ -2133,7 +2133,7 @@ _0808FDB0: movs r0, 0x4 mov r1, r9 ldr r3, [sp, 0x50] - bl sub_8014FF0 + bl xxx_format_and_draw movs r0, 0xD add r9, r0 ldr r0, _0808FF08 @@ -2142,7 +2142,7 @@ _0808FDB0: movs r0, 0x4 mov r1, r9 ldr r3, [sp, 0x50] - bl sub_8014FF0 + bl xxx_format_and_draw movs r1, 0xA add r9, r1 mov r1, r10 @@ -2155,7 +2155,7 @@ _0808FDB0: movs r0, 0x4 mov r1, r9 ldr r3, [sp, 0x50] - bl sub_8014FF0 + bl xxx_format_and_draw movs r2, 0xD add r9, r2 mov r3, r10 @@ -2172,7 +2172,7 @@ _0808FDB0: movs r0, 0x4 mov r1, r9 ldr r3, [sp, 0x50] - bl sub_8014FF0 + bl xxx_format_and_draw movs r2, 0xD add r9, r2 ldr r4, _0808FF14 @@ -2192,7 +2192,7 @@ _0808FDB0: movs r0, 0x4 mov r1, r9 ldr r3, [sp, 0x50] - bl sub_8014FF0 + bl xxx_format_and_draw movs r2, 0xD add r9, r2 ldr r1, _0808FF1C @@ -2207,7 +2207,7 @@ _0808FECC: movs r0, 0x4 mov r1, r9 ldr r3, [sp, 0x50] - bl sub_8014FF0 + bl xxx_format_and_draw _0808FED6: ldr r0, [sp, 0x50] bl sub_80073E0 diff --git a/asm/pokemon_square.s b/asm/pokemon_square.s index c2618bc..c09d8bc 100644 --- a/asm/pokemon_square.s +++ b/asm/pokemon_square.s @@ -132,7 +132,7 @@ _08019F24: orrs r1, r0 str r1, [sp] mov r0, sp - bl sub_8090C7C + bl GetStackBuyPrice ldr r1, _08019F70 ldr r1, [r1] movs r2, 0x98 @@ -147,7 +147,7 @@ _08019F24: .align 2, 0 _08019F68: .4byte 0xff00ffff _08019F6C: .4byte 0xffff00ff -_08019F70: .4byte gUnknown_203B460 +_08019F70: .4byte gTeamInventory_203B460 _08019F74: movs r0, 0 bl PlayMenuSoundEffect @@ -406,7 +406,7 @@ _0801A122: adds r2, r5, 0 bl sub_8090E14 adds r0, r4, 0 - bl sub_8090C7C + bl GetStackBuyPrice ldr r1, _0801A1B8 ldr r1, [r1] movs r2, 0x98 @@ -433,7 +433,7 @@ _0801A1A8: .4byte gUnknown_80DB8E4 _0801A1AC: .4byte 0xff00ffff _0801A1B0: .4byte 0xffff00ff _0801A1B4: .4byte 0xffffff00 -_0801A1B8: .4byte gUnknown_203B460 +_0801A1B8: .4byte gTeamInventory_203B460 _0801A1BC: mov r0, r8 ldr r1, _0801A204 @@ -600,7 +600,7 @@ _0801A2F0: orrs r1, r0 str r1, [sp] mov r0, sp - bl sub_8090C7C + bl GetStackBuyPrice ldr r1, _0801A33C ldr r1, [r1] movs r2, 0x98 @@ -615,7 +615,7 @@ _0801A2F0: .align 2, 0 _0801A334: .4byte 0xff00ffff _0801A338: .4byte 0xffff00ff -_0801A33C: .4byte gUnknown_203B460 +_0801A33C: .4byte gTeamInventory_203B460 _0801A340: movs r0, 0 bl PlayMenuSoundEffect @@ -874,7 +874,7 @@ _0801A4EE: adds r2, r5, 0 bl sub_8090E14 adds r0, r4, 0 - bl sub_8090C7C + bl GetStackBuyPrice ldr r1, _0801A584 ldr r1, [r1] movs r2, 0x98 @@ -901,7 +901,7 @@ _0801A574: .4byte gUnknown_80DB92C _0801A578: .4byte 0xff00ffff _0801A57C: .4byte 0xffff00ff _0801A580: .4byte 0xffffff00 -_0801A584: .4byte gUnknown_203B460 +_0801A584: .4byte gTeamInventory_203B460 _0801A588: mov r0, r8 ldr r1, _0801A5D0 @@ -951,7 +951,7 @@ sub_801A5D8: adds r6, r1, 0 adds r7, r2, 0 mov r8, r3 - bl sub_8090A34 + bl GetNumberOfFilledInventorySlots cmp r0, 0 bne _0801A5F2 movs r0, 0 @@ -968,7 +968,7 @@ _0801A5F2: _0801A604: ldr r0, [r5] str r4, [r0] - bl sub_80910B4 + bl FillInventoryGaps bl sub_801AE84 ldr r0, [r5] adds r1, r0, 0 @@ -1032,7 +1032,7 @@ _0801A66E: bl sub_800641C ldr r4, [r5] adds r4, 0x54 - bl sub_8090A34 + bl GetNumberOfFilledInventorySlots adds r1, r0, 0 adds r0, r4, 0 mov r2, r8 @@ -1167,12 +1167,12 @@ _0801A7AC: str r0, [sp] mov r0, sp ldrb r0, [r0, 0x2] - bl sub_80914E4 + bl CanSellItem lsls r0, 24 cmp r0, 0 beq _0801A7F4 mov r0, sp - bl sub_8090CCC + bl GetStackSellPrice ldr r1, [r5] movs r2, 0x98 lsls r2, 2 @@ -1187,7 +1187,7 @@ _0801A7E2: bl PlayMenuSoundEffect b _0801A802 .align 2, 0 -_0801A7EC: .4byte gUnknown_203B460 +_0801A7EC: .4byte gTeamInventory_203B460 _0801A7F0: .4byte 0x0001869f _0801A7F4: movs r0, 0x2 @@ -1316,8 +1316,8 @@ sub_801A8D0: movs r1, 0 movs r2, 0 bl sub_800641C - bl sub_80910B4 - bl sub_8090A34 + bl FillInventoryGaps + bl GetNumberOfFilledInventorySlots adds r1, r0, 0 ldr r0, [r5] adds r2, r0, 0 @@ -1522,7 +1522,7 @@ _0801AA90: ldr r0, [r0] mov pc, r0 .align 2, 0 -_0801AA9C: .4byte gUnknown_203B460 +_0801AA9C: .4byte gTeamInventory_203B460 _0801AAA0: .4byte _0801AAA4 .align 2, 0 _0801AAA4: @@ -1632,7 +1632,7 @@ _0801AB88: .4byte gUnknown_202DE58 _0801AB8C: .4byte gUnknown_80DB994 _0801AB90: ldrb r0, [r4, 0x2] - bl sub_80914E4 + bl CanSellItem lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0 @@ -1651,7 +1651,7 @@ _0801AB90: adds r1, r4, 0 bl sub_8090E14 adds r0, r4, 0 - bl sub_8090CCC + bl GetStackSellPrice ldr r1, _0801AC00 ldr r1, [r1] movs r2, 0x98 @@ -1682,7 +1682,7 @@ _0801AB90: bl xxx_call_draw_string b _0801ACC4 .align 2, 0 -_0801AC00: .4byte gUnknown_203B460 +_0801AC00: .4byte gTeamInventory_203B460 _0801AC04: .4byte 0x0001869f _0801AC08: .4byte gUnknown_80DB9A0 _0801AC0C: .4byte gUnknown_203B224 @@ -1708,7 +1708,7 @@ _0801AC10: str r5, [sp] _0801AC3C: movs r0, 0x8 - bl sub_8014FF0 + bl xxx_format_and_draw b _0801ACC4 .align 2, 0 _0801AC44: .4byte gUnknown_202DE58 @@ -1768,7 +1768,7 @@ _0801AC9C: ldr r3, [r0] str r5, [sp] movs r0, 0x8 - bl sub_8014FF0 + bl xxx_format_and_draw _0801ACC4: mov r0, r8 bl sub_801AED0 @@ -1840,7 +1840,7 @@ sub_801AD34: movs r1, 0 adds r3, r4, 0 bl xxx_call_draw_string - bl sub_8090A34 + bl GetNumberOfFilledInventorySlots adds r2, r0, 0 movs r5, 0x7 str r5, [sp] @@ -1883,12 +1883,12 @@ sub_801ADA0: ldr r6, [r1] lsls r4, r6, 8 lsrs r0, r4, 24 - bl sub_8091524 + bl IsNotMoneyOrUsedTMItem lsls r0, 24 cmp r0, 0 beq _0801AE12 lsrs r0, r4, 24 - bl sub_8090A60 + bl IsThrowableItem lsls r0, 24 cmp r0, 0 beq _0801ADF4 @@ -1910,7 +1910,7 @@ sub_801ADA0: ldr r1, _0801ADF0 b _0801AE0E .align 2, 0 -_0801ADEC: .4byte gUnknown_203B460 +_0801ADEC: .4byte gTeamInventory_203B460 _0801ADF0: .4byte 0x000003e7 _0801ADF4: lsrs r0, r4, 24 @@ -1965,7 +1965,7 @@ _0801AE2E: lsrs r0, r1, 24 cmp r0, r7 bne _0801AE72 - bl sub_8090A60 + bl IsThrowableItem lsls r0, 24 cmp r0, 0 beq _0801AE6C @@ -1976,7 +1976,7 @@ _0801AE2E: b _0801AE6E .align 2, 0 _0801AE64: .4byte gUnknown_203B224 -_0801AE68: .4byte gUnknown_203B460 +_0801AE68: .4byte gTeamInventory_203B460 _0801AE6C: adds r0, r5, 0x1 _0801AE6E: @@ -1985,7 +1985,7 @@ _0801AE6E: _0801AE72: adds r6, 0x1 _0801AE74: - bl sub_8090A34 + bl GetNumberOfFilledInventorySlots cmp r6, r0 blt _0801AE2E adds r0, r5, 0 @@ -2131,12 +2131,12 @@ _0801AF4C: _0801AF6C: adds r7, 0x1 _0801AF6E: - bl sub_8090A34 + bl GetNumberOfFilledInventorySlots cmp r7, r0 blt _0801AF12 mov r9, r8 _0801AF78: - bl sub_8090A34 + bl GetNumberOfFilledInventorySlots subs r0, 0x1 cmp r9, r0 blt _0801AF08 @@ -2148,7 +2148,7 @@ _0801AF78: pop {r0} bx r0 .align 2, 0 -_0801AF90: .4byte gUnknown_203B460 +_0801AF90: .4byte gTeamInventory_203B460 _0801AF94: .4byte gUnknown_203B224 thumb_func_end sub_801AEF8 diff --git a/asm/wonder_mail_3.s b/asm/wonder_mail_3.s index df1ab03..501d8b0 100644 --- a/asm/wonder_mail_3.s +++ b/asm/wonder_mail_3.s @@ -1443,15 +1443,15 @@ _0802DDFC: ldr r0, [r5] ldr r0, [r0, 0x34] ldrb r0, [r0, 0x10] - bl sub_8091130 + bl FindItemInInventory adds r1, r0, 0 movs r0, 0x1 negs r0, r0 cmp r1, r0 beq _0802DE1A adds r0, r1, 0 - bl sub_80911F8 - bl sub_80910B4 + bl ShiftItemsDownFrom + bl FillInventoryGaps _0802DE1A: ldr r0, _0802DE2C _0802DE1C: @@ -4234,7 +4234,7 @@ _0802F3E8: ldr r0, [r0] ldr r0, [r0, 0x10] ldr r0, [r0, 0x18] - bl sub_80913A0 + bl AddToTeamMoney movs r0, 0 bl sub_808D544 cmp r0, 0x1 @@ -4314,7 +4314,7 @@ _0802F494: beq _0802F4BC movs r0, 0xFA lsls r0, 2 - bl sub_80913A0 + bl AddToTeamMoney ldr r0, _0802F4B8 b _0802F4DA .align 2, 0 @@ -4383,7 +4383,7 @@ _0802F524: lsrs r0, 16 lsls r0, 24 lsrs r0, 24 - bl sub_8090A60 + bl IsThrowableItem lsls r0, 24 cmp r0, 0 beq _0802F56C diff --git a/data/data_80F4278.s b/data/data_80F4278.s index 37482ec..7682671 100644 --- a/data/data_80F4278.s +++ b/data/data_80F4278.s @@ -8327,7 +8327,8 @@ gUnknown_810A390: @ 810A390 .incbin "baserom.gba", 0x10A390, 0x60 .global gUnknown_810A3F0 -gUnknown_810A3F0: @ 810A3F0 (money related according to PMDe) +gUnknown_810A3F0: @ 810A3F0 (money related according to PMDe + @ LUT for money item stack size -> money amount .incbin "baserom.gba", 0x10A3F0, 0x190 .global gUnknown_810A580 diff --git a/data/data_810AE24.s b/data/data_810AE24.s index 5e8528f..77e824a 100644 --- a/data/data_810AE24.s +++ b/data/data_810AE24.s @@ -68,12 +68,15 @@ gRangeNames: @ 810CC0C .global gUnknown_810CF00 gUnknown_810CF00: @ 810CF00 .byte 0xF0, 0xCE, 0x10, 0x08 @ (pointer to range string) + .global TypeText +TypeText: .string "Type\0" .align 2,0 - .global gUnknown_810CF0C -gUnknown_810CF0C: @ 810CF0C - .byte 0x04, 0xCF, 0x10, 0x08 @ (pointer to type string) + .global gPtrTypeText +gPtrTypeText: @ 810CF0C + .4byte TypeText + .string "Power\0" .align 2,0 .byte 0x10, 0xCF, 0x10, 0x08 @ (pointer to power string) @@ -565,11 +568,15 @@ gFriendAreaDescriptions: @ 8113E30 .global gUnknown_8115718 gUnknown_8115718: @ 8115718 - .incbin "baserom.gba", 0x115718, 0x258 + .incbin "baserom.gba", 0x115718, 0x250 + + .global PPD0Text +PPD0Text: + .string "PP $d0 \0" - .global gUnknown_8115970 -gUnknown_8115970: @ 8115970 - .4byte 0x8115968 + .global gPtrPPD0Text +gPtrPPD0Text: @ 8115970 + .4byte PPD0Text .string "There are too many members on your team\n" .string "to enter this dungeon. Your team must be\n" diff --git a/data/dungeon/.gitignore b/data/dungeon/.gitignore index 9f03cde..5f8029d 100644 --- a/data/dungeon/.gitignore +++ b/data/dungeon/.gitignore @@ -1,2 +1,2 @@ -**/pokemon_found.inc -**/floor_id.inc +**/pokemon_found.inc +**/floor_id.inc diff --git a/data/dungeon/Autopilot/floor_id.json b/data/dungeon/Autopilot/floor_id.json index 7c7662a..a61ad82 100644 --- a/data/dungeon/Autopilot/floor_id.json +++ b/data/dungeon/Autopilot/floor_id.json @@ -1,95 +1,95 @@ -{ - "name": "AutopilotFloorID", - "tables": [ - { - "MainData": 1129, - "Pokemon": 526, - "Traps": 10, - "Items": 126, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 1130, - "Pokemon": 526, - "Traps": 10, - "Items": 126, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 1131, - "Pokemon": 527, - "Traps": 10, - "Items": 126, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 1132, - "Pokemon": 528, - "Traps": 10, - "Items": 127, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 1133, - "Pokemon": 529, - "Traps": 10, - "Items": 127, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 1134, - "Pokemon": 529, - "Traps": 10, - "Items": 127, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 1135, - "Pokemon": 530, - "Traps": 10, - "Items": 127, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 1136, - "Pokemon": 530, - "Traps": 10, - "Items": 127, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 1137, - "Pokemon": 530, - "Traps": 10, - "Items": 127, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 1138, - "Pokemon": 531, - "Traps": 10, - "Items": 127, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 66 - } - ] -} +{ + "name": "AutopilotFloorID", + "tables": [ + { + "MainData": 1129, + "Pokemon": 526, + "Traps": 10, + "Items": 126, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1130, + "Pokemon": 526, + "Traps": 10, + "Items": 126, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1131, + "Pokemon": 527, + "Traps": 10, + "Items": 126, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1132, + "Pokemon": 528, + "Traps": 10, + "Items": 127, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1133, + "Pokemon": 529, + "Traps": 10, + "Items": 127, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1134, + "Pokemon": 529, + "Traps": 10, + "Items": 127, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1135, + "Pokemon": 530, + "Traps": 10, + "Items": 127, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1136, + "Pokemon": 530, + "Traps": 10, + "Items": 127, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1137, + "Pokemon": 530, + "Traps": 10, + "Items": 127, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1138, + "Pokemon": 531, + "Traps": 10, + "Items": 127, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + } + ] +} diff --git a/data/dungeon/Boss3/floor_id.json b/data/dungeon/Boss3/floor_id.json index 8e9c4a5..d7ab2ae 100644 --- a/data/dungeon/Boss3/floor_id.json +++ b/data/dungeon/Boss3/floor_id.json @@ -1,185 +1,185 @@ -{ - "name": "Boss3FloorID", - "tables": [ - { - "MainData": 449, - "Pokemon": 206, - "Traps": 12, - "Items": 65, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 450, - "Pokemon": 206, - "Traps": 13, - "Items": 65, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 451, - "Pokemon": 206, - "Traps": 14, - "Items": 65, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 452, - "Pokemon": 206, - "Traps": 15, - "Items": 67, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 453, - "Pokemon": 206, - "Traps": 16, - "Items": 67, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 454, - "Pokemon": 206, - "Traps": 17, - "Items": 67, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 455, - "Pokemon": 206, - "Traps": 18, - "Items": 68, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 456, - "Pokemon": 206, - "Traps": 18, - "Items": 68, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 457, - "Pokemon": 206, - "Traps": 18, - "Items": 68, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 458, - "Pokemon": 206, - "Traps": 18, - "Items": 69, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 459, - "Pokemon": 206, - "Traps": 19, - "Items": 69, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 460, - "Pokemon": 206, - "Traps": 19, - "Items": 69, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 461, - "Pokemon": 206, - "Traps": 19, - "Items": 69, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 462, - "Pokemon": 206, - "Traps": 19, - "Items": 69, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 463, - "Pokemon": 206, - "Traps": 19, - "Items": 69, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 464, - "Pokemon": 206, - "Traps": 20, - "Items": 69, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 465, - "Pokemon": 206, - "Traps": 20, - "Items": 69, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 466, - "Pokemon": 206, - "Traps": 20, - "Items": 69, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 467, - "Pokemon": 206, - "Traps": 20, - "Items": 69, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 468, - "Pokemon": 206, - "Traps": 21, - "Items": 69, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 66 - } - ] -} +{ + "name": "Boss3FloorID", + "tables": [ + { + "MainData": 449, + "Pokemon": 206, + "Traps": 12, + "Items": 65, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 450, + "Pokemon": 206, + "Traps": 13, + "Items": 65, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 451, + "Pokemon": 206, + "Traps": 14, + "Items": 65, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 452, + "Pokemon": 206, + "Traps": 15, + "Items": 67, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 453, + "Pokemon": 206, + "Traps": 16, + "Items": 67, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 454, + "Pokemon": 206, + "Traps": 17, + "Items": 67, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 455, + "Pokemon": 206, + "Traps": 18, + "Items": 68, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 456, + "Pokemon": 206, + "Traps": 18, + "Items": 68, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 457, + "Pokemon": 206, + "Traps": 18, + "Items": 68, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 458, + "Pokemon": 206, + "Traps": 18, + "Items": 69, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 459, + "Pokemon": 206, + "Traps": 19, + "Items": 69, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 460, + "Pokemon": 206, + "Traps": 19, + "Items": 69, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 461, + "Pokemon": 206, + "Traps": 19, + "Items": 69, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 462, + "Pokemon": 206, + "Traps": 19, + "Items": 69, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 463, + "Pokemon": 206, + "Traps": 19, + "Items": 69, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 464, + "Pokemon": 206, + "Traps": 20, + "Items": 69, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 465, + "Pokemon": 206, + "Traps": 20, + "Items": 69, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 466, + "Pokemon": 206, + "Traps": 20, + "Items": 69, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 467, + "Pokemon": 206, + "Traps": 20, + "Items": 69, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 468, + "Pokemon": 206, + "Traps": 21, + "Items": 69, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 66 + } + ] +} diff --git a/data/dungeon/Boss4/floor_id.json b/data/dungeon/Boss4/floor_id.json index 8653db9..86bf269 100644 --- a/data/dungeon/Boss4/floor_id.json +++ b/data/dungeon/Boss4/floor_id.json @@ -1,104 +1,104 @@ -{ - "name": "Boss4FloorID", - "tables": [ - { - "MainData": 469, - "Pokemon": 207, - "Traps": 22, - "Items": 70, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 470, - "Pokemon": 207, - "Traps": 23, - "Items": 70, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 471, - "Pokemon": 207, - "Traps": 24, - "Items": 70, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 472, - "Pokemon": 208, - "Traps": 25, - "Items": 71, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 473, - "Pokemon": 209, - "Traps": 26, - "Items": 71, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 474, - "Pokemon": 210, - "Traps": 27, - "Items": 71, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 475, - "Pokemon": 210, - "Traps": 28, - "Items": 72, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 476, - "Pokemon": 211, - "Traps": 28, - "Items": 72, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 477, - "Pokemon": 212, - "Traps": 28, - "Items": 72, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 478, - "Pokemon": 213, - "Traps": 28, - "Items": 73, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 479, - "Pokemon": 214, - "Traps": 29, - "Items": 73, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 66 - } - ] -} +{ + "name": "Boss4FloorID", + "tables": [ + { + "MainData": 469, + "Pokemon": 207, + "Traps": 22, + "Items": 70, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 470, + "Pokemon": 207, + "Traps": 23, + "Items": 70, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 471, + "Pokemon": 207, + "Traps": 24, + "Items": 70, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 472, + "Pokemon": 208, + "Traps": 25, + "Items": 71, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 473, + "Pokemon": 209, + "Traps": 26, + "Items": 71, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 474, + "Pokemon": 210, + "Traps": 27, + "Items": 71, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 475, + "Pokemon": 210, + "Traps": 28, + "Items": 72, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 476, + "Pokemon": 211, + "Traps": 28, + "Items": 72, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 477, + "Pokemon": 212, + "Traps": 28, + "Items": 72, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 478, + "Pokemon": 213, + "Traps": 28, + "Items": 73, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 479, + "Pokemon": 214, + "Traps": 29, + "Items": 73, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 66 + } + ] +} diff --git a/data/dungeon/Boss9/floor_id.json b/data/dungeon/Boss9/floor_id.json index 1d7ed32..4f6f3a4 100644 --- a/data/dungeon/Boss9/floor_id.json +++ b/data/dungeon/Boss9/floor_id.json @@ -1,113 +1,113 @@ -{ - "name": "Boss9FloorID", - "tables": [ - { - "MainData": 728, - "Pokemon": 339, - "Traps": 63, - "Items": 87, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 729, - "Pokemon": 339, - "Traps": 63, - "Items": 87, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 730, - "Pokemon": 339, - "Traps": 63, - "Items": 87, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 731, - "Pokemon": 339, - "Traps": 63, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 732, - "Pokemon": 339, - "Traps": 63, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 733, - "Pokemon": 339, - "Traps": 63, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 734, - "Pokemon": 339, - "Traps": 63, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 735, - "Pokemon": 339, - "Traps": 63, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 736, - "Pokemon": 339, - "Traps": 63, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 737, - "Pokemon": 339, - "Traps": 63, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 738, - "Pokemon": 339, - "Traps": 63, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 739, - "Pokemon": 339, - "Traps": 63, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 66 - } - ] -} +{ + "name": "Boss9FloorID", + "tables": [ + { + "MainData": 728, + "Pokemon": 339, + "Traps": 63, + "Items": 87, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 729, + "Pokemon": 339, + "Traps": 63, + "Items": 87, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 730, + "Pokemon": 339, + "Traps": 63, + "Items": 87, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 731, + "Pokemon": 339, + "Traps": 63, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 732, + "Pokemon": 339, + "Traps": 63, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 733, + "Pokemon": 339, + "Traps": 63, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 734, + "Pokemon": 339, + "Traps": 63, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 735, + "Pokemon": 339, + "Traps": 63, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 736, + "Pokemon": 339, + "Traps": 63, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 737, + "Pokemon": 339, + "Traps": 63, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 738, + "Pokemon": 339, + "Traps": 63, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 739, + "Pokemon": 339, + "Traps": 63, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + } + ] +} diff --git a/data/dungeon/BuriedRelic/floor_id.json b/data/dungeon/BuriedRelic/floor_id.json index 5eeffe3..b4f232b 100644 --- a/data/dungeon/BuriedRelic/floor_id.json +++ b/data/dungeon/BuriedRelic/floor_id.json @@ -1,896 +1,896 @@ -{ - "name": "BuriedRelicFloorID", - "tables": [ - { - "MainData": 579, - "Pokemon": 278, - "Traps": 7, - "Items": 80, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 580, - "Pokemon": 278, - "Traps": 7, - "Items": 80, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 581, - "Pokemon": 278, - "Traps": 7, - "Items": 80, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 582, - "Pokemon": 279, - "Traps": 7, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 583, - "Pokemon": 280, - "Traps": 7, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 584, - "Pokemon": 280, - "Traps": 7, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 585, - "Pokemon": 280, - "Traps": 7, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 586, - "Pokemon": 280, - "Traps": 7, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 587, - "Pokemon": 281, - "Traps": 7, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 588, - "Pokemon": 282, - "Traps": 8, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 589, - "Pokemon": 283, - "Traps": 8, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 590, - "Pokemon": 284, - "Traps": 8, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 591, - "Pokemon": 284, - "Traps": 8, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 592, - "Pokemon": 285, - "Traps": 8, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 593, - "Pokemon": 286, - "Traps": 8, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 594, - "Pokemon": 287, - "Traps": 8, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 595, - "Pokemon": 288, - "Traps": 8, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 596, - "Pokemon": 288, - "Traps": 8, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 597, - "Pokemon": 289, - "Traps": 8, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 598, - "Pokemon": 290, - "Traps": 8, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 599, - "Pokemon": 291, - "Traps": 8, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 600, - "Pokemon": 291, - "Traps": 8, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 601, - "Pokemon": 292, - "Traps": 8, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 602, - "Pokemon": 293, - "Traps": 8, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 603, - "Pokemon": 294, - "Traps": 8, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 604, - "Pokemon": 295, - "Traps": 8, - "Items": 82, - "KecleonShop": 83, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 605, - "Pokemon": 295, - "Traps": 8, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 606, - "Pokemon": 295, - "Traps": 8, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 607, - "Pokemon": 295, - "Traps": 8, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 608, - "Pokemon": 296, - "Traps": 48, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 609, - "Pokemon": 297, - "Traps": 49, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 610, - "Pokemon": 297, - "Traps": 49, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 611, - "Pokemon": 297, - "Traps": 49, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 612, - "Pokemon": 297, - "Traps": 49, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 613, - "Pokemon": 298, - "Traps": 49, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 614, - "Pokemon": 299, - "Traps": 49, - "Items": 82, - "KecleonShop": 83, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 615, - "Pokemon": 299, - "Traps": 49, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 616, - "Pokemon": 299, - "Traps": 49, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 617, - "Pokemon": 299, - "Traps": 49, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 618, - "Pokemon": 300, - "Traps": 50, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 619, - "Pokemon": 301, - "Traps": 50, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 620, - "Pokemon": 301, - "Traps": 50, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 621, - "Pokemon": 301, - "Traps": 50, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 622, - "Pokemon": 301, - "Traps": 50, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 623, - "Pokemon": 301, - "Traps": 50, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 624, - "Pokemon": 301, - "Traps": 50, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 625, - "Pokemon": 301, - "Traps": 50, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 626, - "Pokemon": 301, - "Traps": 50, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 627, - "Pokemon": 301, - "Traps": 50, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 628, - "Pokemon": 302, - "Traps": 51, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 629, - "Pokemon": 302, - "Traps": 51, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 630, - "Pokemon": 302, - "Traps": 51, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 631, - "Pokemon": 302, - "Traps": 51, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 632, - "Pokemon": 302, - "Traps": 51, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 633, - "Pokemon": 302, - "Traps": 51, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 634, - "Pokemon": 302, - "Traps": 51, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 635, - "Pokemon": 302, - "Traps": 51, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 636, - "Pokemon": 302, - "Traps": 51, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 637, - "Pokemon": 302, - "Traps": 51, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 638, - "Pokemon": 303, - "Traps": 52, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 639, - "Pokemon": 304, - "Traps": 52, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 640, - "Pokemon": 304, - "Traps": 52, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 641, - "Pokemon": 304, - "Traps": 52, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 642, - "Pokemon": 304, - "Traps": 52, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 643, - "Pokemon": 305, - "Traps": 52, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 644, - "Pokemon": 305, - "Traps": 52, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 645, - "Pokemon": 305, - "Traps": 52, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 646, - "Pokemon": 306, - "Traps": 52, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 647, - "Pokemon": 306, - "Traps": 52, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 648, - "Pokemon": 307, - "Traps": 53, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 649, - "Pokemon": 308, - "Traps": 54, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 650, - "Pokemon": 308, - "Traps": 54, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 651, - "Pokemon": 308, - "Traps": 55, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 652, - "Pokemon": 309, - "Traps": 56, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 653, - "Pokemon": 310, - "Traps": 54, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 654, - "Pokemon": 310, - "Traps": 54, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 655, - "Pokemon": 310, - "Traps": 54, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 656, - "Pokemon": 310, - "Traps": 54, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 657, - "Pokemon": 310, - "Traps": 57, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 658, - "Pokemon": 311, - "Traps": 57, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 659, - "Pokemon": 311, - "Traps": 57, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 660, - "Pokemon": 312, - "Traps": 57, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 661, - "Pokemon": 312, - "Traps": 57, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 662, - "Pokemon": 312, - "Traps": 57, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 663, - "Pokemon": 312, - "Traps": 57, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 664, - "Pokemon": 312, - "Traps": 57, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 665, - "Pokemon": 312, - "Traps": 57, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 666, - "Pokemon": 313, - "Traps": 57, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 667, - "Pokemon": 313, - "Traps": 57, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 668, - "Pokemon": 313, - "Traps": 57, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 669, - "Pokemon": 314, - "Traps": 57, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 670, - "Pokemon": 314, - "Traps": 57, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 671, - "Pokemon": 314, - "Traps": 57, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 672, - "Pokemon": 315, - "Traps": 57, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 673, - "Pokemon": 315, - "Traps": 57, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 674, - "Pokemon": 315, - "Traps": 57, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 675, - "Pokemon": 315, - "Traps": 57, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 676, - "Pokemon": 315, - "Traps": 57, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - }, - { - "MainData": 677, - "Pokemon": 316, - "Traps": 58, - "Items": 82, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 81 - } - ] -} +{ + "name": "BuriedRelicFloorID", + "tables": [ + { + "MainData": 579, + "Pokemon": 278, + "Traps": 7, + "Items": 80, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 580, + "Pokemon": 278, + "Traps": 7, + "Items": 80, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 581, + "Pokemon": 278, + "Traps": 7, + "Items": 80, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 582, + "Pokemon": 279, + "Traps": 7, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 583, + "Pokemon": 280, + "Traps": 7, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 584, + "Pokemon": 280, + "Traps": 7, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 585, + "Pokemon": 280, + "Traps": 7, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 586, + "Pokemon": 280, + "Traps": 7, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 587, + "Pokemon": 281, + "Traps": 7, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 588, + "Pokemon": 282, + "Traps": 8, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 589, + "Pokemon": 283, + "Traps": 8, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 590, + "Pokemon": 284, + "Traps": 8, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 591, + "Pokemon": 284, + "Traps": 8, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 592, + "Pokemon": 285, + "Traps": 8, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 593, + "Pokemon": 286, + "Traps": 8, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 594, + "Pokemon": 287, + "Traps": 8, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 595, + "Pokemon": 288, + "Traps": 8, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 596, + "Pokemon": 288, + "Traps": 8, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 597, + "Pokemon": 289, + "Traps": 8, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 598, + "Pokemon": 290, + "Traps": 8, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 599, + "Pokemon": 291, + "Traps": 8, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 600, + "Pokemon": 291, + "Traps": 8, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 601, + "Pokemon": 292, + "Traps": 8, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 602, + "Pokemon": 293, + "Traps": 8, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 603, + "Pokemon": 294, + "Traps": 8, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 604, + "Pokemon": 295, + "Traps": 8, + "Items": 82, + "KecleonShop": 83, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 605, + "Pokemon": 295, + "Traps": 8, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 606, + "Pokemon": 295, + "Traps": 8, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 607, + "Pokemon": 295, + "Traps": 8, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 608, + "Pokemon": 296, + "Traps": 48, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 609, + "Pokemon": 297, + "Traps": 49, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 610, + "Pokemon": 297, + "Traps": 49, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 611, + "Pokemon": 297, + "Traps": 49, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 612, + "Pokemon": 297, + "Traps": 49, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 613, + "Pokemon": 298, + "Traps": 49, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 614, + "Pokemon": 299, + "Traps": 49, + "Items": 82, + "KecleonShop": 83, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 615, + "Pokemon": 299, + "Traps": 49, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 616, + "Pokemon": 299, + "Traps": 49, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 617, + "Pokemon": 299, + "Traps": 49, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 618, + "Pokemon": 300, + "Traps": 50, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 619, + "Pokemon": 301, + "Traps": 50, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 620, + "Pokemon": 301, + "Traps": 50, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 621, + "Pokemon": 301, + "Traps": 50, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 622, + "Pokemon": 301, + "Traps": 50, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 623, + "Pokemon": 301, + "Traps": 50, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 624, + "Pokemon": 301, + "Traps": 50, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 625, + "Pokemon": 301, + "Traps": 50, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 626, + "Pokemon": 301, + "Traps": 50, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 627, + "Pokemon": 301, + "Traps": 50, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 628, + "Pokemon": 302, + "Traps": 51, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 629, + "Pokemon": 302, + "Traps": 51, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 630, + "Pokemon": 302, + "Traps": 51, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 631, + "Pokemon": 302, + "Traps": 51, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 632, + "Pokemon": 302, + "Traps": 51, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 633, + "Pokemon": 302, + "Traps": 51, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 634, + "Pokemon": 302, + "Traps": 51, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 635, + "Pokemon": 302, + "Traps": 51, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 636, + "Pokemon": 302, + "Traps": 51, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 637, + "Pokemon": 302, + "Traps": 51, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 638, + "Pokemon": 303, + "Traps": 52, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 639, + "Pokemon": 304, + "Traps": 52, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 640, + "Pokemon": 304, + "Traps": 52, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 641, + "Pokemon": 304, + "Traps": 52, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 642, + "Pokemon": 304, + "Traps": 52, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 643, + "Pokemon": 305, + "Traps": 52, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 644, + "Pokemon": 305, + "Traps": 52, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 645, + "Pokemon": 305, + "Traps": 52, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 646, + "Pokemon": 306, + "Traps": 52, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 647, + "Pokemon": 306, + "Traps": 52, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 648, + "Pokemon": 307, + "Traps": 53, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 649, + "Pokemon": 308, + "Traps": 54, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 650, + "Pokemon": 308, + "Traps": 54, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 651, + "Pokemon": 308, + "Traps": 55, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 652, + "Pokemon": 309, + "Traps": 56, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 653, + "Pokemon": 310, + "Traps": 54, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 654, + "Pokemon": 310, + "Traps": 54, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 655, + "Pokemon": 310, + "Traps": 54, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 656, + "Pokemon": 310, + "Traps": 54, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 657, + "Pokemon": 310, + "Traps": 57, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 658, + "Pokemon": 311, + "Traps": 57, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 659, + "Pokemon": 311, + "Traps": 57, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 660, + "Pokemon": 312, + "Traps": 57, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 661, + "Pokemon": 312, + "Traps": 57, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 662, + "Pokemon": 312, + "Traps": 57, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 663, + "Pokemon": 312, + "Traps": 57, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 664, + "Pokemon": 312, + "Traps": 57, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 665, + "Pokemon": 312, + "Traps": 57, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 666, + "Pokemon": 313, + "Traps": 57, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 667, + "Pokemon": 313, + "Traps": 57, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 668, + "Pokemon": 313, + "Traps": 57, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 669, + "Pokemon": 314, + "Traps": 57, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 670, + "Pokemon": 314, + "Traps": 57, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 671, + "Pokemon": 314, + "Traps": 57, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 672, + "Pokemon": 315, + "Traps": 57, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 673, + "Pokemon": 315, + "Traps": 57, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 674, + "Pokemon": 315, + "Traps": 57, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 675, + "Pokemon": 315, + "Traps": 57, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 676, + "Pokemon": 315, + "Traps": 57, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + }, + { + "MainData": 677, + "Pokemon": 316, + "Traps": 58, + "Items": 82, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 81 + } + ] +} diff --git a/data/dungeon/D50/floor_id.json b/data/dungeon/D50/floor_id.json index 6f23a99..4dc2f2e 100644 --- a/data/dungeon/D50/floor_id.json +++ b/data/dungeon/D50/floor_id.json @@ -1,23 +1,23 @@ -{ - "name": "D50FloorID", - "tables": [ - { - "MainData": 1139, - "Pokemon": 526, - "Traps": 87, - "Items": 87, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 1140, - "Pokemon": 526, - "Traps": 87, - "Items": 87, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 66 - } - ] -} +{ + "name": "D50FloorID", + "tables": [ + { + "MainData": 1139, + "Pokemon": 526, + "Traps": 87, + "Items": 87, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1140, + "Pokemon": 526, + "Traps": 87, + "Items": 87, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + } + ] +} diff --git a/data/dungeon/D51/floor_id.json b/data/dungeon/D51/floor_id.json index 6c67400..42acf2d 100644 --- a/data/dungeon/D51/floor_id.json +++ b/data/dungeon/D51/floor_id.json @@ -1,455 +1,455 @@ -{ - "name": "D51FloorID", - "tables": [ - { - "MainData": 1141, - "Pokemon": 526, - "Traps": 87, - "Items": 128, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1142, - "Pokemon": 526, - "Traps": 87, - "Items": 128, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1143, - "Pokemon": 532, - "Traps": 87, - "Items": 128, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1144, - "Pokemon": 533, - "Traps": 87, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1145, - "Pokemon": 529, - "Traps": 87, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1146, - "Pokemon": 529, - "Traps": 87, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1147, - "Pokemon": 530, - "Traps": 87, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1148, - "Pokemon": 530, - "Traps": 87, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1149, - "Pokemon": 530, - "Traps": 87, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1150, - "Pokemon": 531, - "Traps": 87, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1151, - "Pokemon": 531, - "Traps": 87, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1152, - "Pokemon": 531, - "Traps": 87, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1153, - "Pokemon": 531, - "Traps": 87, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1154, - "Pokemon": 534, - "Traps": 87, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1155, - "Pokemon": 534, - "Traps": 87, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1156, - "Pokemon": 535, - "Traps": 87, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1157, - "Pokemon": 535, - "Traps": 87, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1158, - "Pokemon": 535, - "Traps": 87, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1159, - "Pokemon": 535, - "Traps": 87, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1160, - "Pokemon": 536, - "Traps": 87, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1161, - "Pokemon": 536, - "Traps": 88, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1162, - "Pokemon": 537, - "Traps": 88, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1163, - "Pokemon": 537, - "Traps": 88, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1164, - "Pokemon": 537, - "Traps": 88, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1165, - "Pokemon": 537, - "Traps": 88, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1166, - "Pokemon": 538, - "Traps": 88, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1167, - "Pokemon": 538, - "Traps": 88, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1168, - "Pokemon": 538, - "Traps": 88, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1169, - "Pokemon": 538, - "Traps": 88, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1170, - "Pokemon": 538, - "Traps": 88, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1171, - "Pokemon": 539, - "Traps": 88, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1172, - "Pokemon": 539, - "Traps": 88, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1173, - "Pokemon": 539, - "Traps": 88, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1174, - "Pokemon": 539, - "Traps": 88, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1175, - "Pokemon": 539, - "Traps": 88, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1176, - "Pokemon": 540, - "Traps": 88, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1177, - "Pokemon": 540, - "Traps": 88, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1178, - "Pokemon": 540, - "Traps": 88, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1179, - "Pokemon": 540, - "Traps": 88, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1180, - "Pokemon": 540, - "Traps": 88, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1181, - "Pokemon": 541, - "Traps": 89, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1182, - "Pokemon": 541, - "Traps": 89, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1183, - "Pokemon": 541, - "Traps": 89, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1184, - "Pokemon": 541, - "Traps": 89, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1185, - "Pokemon": 541, - "Traps": 89, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1186, - "Pokemon": 541, - "Traps": 89, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1187, - "Pokemon": 542, - "Traps": 89, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1188, - "Pokemon": 542, - "Traps": 89, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1189, - "Pokemon": 542, - "Traps": 89, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1190, - "Pokemon": 542, - "Traps": 90, - "Items": 129, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - } - ] -} +{ + "name": "D51FloorID", + "tables": [ + { + "MainData": 1141, + "Pokemon": 526, + "Traps": 87, + "Items": 128, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1142, + "Pokemon": 526, + "Traps": 87, + "Items": 128, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1143, + "Pokemon": 532, + "Traps": 87, + "Items": 128, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1144, + "Pokemon": 533, + "Traps": 87, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1145, + "Pokemon": 529, + "Traps": 87, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1146, + "Pokemon": 529, + "Traps": 87, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1147, + "Pokemon": 530, + "Traps": 87, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1148, + "Pokemon": 530, + "Traps": 87, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1149, + "Pokemon": 530, + "Traps": 87, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1150, + "Pokemon": 531, + "Traps": 87, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1151, + "Pokemon": 531, + "Traps": 87, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1152, + "Pokemon": 531, + "Traps": 87, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1153, + "Pokemon": 531, + "Traps": 87, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1154, + "Pokemon": 534, + "Traps": 87, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1155, + "Pokemon": 534, + "Traps": 87, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1156, + "Pokemon": 535, + "Traps": 87, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1157, + "Pokemon": 535, + "Traps": 87, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1158, + "Pokemon": 535, + "Traps": 87, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1159, + "Pokemon": 535, + "Traps": 87, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1160, + "Pokemon": 536, + "Traps": 87, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1161, + "Pokemon": 536, + "Traps": 88, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1162, + "Pokemon": 537, + "Traps": 88, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1163, + "Pokemon": 537, + "Traps": 88, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1164, + "Pokemon": 537, + "Traps": 88, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1165, + "Pokemon": 537, + "Traps": 88, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1166, + "Pokemon": 538, + "Traps": 88, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1167, + "Pokemon": 538, + "Traps": 88, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1168, + "Pokemon": 538, + "Traps": 88, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1169, + "Pokemon": 538, + "Traps": 88, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1170, + "Pokemon": 538, + "Traps": 88, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1171, + "Pokemon": 539, + "Traps": 88, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1172, + "Pokemon": 539, + "Traps": 88, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1173, + "Pokemon": 539, + "Traps": 88, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1174, + "Pokemon": 539, + "Traps": 88, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1175, + "Pokemon": 539, + "Traps": 88, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1176, + "Pokemon": 540, + "Traps": 88, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1177, + "Pokemon": 540, + "Traps": 88, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1178, + "Pokemon": 540, + "Traps": 88, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1179, + "Pokemon": 540, + "Traps": 88, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1180, + "Pokemon": 540, + "Traps": 88, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1181, + "Pokemon": 541, + "Traps": 89, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1182, + "Pokemon": 541, + "Traps": 89, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1183, + "Pokemon": 541, + "Traps": 89, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1184, + "Pokemon": 541, + "Traps": 89, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1185, + "Pokemon": 541, + "Traps": 89, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1186, + "Pokemon": 541, + "Traps": 89, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1187, + "Pokemon": 542, + "Traps": 89, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1188, + "Pokemon": 542, + "Traps": 89, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1189, + "Pokemon": 542, + "Traps": 89, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1190, + "Pokemon": 542, + "Traps": 90, + "Items": 129, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + } + ] +} diff --git a/data/dungeon/D54/floor_id.json b/data/dungeon/D54/floor_id.json index df03c60..8c217eb 100644 --- a/data/dungeon/D54/floor_id.json +++ b/data/dungeon/D54/floor_id.json @@ -1,275 +1,275 @@ -{ - "name": "D54FloorID", - "tables": [ - { - "MainData": 1272, - "Pokemon": 526, - "Traps": 10, - "Items": 87, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1273, - "Pokemon": 526, - "Traps": 10, - "Items": 87, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1274, - "Pokemon": 527, - "Traps": 10, - "Items": 87, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1275, - "Pokemon": 528, - "Traps": 10, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1276, - "Pokemon": 529, - "Traps": 10, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1277, - "Pokemon": 529, - "Traps": 10, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1278, - "Pokemon": 530, - "Traps": 10, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1279, - "Pokemon": 530, - "Traps": 10, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1280, - "Pokemon": 530, - "Traps": 10, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1281, - "Pokemon": 531, - "Traps": 10, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1282, - "Pokemon": 531, - "Traps": 10, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1283, - "Pokemon": 531, - "Traps": 10, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1284, - "Pokemon": 531, - "Traps": 10, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1285, - "Pokemon": 534, - "Traps": 10, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1286, - "Pokemon": 534, - "Traps": 10, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1287, - "Pokemon": 535, - "Traps": 10, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1288, - "Pokemon": 535, - "Traps": 10, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1289, - "Pokemon": 535, - "Traps": 10, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1290, - "Pokemon": 535, - "Traps": 10, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1291, - "Pokemon": 536, - "Traps": 10, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1292, - "Pokemon": 536, - "Traps": 10, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1293, - "Pokemon": 537, - "Traps": 10, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1294, - "Pokemon": 537, - "Traps": 10, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1295, - "Pokemon": 537, - "Traps": 10, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1296, - "Pokemon": 537, - "Traps": 10, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1297, - "Pokemon": 538, - "Traps": 10, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1298, - "Pokemon": 538, - "Traps": 10, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1299, - "Pokemon": 538, - "Traps": 10, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1300, - "Pokemon": 538, - "Traps": 10, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1301, - "Pokemon": 538, - "Traps": 10, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - } - ] -} +{ + "name": "D54FloorID", + "tables": [ + { + "MainData": 1272, + "Pokemon": 526, + "Traps": 10, + "Items": 87, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1273, + "Pokemon": 526, + "Traps": 10, + "Items": 87, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1274, + "Pokemon": 527, + "Traps": 10, + "Items": 87, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1275, + "Pokemon": 528, + "Traps": 10, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1276, + "Pokemon": 529, + "Traps": 10, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1277, + "Pokemon": 529, + "Traps": 10, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1278, + "Pokemon": 530, + "Traps": 10, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1279, + "Pokemon": 530, + "Traps": 10, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1280, + "Pokemon": 530, + "Traps": 10, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1281, + "Pokemon": 531, + "Traps": 10, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1282, + "Pokemon": 531, + "Traps": 10, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1283, + "Pokemon": 531, + "Traps": 10, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1284, + "Pokemon": 531, + "Traps": 10, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1285, + "Pokemon": 534, + "Traps": 10, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1286, + "Pokemon": 534, + "Traps": 10, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1287, + "Pokemon": 535, + "Traps": 10, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1288, + "Pokemon": 535, + "Traps": 10, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1289, + "Pokemon": 535, + "Traps": 10, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1290, + "Pokemon": 535, + "Traps": 10, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1291, + "Pokemon": 536, + "Traps": 10, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1292, + "Pokemon": 536, + "Traps": 10, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1293, + "Pokemon": 537, + "Traps": 10, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1294, + "Pokemon": 537, + "Traps": 10, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1295, + "Pokemon": 537, + "Traps": 10, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1296, + "Pokemon": 537, + "Traps": 10, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1297, + "Pokemon": 538, + "Traps": 10, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1298, + "Pokemon": 538, + "Traps": 10, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1299, + "Pokemon": 538, + "Traps": 10, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1300, + "Pokemon": 538, + "Traps": 10, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1301, + "Pokemon": 538, + "Traps": 10, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + } + ] +} diff --git a/data/dungeon/D61/floor_id.json b/data/dungeon/D61/floor_id.json index 885165e..285755d 100644 --- a/data/dungeon/D61/floor_id.json +++ b/data/dungeon/D61/floor_id.json @@ -1,896 +1,896 @@ -{ - "name": "D61FloorID", - "tables": [ - { - "MainData": 1565, - "Pokemon": 727, - "Traps": 115, - "Items": 87, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1566, - "Pokemon": 727, - "Traps": 115, - "Items": 87, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1567, - "Pokemon": 727, - "Traps": 115, - "Items": 87, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1568, - "Pokemon": 727, - "Traps": 115, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1569, - "Pokemon": 728, - "Traps": 115, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1570, - "Pokemon": 728, - "Traps": 115, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1571, - "Pokemon": 728, - "Traps": 115, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1572, - "Pokemon": 728, - "Traps": 115, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1573, - "Pokemon": 728, - "Traps": 115, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1574, - "Pokemon": 729, - "Traps": 115, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1575, - "Pokemon": 729, - "Traps": 115, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1576, - "Pokemon": 729, - "Traps": 115, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1577, - "Pokemon": 730, - "Traps": 115, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1578, - "Pokemon": 730, - "Traps": 115, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1579, - "Pokemon": 730, - "Traps": 115, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1580, - "Pokemon": 730, - "Traps": 115, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1581, - "Pokemon": 730, - "Traps": 115, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1582, - "Pokemon": 730, - "Traps": 115, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1583, - "Pokemon": 730, - "Traps": 115, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1584, - "Pokemon": 731, - "Traps": 115, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1585, - "Pokemon": 732, - "Traps": 116, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1586, - "Pokemon": 732, - "Traps": 116, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1587, - "Pokemon": 732, - "Traps": 116, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1588, - "Pokemon": 732, - "Traps": 116, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1589, - "Pokemon": 732, - "Traps": 116, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1590, - "Pokemon": 732, - "Traps": 116, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1591, - "Pokemon": 732, - "Traps": 116, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1592, - "Pokemon": 732, - "Traps": 116, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1593, - "Pokemon": 732, - "Traps": 116, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1594, - "Pokemon": 733, - "Traps": 116, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1595, - "Pokemon": 734, - "Traps": 116, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1596, - "Pokemon": 734, - "Traps": 116, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1597, - "Pokemon": 734, - "Traps": 116, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1598, - "Pokemon": 735, - "Traps": 116, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1599, - "Pokemon": 735, - "Traps": 116, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1600, - "Pokemon": 736, - "Traps": 116, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1601, - "Pokemon": 736, - "Traps": 116, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1602, - "Pokemon": 736, - "Traps": 116, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1603, - "Pokemon": 736, - "Traps": 116, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1604, - "Pokemon": 737, - "Traps": 116, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1605, - "Pokemon": 737, - "Traps": 117, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1606, - "Pokemon": 737, - "Traps": 117, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1607, - "Pokemon": 738, - "Traps": 117, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1608, - "Pokemon": 738, - "Traps": 117, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1609, - "Pokemon": 738, - "Traps": 117, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1610, - "Pokemon": 738, - "Traps": 117, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1611, - "Pokemon": 738, - "Traps": 117, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1612, - "Pokemon": 738, - "Traps": 117, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1613, - "Pokemon": 739, - "Traps": 117, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1614, - "Pokemon": 740, - "Traps": 118, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1615, - "Pokemon": 740, - "Traps": 119, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1616, - "Pokemon": 740, - "Traps": 120, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1617, - "Pokemon": 741, - "Traps": 120, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1618, - "Pokemon": 742, - "Traps": 120, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1619, - "Pokemon": 742, - "Traps": 120, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1620, - "Pokemon": 743, - "Traps": 120, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1621, - "Pokemon": 743, - "Traps": 119, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1622, - "Pokemon": 743, - "Traps": 121, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1623, - "Pokemon": 743, - "Traps": 121, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1624, - "Pokemon": 744, - "Traps": 122, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1625, - "Pokemon": 744, - "Traps": 122, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1626, - "Pokemon": 744, - "Traps": 122, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1627, - "Pokemon": 744, - "Traps": 122, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1628, - "Pokemon": 744, - "Traps": 122, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1629, - "Pokemon": 745, - "Traps": 122, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1630, - "Pokemon": 745, - "Traps": 122, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1631, - "Pokemon": 746, - "Traps": 122, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1632, - "Pokemon": 746, - "Traps": 122, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1633, - "Pokemon": 746, - "Traps": 122, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1634, - "Pokemon": 747, - "Traps": 123, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1635, - "Pokemon": 748, - "Traps": 124, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1636, - "Pokemon": 748, - "Traps": 124, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1637, - "Pokemon": 748, - "Traps": 125, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1638, - "Pokemon": 748, - "Traps": 126, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1639, - "Pokemon": 748, - "Traps": 124, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1640, - "Pokemon": 748, - "Traps": 124, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1641, - "Pokemon": 748, - "Traps": 124, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1642, - "Pokemon": 748, - "Traps": 127, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1643, - "Pokemon": 748, - "Traps": 128, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1644, - "Pokemon": 748, - "Traps": 129, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1645, - "Pokemon": 748, - "Traps": 129, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1646, - "Pokemon": 748, - "Traps": 129, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1647, - "Pokemon": 748, - "Traps": 129, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1648, - "Pokemon": 748, - "Traps": 129, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1649, - "Pokemon": 748, - "Traps": 130, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1650, - "Pokemon": 748, - "Traps": 130, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1651, - "Pokemon": 748, - "Traps": 131, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1652, - "Pokemon": 748, - "Traps": 132, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1653, - "Pokemon": 748, - "Traps": 132, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1654, - "Pokemon": 748, - "Traps": 132, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1655, - "Pokemon": 749, - "Traps": 133, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1656, - "Pokemon": 749, - "Traps": 133, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1657, - "Pokemon": 749, - "Traps": 133, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1658, - "Pokemon": 749, - "Traps": 134, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1659, - "Pokemon": 749, - "Traps": 134, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1660, - "Pokemon": 749, - "Traps": 135, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1661, - "Pokemon": 749, - "Traps": 136, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1662, - "Pokemon": 749, - "Traps": 136, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1663, - "Pokemon": 749, - "Traps": 136, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - } - ] -} +{ + "name": "D61FloorID", + "tables": [ + { + "MainData": 1565, + "Pokemon": 727, + "Traps": 115, + "Items": 87, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1566, + "Pokemon": 727, + "Traps": 115, + "Items": 87, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1567, + "Pokemon": 727, + "Traps": 115, + "Items": 87, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1568, + "Pokemon": 727, + "Traps": 115, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1569, + "Pokemon": 728, + "Traps": 115, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1570, + "Pokemon": 728, + "Traps": 115, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1571, + "Pokemon": 728, + "Traps": 115, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1572, + "Pokemon": 728, + "Traps": 115, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1573, + "Pokemon": 728, + "Traps": 115, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1574, + "Pokemon": 729, + "Traps": 115, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1575, + "Pokemon": 729, + "Traps": 115, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1576, + "Pokemon": 729, + "Traps": 115, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1577, + "Pokemon": 730, + "Traps": 115, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1578, + "Pokemon": 730, + "Traps": 115, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1579, + "Pokemon": 730, + "Traps": 115, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1580, + "Pokemon": 730, + "Traps": 115, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1581, + "Pokemon": 730, + "Traps": 115, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1582, + "Pokemon": 730, + "Traps": 115, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1583, + "Pokemon": 730, + "Traps": 115, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1584, + "Pokemon": 731, + "Traps": 115, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1585, + "Pokemon": 732, + "Traps": 116, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1586, + "Pokemon": 732, + "Traps": 116, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1587, + "Pokemon": 732, + "Traps": 116, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1588, + "Pokemon": 732, + "Traps": 116, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1589, + "Pokemon": 732, + "Traps": 116, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1590, + "Pokemon": 732, + "Traps": 116, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1591, + "Pokemon": 732, + "Traps": 116, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1592, + "Pokemon": 732, + "Traps": 116, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1593, + "Pokemon": 732, + "Traps": 116, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1594, + "Pokemon": 733, + "Traps": 116, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1595, + "Pokemon": 734, + "Traps": 116, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1596, + "Pokemon": 734, + "Traps": 116, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1597, + "Pokemon": 734, + "Traps": 116, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1598, + "Pokemon": 735, + "Traps": 116, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1599, + "Pokemon": 735, + "Traps": 116, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1600, + "Pokemon": 736, + "Traps": 116, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1601, + "Pokemon": 736, + "Traps": 116, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1602, + "Pokemon": 736, + "Traps": 116, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1603, + "Pokemon": 736, + "Traps": 116, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1604, + "Pokemon": 737, + "Traps": 116, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1605, + "Pokemon": 737, + "Traps": 117, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1606, + "Pokemon": 737, + "Traps": 117, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1607, + "Pokemon": 738, + "Traps": 117, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1608, + "Pokemon": 738, + "Traps": 117, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1609, + "Pokemon": 738, + "Traps": 117, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1610, + "Pokemon": 738, + "Traps": 117, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1611, + "Pokemon": 738, + "Traps": 117, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1612, + "Pokemon": 738, + "Traps": 117, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1613, + "Pokemon": 739, + "Traps": 117, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1614, + "Pokemon": 740, + "Traps": 118, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1615, + "Pokemon": 740, + "Traps": 119, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1616, + "Pokemon": 740, + "Traps": 120, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1617, + "Pokemon": 741, + "Traps": 120, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1618, + "Pokemon": 742, + "Traps": 120, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1619, + "Pokemon": 742, + "Traps": 120, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1620, + "Pokemon": 743, + "Traps": 120, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1621, + "Pokemon": 743, + "Traps": 119, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1622, + "Pokemon": 743, + "Traps": 121, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1623, + "Pokemon": 743, + "Traps": 121, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1624, + "Pokemon": 744, + "Traps": 122, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1625, + "Pokemon": 744, + "Traps": 122, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1626, + "Pokemon": 744, + "Traps": 122, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1627, + "Pokemon": 744, + "Traps": 122, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1628, + "Pokemon": 744, + "Traps": 122, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1629, + "Pokemon": 745, + "Traps": 122, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1630, + "Pokemon": 745, + "Traps": 122, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1631, + "Pokemon": 746, + "Traps": 122, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1632, + "Pokemon": 746, + "Traps": 122, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1633, + "Pokemon": 746, + "Traps": 122, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1634, + "Pokemon": 747, + "Traps": 123, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1635, + "Pokemon": 748, + "Traps": 124, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1636, + "Pokemon": 748, + "Traps": 124, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1637, + "Pokemon": 748, + "Traps": 125, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1638, + "Pokemon": 748, + "Traps": 126, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1639, + "Pokemon": 748, + "Traps": 124, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1640, + "Pokemon": 748, + "Traps": 124, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1641, + "Pokemon": 748, + "Traps": 124, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1642, + "Pokemon": 748, + "Traps": 127, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1643, + "Pokemon": 748, + "Traps": 128, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1644, + "Pokemon": 748, + "Traps": 129, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1645, + "Pokemon": 748, + "Traps": 129, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1646, + "Pokemon": 748, + "Traps": 129, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1647, + "Pokemon": 748, + "Traps": 129, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1648, + "Pokemon": 748, + "Traps": 129, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1649, + "Pokemon": 748, + "Traps": 130, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1650, + "Pokemon": 748, + "Traps": 130, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1651, + "Pokemon": 748, + "Traps": 131, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1652, + "Pokemon": 748, + "Traps": 132, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1653, + "Pokemon": 748, + "Traps": 132, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1654, + "Pokemon": 748, + "Traps": 132, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1655, + "Pokemon": 749, + "Traps": 133, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1656, + "Pokemon": 749, + "Traps": 133, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1657, + "Pokemon": 749, + "Traps": 133, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1658, + "Pokemon": 749, + "Traps": 134, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1659, + "Pokemon": 749, + "Traps": 134, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1660, + "Pokemon": 749, + "Traps": 135, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1661, + "Pokemon": 749, + "Traps": 136, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1662, + "Pokemon": 749, + "Traps": 136, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1663, + "Pokemon": 749, + "Traps": 136, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + } + ] +} diff --git a/data/dungeon/D63/floor_id.json b/data/dungeon/D63/floor_id.json index 0f6bd5d..3b28c57 100644 --- a/data/dungeon/D63/floor_id.json +++ b/data/dungeon/D63/floor_id.json @@ -1,14 +1,14 @@ -{ - "name": "D63FloorID", - "tables": [ - { - "MainData": 1763, - "Pokemon": 526, - "Traps": 87, - "Items": 176, - "KecleonShop": 19, - "MonsterRoomItems": 177, - "BuriedItems": 66 - } - ] -} +{ + "name": "D63FloorID", + "tables": [ + { + "MainData": 1763, + "Pokemon": 526, + "Traps": 87, + "Items": 176, + "KecleonShop": 19, + "MonsterRoomItems": 177, + "BuriedItems": 66 + } + ] +} diff --git a/data/dungeon/DarknightRelic/floor_id.json b/data/dungeon/DarknightRelic/floor_id.json index 5d9bbc2..9ff8fc6 100644 --- a/data/dungeon/DarknightRelic/floor_id.json +++ b/data/dungeon/DarknightRelic/floor_id.json @@ -1,140 +1,140 @@ -{ - "name": "DarknightRelicFloorID", - "tables": [ - { - "MainData": 950, - "Pokemon": 443, - "Traps": 7, - "Items": 107, - "KecleonShop": 108, - "MonsterRoomItems": 46, - "BuriedItems": 109 - }, - { - "MainData": 951, - "Pokemon": 443, - "Traps": 7, - "Items": 107, - "KecleonShop": 108, - "MonsterRoomItems": 46, - "BuriedItems": 109 - }, - { - "MainData": 952, - "Pokemon": 443, - "Traps": 7, - "Items": 107, - "KecleonShop": 108, - "MonsterRoomItems": 46, - "BuriedItems": 109 - }, - { - "MainData": 953, - "Pokemon": 443, - "Traps": 7, - "Items": 110, - "KecleonShop": 108, - "MonsterRoomItems": 46, - "BuriedItems": 109 - }, - { - "MainData": 954, - "Pokemon": 443, - "Traps": 7, - "Items": 110, - "KecleonShop": 108, - "MonsterRoomItems": 46, - "BuriedItems": 109 - }, - { - "MainData": 955, - "Pokemon": 444, - "Traps": 7, - "Items": 110, - "KecleonShop": 108, - "MonsterRoomItems": 46, - "BuriedItems": 109 - }, - { - "MainData": 956, - "Pokemon": 445, - "Traps": 7, - "Items": 110, - "KecleonShop": 108, - "MonsterRoomItems": 46, - "BuriedItems": 109 - }, - { - "MainData": 957, - "Pokemon": 445, - "Traps": 7, - "Items": 110, - "KecleonShop": 108, - "MonsterRoomItems": 46, - "BuriedItems": 109 - }, - { - "MainData": 958, - "Pokemon": 445, - "Traps": 7, - "Items": 110, - "KecleonShop": 108, - "MonsterRoomItems": 46, - "BuriedItems": 109 - }, - { - "MainData": 959, - "Pokemon": 445, - "Traps": 8, - "Items": 110, - "KecleonShop": 108, - "MonsterRoomItems": 46, - "BuriedItems": 109 - }, - { - "MainData": 960, - "Pokemon": 446, - "Traps": 8, - "Items": 110, - "KecleonShop": 108, - "MonsterRoomItems": 46, - "BuriedItems": 109 - }, - { - "MainData": 961, - "Pokemon": 447, - "Traps": 8, - "Items": 110, - "KecleonShop": 108, - "MonsterRoomItems": 46, - "BuriedItems": 109 - }, - { - "MainData": 962, - "Pokemon": 447, - "Traps": 8, - "Items": 110, - "KecleonShop": 108, - "MonsterRoomItems": 46, - "BuriedItems": 109 - }, - { - "MainData": 963, - "Pokemon": 447, - "Traps": 8, - "Items": 110, - "KecleonShop": 108, - "MonsterRoomItems": 46, - "BuriedItems": 109 - }, - { - "MainData": 964, - "Pokemon": 447, - "Traps": 8, - "Items": 110, - "KecleonShop": 108, - "MonsterRoomItems": 46, - "BuriedItems": 109 - } - ] -} +{ + "name": "DarknightRelicFloorID", + "tables": [ + { + "MainData": 950, + "Pokemon": 443, + "Traps": 7, + "Items": 107, + "KecleonShop": 108, + "MonsterRoomItems": 46, + "BuriedItems": 109 + }, + { + "MainData": 951, + "Pokemon": 443, + "Traps": 7, + "Items": 107, + "KecleonShop": 108, + "MonsterRoomItems": 46, + "BuriedItems": 109 + }, + { + "MainData": 952, + "Pokemon": 443, + "Traps": 7, + "Items": 107, + "KecleonShop": 108, + "MonsterRoomItems": 46, + "BuriedItems": 109 + }, + { + "MainData": 953, + "Pokemon": 443, + "Traps": 7, + "Items": 110, + "KecleonShop": 108, + "MonsterRoomItems": 46, + "BuriedItems": 109 + }, + { + "MainData": 954, + "Pokemon": 443, + "Traps": 7, + "Items": 110, + "KecleonShop": 108, + "MonsterRoomItems": 46, + "BuriedItems": 109 + }, + { + "MainData": 955, + "Pokemon": 444, + "Traps": 7, + "Items": 110, + "KecleonShop": 108, + "MonsterRoomItems": 46, + "BuriedItems": 109 + }, + { + "MainData": 956, + "Pokemon": 445, + "Traps": 7, + "Items": 110, + "KecleonShop": 108, + "MonsterRoomItems": 46, + "BuriedItems": 109 + }, + { + "MainData": 957, + "Pokemon": 445, + "Traps": 7, + "Items": 110, + "KecleonShop": 108, + "MonsterRoomItems": 46, + "BuriedItems": 109 + }, + { + "MainData": 958, + "Pokemon": 445, + "Traps": 7, + "Items": 110, + "KecleonShop": 108, + "MonsterRoomItems": 46, + "BuriedItems": 109 + }, + { + "MainData": 959, + "Pokemon": 445, + "Traps": 8, + "Items": 110, + "KecleonShop": 108, + "MonsterRoomItems": 46, + "BuriedItems": 109 + }, + { + "MainData": 960, + "Pokemon": 446, + "Traps": 8, + "Items": 110, + "KecleonShop": 108, + "MonsterRoomItems": 46, + "BuriedItems": 109 + }, + { + "MainData": 961, + "Pokemon": 447, + "Traps": 8, + "Items": 110, + "KecleonShop": 108, + "MonsterRoomItems": 46, + "BuriedItems": 109 + }, + { + "MainData": 962, + "Pokemon": 447, + "Traps": 8, + "Items": 110, + "KecleonShop": 108, + "MonsterRoomItems": 46, + "BuriedItems": 109 + }, + { + "MainData": 963, + "Pokemon": 447, + "Traps": 8, + "Items": 110, + "KecleonShop": 108, + "MonsterRoomItems": 46, + "BuriedItems": 109 + }, + { + "MainData": 964, + "Pokemon": 447, + "Traps": 8, + "Items": 110, + "KecleonShop": 108, + "MonsterRoomItems": 46, + "BuriedItems": 109 + } + ] +} diff --git a/data/dungeon/DesertRegion/floor_id.json b/data/dungeon/DesertRegion/floor_id.json index 862ab4b..bb03749 100644 --- a/data/dungeon/DesertRegion/floor_id.json +++ b/data/dungeon/DesertRegion/floor_id.json @@ -1,185 +1,185 @@ -{ - "name": "DesertRegionFloorID", - "tables": [ - { - "MainData": 740, - "Pokemon": 340, - "Traps": 64, - "Items": 89, - "KecleonShop": 90, - "MonsterRoomItems": 46, - "BuriedItems": 91 - }, - { - "MainData": 741, - "Pokemon": 340, - "Traps": 64, - "Items": 89, - "KecleonShop": 90, - "MonsterRoomItems": 46, - "BuriedItems": 91 - }, - { - "MainData": 742, - "Pokemon": 340, - "Traps": 64, - "Items": 89, - "KecleonShop": 90, - "MonsterRoomItems": 46, - "BuriedItems": 91 - }, - { - "MainData": 743, - "Pokemon": 340, - "Traps": 64, - "Items": 89, - "KecleonShop": 90, - "MonsterRoomItems": 46, - "BuriedItems": 91 - }, - { - "MainData": 744, - "Pokemon": 340, - "Traps": 64, - "Items": 89, - "KecleonShop": 90, - "MonsterRoomItems": 46, - "BuriedItems": 91 - }, - { - "MainData": 745, - "Pokemon": 340, - "Traps": 64, - "Items": 89, - "KecleonShop": 90, - "MonsterRoomItems": 46, - "BuriedItems": 91 - }, - { - "MainData": 746, - "Pokemon": 341, - "Traps": 64, - "Items": 89, - "KecleonShop": 90, - "MonsterRoomItems": 46, - "BuriedItems": 91 - }, - { - "MainData": 747, - "Pokemon": 341, - "Traps": 64, - "Items": 89, - "KecleonShop": 90, - "MonsterRoomItems": 46, - "BuriedItems": 91 - }, - { - "MainData": 748, - "Pokemon": 341, - "Traps": 64, - "Items": 89, - "KecleonShop": 90, - "MonsterRoomItems": 46, - "BuriedItems": 91 - }, - { - "MainData": 749, - "Pokemon": 341, - "Traps": 64, - "Items": 89, - "KecleonShop": 90, - "MonsterRoomItems": 46, - "BuriedItems": 91 - }, - { - "MainData": 750, - "Pokemon": 341, - "Traps": 64, - "Items": 89, - "KecleonShop": 90, - "MonsterRoomItems": 46, - "BuriedItems": 91 - }, - { - "MainData": 751, - "Pokemon": 342, - "Traps": 64, - "Items": 89, - "KecleonShop": 90, - "MonsterRoomItems": 46, - "BuriedItems": 91 - }, - { - "MainData": 752, - "Pokemon": 342, - "Traps": 64, - "Items": 89, - "KecleonShop": 90, - "MonsterRoomItems": 46, - "BuriedItems": 91 - }, - { - "MainData": 753, - "Pokemon": 343, - "Traps": 64, - "Items": 89, - "KecleonShop": 90, - "MonsterRoomItems": 46, - "BuriedItems": 91 - }, - { - "MainData": 754, - "Pokemon": 344, - "Traps": 64, - "Items": 89, - "KecleonShop": 90, - "MonsterRoomItems": 46, - "BuriedItems": 91 - }, - { - "MainData": 755, - "Pokemon": 344, - "Traps": 64, - "Items": 89, - "KecleonShop": 90, - "MonsterRoomItems": 46, - "BuriedItems": 91 - }, - { - "MainData": 756, - "Pokemon": 344, - "Traps": 64, - "Items": 89, - "KecleonShop": 90, - "MonsterRoomItems": 46, - "BuriedItems": 91 - }, - { - "MainData": 757, - "Pokemon": 344, - "Traps": 64, - "Items": 89, - "KecleonShop": 90, - "MonsterRoomItems": 46, - "BuriedItems": 91 - }, - { - "MainData": 758, - "Pokemon": 344, - "Traps": 64, - "Items": 92, - "KecleonShop": 90, - "MonsterRoomItems": 46, - "BuriedItems": 91 - }, - { - "MainData": 759, - "Pokemon": 344, - "Traps": 64, - "Items": 92, - "KecleonShop": 90, - "MonsterRoomItems": 46, - "BuriedItems": 91 - } - ] -} +{ + "name": "DesertRegionFloorID", + "tables": [ + { + "MainData": 740, + "Pokemon": 340, + "Traps": 64, + "Items": 89, + "KecleonShop": 90, + "MonsterRoomItems": 46, + "BuriedItems": 91 + }, + { + "MainData": 741, + "Pokemon": 340, + "Traps": 64, + "Items": 89, + "KecleonShop": 90, + "MonsterRoomItems": 46, + "BuriedItems": 91 + }, + { + "MainData": 742, + "Pokemon": 340, + "Traps": 64, + "Items": 89, + "KecleonShop": 90, + "MonsterRoomItems": 46, + "BuriedItems": 91 + }, + { + "MainData": 743, + "Pokemon": 340, + "Traps": 64, + "Items": 89, + "KecleonShop": 90, + "MonsterRoomItems": 46, + "BuriedItems": 91 + }, + { + "MainData": 744, + "Pokemon": 340, + "Traps": 64, + "Items": 89, + "KecleonShop": 90, + "MonsterRoomItems": 46, + "BuriedItems": 91 + }, + { + "MainData": 745, + "Pokemon": 340, + "Traps": 64, + "Items": 89, + "KecleonShop": 90, + "MonsterRoomItems": 46, + "BuriedItems": 91 + }, + { + "MainData": 746, + "Pokemon": 341, + "Traps": 64, + "Items": 89, + "KecleonShop": 90, + "MonsterRoomItems": 46, + "BuriedItems": 91 + }, + { + "MainData": 747, + "Pokemon": 341, + "Traps": 64, + "Items": 89, + "KecleonShop": 90, + "MonsterRoomItems": 46, + "BuriedItems": 91 + }, + { + "MainData": 748, + "Pokemon": 341, + "Traps": 64, + "Items": 89, + "KecleonShop": 90, + "MonsterRoomItems": 46, + "BuriedItems": 91 + }, + { + "MainData": 749, + "Pokemon": 341, + "Traps": 64, + "Items": 89, + "KecleonShop": 90, + "MonsterRoomItems": 46, + "BuriedItems": 91 + }, + { + "MainData": 750, + "Pokemon": 341, + "Traps": 64, + "Items": 89, + "KecleonShop": 90, + "MonsterRoomItems": 46, + "BuriedItems": 91 + }, + { + "MainData": 751, + "Pokemon": 342, + "Traps": 64, + "Items": 89, + "KecleonShop": 90, + "MonsterRoomItems": 46, + "BuriedItems": 91 + }, + { + "MainData": 752, + "Pokemon": 342, + "Traps": 64, + "Items": 89, + "KecleonShop": 90, + "MonsterRoomItems": 46, + "BuriedItems": 91 + }, + { + "MainData": 753, + "Pokemon": 343, + "Traps": 64, + "Items": 89, + "KecleonShop": 90, + "MonsterRoomItems": 46, + "BuriedItems": 91 + }, + { + "MainData": 754, + "Pokemon": 344, + "Traps": 64, + "Items": 89, + "KecleonShop": 90, + "MonsterRoomItems": 46, + "BuriedItems": 91 + }, + { + "MainData": 755, + "Pokemon": 344, + "Traps": 64, + "Items": 89, + "KecleonShop": 90, + "MonsterRoomItems": 46, + "BuriedItems": 91 + }, + { + "MainData": 756, + "Pokemon": 344, + "Traps": 64, + "Items": 89, + "KecleonShop": 90, + "MonsterRoomItems": 46, + "BuriedItems": 91 + }, + { + "MainData": 757, + "Pokemon": 344, + "Traps": 64, + "Items": 89, + "KecleonShop": 90, + "MonsterRoomItems": 46, + "BuriedItems": 91 + }, + { + "MainData": 758, + "Pokemon": 344, + "Traps": 64, + "Items": 92, + "KecleonShop": 90, + "MonsterRoomItems": 46, + "BuriedItems": 91 + }, + { + "MainData": 759, + "Pokemon": 344, + "Traps": 64, + "Items": 92, + "KecleonShop": 90, + "MonsterRoomItems": 46, + "BuriedItems": 91 + } + ] +} diff --git a/data/dungeon/DojoRegistration/floor_id.json b/data/dungeon/DojoRegistration/floor_id.json index 3fc17d1..a62a8ff 100644 --- a/data/dungeon/DojoRegistration/floor_id.json +++ b/data/dungeon/DojoRegistration/floor_id.json @@ -1,626 +1,626 @@ -{ - "name": "DojoRegistrationFloorID", - "tables": [ - { - "MainData": 1191, - "Pokemon": 543, - "Traps": 91, - "Items": 130, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1192, - "Pokemon": 543, - "Traps": 91, - "Items": 130, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1193, - "Pokemon": 544, - "Traps": 91, - "Items": 130, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1194, - "Pokemon": 545, - "Traps": 91, - "Items": 131, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1195, - "Pokemon": 545, - "Traps": 91, - "Items": 131, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1196, - "Pokemon": 545, - "Traps": 91, - "Items": 131, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1197, - "Pokemon": 546, - "Traps": 91, - "Items": 132, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1198, - "Pokemon": 546, - "Traps": 91, - "Items": 132, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1199, - "Pokemon": 546, - "Traps": 91, - "Items": 132, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1200, - "Pokemon": 547, - "Traps": 91, - "Items": 133, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1201, - "Pokemon": 547, - "Traps": 91, - "Items": 133, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1202, - "Pokemon": 548, - "Traps": 91, - "Items": 133, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1203, - "Pokemon": 549, - "Traps": 91, - "Items": 134, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1204, - "Pokemon": 549, - "Traps": 91, - "Items": 134, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1205, - "Pokemon": 550, - "Traps": 91, - "Items": 134, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1206, - "Pokemon": 551, - "Traps": 91, - "Items": 135, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1207, - "Pokemon": 551, - "Traps": 91, - "Items": 135, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1208, - "Pokemon": 551, - "Traps": 91, - "Items": 135, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1209, - "Pokemon": 552, - "Traps": 91, - "Items": 136, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1210, - "Pokemon": 552, - "Traps": 91, - "Items": 136, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1211, - "Pokemon": 553, - "Traps": 91, - "Items": 136, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1212, - "Pokemon": 554, - "Traps": 91, - "Items": 137, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1213, - "Pokemon": 554, - "Traps": 91, - "Items": 137, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1214, - "Pokemon": 554, - "Traps": 91, - "Items": 137, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1215, - "Pokemon": 555, - "Traps": 91, - "Items": 138, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1216, - "Pokemon": 555, - "Traps": 91, - "Items": 138, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1217, - "Pokemon": 556, - "Traps": 91, - "Items": 138, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1218, - "Pokemon": 557, - "Traps": 91, - "Items": 139, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1219, - "Pokemon": 557, - "Traps": 91, - "Items": 139, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1220, - "Pokemon": 557, - "Traps": 91, - "Items": 139, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1221, - "Pokemon": 558, - "Traps": 91, - "Items": 140, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1222, - "Pokemon": 558, - "Traps": 91, - "Items": 140, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1223, - "Pokemon": 559, - "Traps": 91, - "Items": 140, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1224, - "Pokemon": 560, - "Traps": 91, - "Items": 141, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1225, - "Pokemon": 560, - "Traps": 91, - "Items": 141, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1226, - "Pokemon": 560, - "Traps": 91, - "Items": 141, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1227, - "Pokemon": 561, - "Traps": 91, - "Items": 142, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1228, - "Pokemon": 561, - "Traps": 91, - "Items": 142, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1229, - "Pokemon": 562, - "Traps": 91, - "Items": 142, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1230, - "Pokemon": 563, - "Traps": 91, - "Items": 143, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1231, - "Pokemon": 563, - "Traps": 91, - "Items": 143, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1232, - "Pokemon": 563, - "Traps": 91, - "Items": 143, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1233, - "Pokemon": 564, - "Traps": 91, - "Items": 144, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1234, - "Pokemon": 564, - "Traps": 91, - "Items": 144, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1235, - "Pokemon": 564, - "Traps": 91, - "Items": 144, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1236, - "Pokemon": 565, - "Traps": 91, - "Items": 145, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1237, - "Pokemon": 565, - "Traps": 91, - "Items": 145, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1238, - "Pokemon": 566, - "Traps": 91, - "Items": 145, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1233, - "Pokemon": 567, - "Traps": 91, - "Items": 146, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1239, - "Pokemon": 567, - "Traps": 91, - "Items": 146, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1240, - "Pokemon": 567, - "Traps": 91, - "Items": 146, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1241, - "Pokemon": 568, - "Traps": 91, - "Items": 147, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1242, - "Pokemon": 568, - "Traps": 91, - "Items": 147, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1243, - "Pokemon": 569, - "Traps": 91, - "Items": 147, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1244, - "Pokemon": 570, - "Traps": 91, - "Items": 147, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1245, - "Pokemon": 570, - "Traps": 91, - "Items": 147, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1246, - "Pokemon": 571, - "Traps": 91, - "Items": 147, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1247, - "Pokemon": 546, - "Traps": 91, - "Items": 147, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1248, - "Pokemon": 546, - "Traps": 91, - "Items": 147, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1249, - "Pokemon": 572, - "Traps": 91, - "Items": 147, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1250, - "Pokemon": 573, - "Traps": 91, - "Items": 147, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1251, - "Pokemon": 573, - "Traps": 91, - "Items": 147, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1252, - "Pokemon": 574, - "Traps": 91, - "Items": 147, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1250, - "Pokemon": 546, - "Traps": 91, - "Items": 147, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1251, - "Pokemon": 546, - "Traps": 91, - "Items": 147, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1253, - "Pokemon": 546, - "Traps": 91, - "Items": 147, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1254, - "Pokemon": 575, - "Traps": 91, - "Items": 147, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1255, - "Pokemon": 575, - "Traps": 91, - "Items": 147, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1256, - "Pokemon": 575, - "Traps": 91, - "Items": 147, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - } - ] -} +{ + "name": "DojoRegistrationFloorID", + "tables": [ + { + "MainData": 1191, + "Pokemon": 543, + "Traps": 91, + "Items": 130, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1192, + "Pokemon": 543, + "Traps": 91, + "Items": 130, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1193, + "Pokemon": 544, + "Traps": 91, + "Items": 130, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1194, + "Pokemon": 545, + "Traps": 91, + "Items": 131, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1195, + "Pokemon": 545, + "Traps": 91, + "Items": 131, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1196, + "Pokemon": 545, + "Traps": 91, + "Items": 131, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1197, + "Pokemon": 546, + "Traps": 91, + "Items": 132, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1198, + "Pokemon": 546, + "Traps": 91, + "Items": 132, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1199, + "Pokemon": 546, + "Traps": 91, + "Items": 132, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1200, + "Pokemon": 547, + "Traps": 91, + "Items": 133, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1201, + "Pokemon": 547, + "Traps": 91, + "Items": 133, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1202, + "Pokemon": 548, + "Traps": 91, + "Items": 133, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1203, + "Pokemon": 549, + "Traps": 91, + "Items": 134, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1204, + "Pokemon": 549, + "Traps": 91, + "Items": 134, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1205, + "Pokemon": 550, + "Traps": 91, + "Items": 134, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1206, + "Pokemon": 551, + "Traps": 91, + "Items": 135, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1207, + "Pokemon": 551, + "Traps": 91, + "Items": 135, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1208, + "Pokemon": 551, + "Traps": 91, + "Items": 135, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1209, + "Pokemon": 552, + "Traps": 91, + "Items": 136, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1210, + "Pokemon": 552, + "Traps": 91, + "Items": 136, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1211, + "Pokemon": 553, + "Traps": 91, + "Items": 136, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1212, + "Pokemon": 554, + "Traps": 91, + "Items": 137, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1213, + "Pokemon": 554, + "Traps": 91, + "Items": 137, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1214, + "Pokemon": 554, + "Traps": 91, + "Items": 137, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1215, + "Pokemon": 555, + "Traps": 91, + "Items": 138, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1216, + "Pokemon": 555, + "Traps": 91, + "Items": 138, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1217, + "Pokemon": 556, + "Traps": 91, + "Items": 138, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1218, + "Pokemon": 557, + "Traps": 91, + "Items": 139, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1219, + "Pokemon": 557, + "Traps": 91, + "Items": 139, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1220, + "Pokemon": 557, + "Traps": 91, + "Items": 139, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1221, + "Pokemon": 558, + "Traps": 91, + "Items": 140, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1222, + "Pokemon": 558, + "Traps": 91, + "Items": 140, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1223, + "Pokemon": 559, + "Traps": 91, + "Items": 140, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1224, + "Pokemon": 560, + "Traps": 91, + "Items": 141, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1225, + "Pokemon": 560, + "Traps": 91, + "Items": 141, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1226, + "Pokemon": 560, + "Traps": 91, + "Items": 141, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1227, + "Pokemon": 561, + "Traps": 91, + "Items": 142, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1228, + "Pokemon": 561, + "Traps": 91, + "Items": 142, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1229, + "Pokemon": 562, + "Traps": 91, + "Items": 142, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1230, + "Pokemon": 563, + "Traps": 91, + "Items": 143, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1231, + "Pokemon": 563, + "Traps": 91, + "Items": 143, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1232, + "Pokemon": 563, + "Traps": 91, + "Items": 143, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1233, + "Pokemon": 564, + "Traps": 91, + "Items": 144, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1234, + "Pokemon": 564, + "Traps": 91, + "Items": 144, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1235, + "Pokemon": 564, + "Traps": 91, + "Items": 144, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1236, + "Pokemon": 565, + "Traps": 91, + "Items": 145, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1237, + "Pokemon": 565, + "Traps": 91, + "Items": 145, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1238, + "Pokemon": 566, + "Traps": 91, + "Items": 145, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1233, + "Pokemon": 567, + "Traps": 91, + "Items": 146, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1239, + "Pokemon": 567, + "Traps": 91, + "Items": 146, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1240, + "Pokemon": 567, + "Traps": 91, + "Items": 146, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1241, + "Pokemon": 568, + "Traps": 91, + "Items": 147, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1242, + "Pokemon": 568, + "Traps": 91, + "Items": 147, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1243, + "Pokemon": 569, + "Traps": 91, + "Items": 147, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1244, + "Pokemon": 570, + "Traps": 91, + "Items": 147, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1245, + "Pokemon": 570, + "Traps": 91, + "Items": 147, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1246, + "Pokemon": 571, + "Traps": 91, + "Items": 147, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1247, + "Pokemon": 546, + "Traps": 91, + "Items": 147, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1248, + "Pokemon": 546, + "Traps": 91, + "Items": 147, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1249, + "Pokemon": 572, + "Traps": 91, + "Items": 147, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1250, + "Pokemon": 573, + "Traps": 91, + "Items": 147, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1251, + "Pokemon": 573, + "Traps": 91, + "Items": 147, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1252, + "Pokemon": 574, + "Traps": 91, + "Items": 147, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1250, + "Pokemon": 546, + "Traps": 91, + "Items": 147, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1251, + "Pokemon": 546, + "Traps": 91, + "Items": 147, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1253, + "Pokemon": 546, + "Traps": 91, + "Items": 147, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1254, + "Pokemon": 575, + "Traps": 91, + "Items": 147, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1255, + "Pokemon": 575, + "Traps": 91, + "Items": 147, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1256, + "Pokemon": 575, + "Traps": 91, + "Items": 147, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + } + ] +} diff --git a/data/dungeon/FantasyStrait/floor_id.json b/data/dungeon/FantasyStrait/floor_id.json index 38b8b3e..b948978 100644 --- a/data/dungeon/FantasyStrait/floor_id.json +++ b/data/dungeon/FantasyStrait/floor_id.json @@ -1,275 +1,275 @@ -{ - "name": "FantasyStraitFloorID", - "tables": [ - { - "MainData": 1091, - "Pokemon": 509, - "Traps": 86, - "Items": 121, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1092, - "Pokemon": 509, - "Traps": 86, - "Items": 121, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1093, - "Pokemon": 509, - "Traps": 86, - "Items": 121, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1094, - "Pokemon": 509, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1095, - "Pokemon": 510, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1096, - "Pokemon": 511, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1097, - "Pokemon": 511, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1098, - "Pokemon": 511, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1099, - "Pokemon": 512, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1100, - "Pokemon": 513, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1101, - "Pokemon": 513, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1102, - "Pokemon": 513, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1103, - "Pokemon": 513, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1104, - "Pokemon": 514, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1105, - "Pokemon": 515, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1106, - "Pokemon": 515, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1107, - "Pokemon": 515, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1108, - "Pokemon": 515, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1109, - "Pokemon": 515, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1110, - "Pokemon": 516, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1111, - "Pokemon": 517, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1112, - "Pokemon": 517, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1113, - "Pokemon": 517, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1114, - "Pokemon": 137, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1115, - "Pokemon": 518, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1116, - "Pokemon": 519, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1117, - "Pokemon": 519, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1118, - "Pokemon": 519, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1119, - "Pokemon": 519, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1120, - "Pokemon": 520, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - } - ] -} +{ + "name": "FantasyStraitFloorID", + "tables": [ + { + "MainData": 1091, + "Pokemon": 509, + "Traps": 86, + "Items": 121, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1092, + "Pokemon": 509, + "Traps": 86, + "Items": 121, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1093, + "Pokemon": 509, + "Traps": 86, + "Items": 121, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1094, + "Pokemon": 509, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1095, + "Pokemon": 510, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1096, + "Pokemon": 511, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1097, + "Pokemon": 511, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1098, + "Pokemon": 511, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1099, + "Pokemon": 512, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1100, + "Pokemon": 513, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1101, + "Pokemon": 513, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1102, + "Pokemon": 513, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1103, + "Pokemon": 513, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1104, + "Pokemon": 514, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1105, + "Pokemon": 515, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1106, + "Pokemon": 515, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1107, + "Pokemon": 515, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1108, + "Pokemon": 515, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1109, + "Pokemon": 515, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1110, + "Pokemon": 516, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1111, + "Pokemon": 517, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1112, + "Pokemon": 517, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1113, + "Pokemon": 517, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1114, + "Pokemon": 137, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1115, + "Pokemon": 518, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1116, + "Pokemon": 519, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1117, + "Pokemon": 519, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1118, + "Pokemon": 519, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1119, + "Pokemon": 519, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1120, + "Pokemon": 520, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + } + ] +} diff --git a/data/dungeon/FantasyStraitAlt/floor_id.json b/data/dungeon/FantasyStraitAlt/floor_id.json index b3a4e2d..c7945af 100644 --- a/data/dungeon/FantasyStraitAlt/floor_id.json +++ b/data/dungeon/FantasyStraitAlt/floor_id.json @@ -1,176 +1,176 @@ -{ - "name": "FantasyStraitAltFloorID", - "tables": [ - { - "MainData": 1302, - "Pokemon": 526, - "Traps": 87, - "Items": 87, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1303, - "Pokemon": 526, - "Traps": 87, - "Items": 87, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1304, - "Pokemon": 527, - "Traps": 87, - "Items": 87, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1305, - "Pokemon": 528, - "Traps": 87, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1306, - "Pokemon": 529, - "Traps": 87, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1307, - "Pokemon": 529, - "Traps": 87, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1308, - "Pokemon": 530, - "Traps": 87, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1309, - "Pokemon": 530, - "Traps": 87, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1310, - "Pokemon": 530, - "Traps": 87, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1311, - "Pokemon": 531, - "Traps": 87, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1312, - "Pokemon": 531, - "Traps": 87, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1313, - "Pokemon": 531, - "Traps": 87, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1314, - "Pokemon": 531, - "Traps": 87, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1315, - "Pokemon": 534, - "Traps": 87, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1316, - "Pokemon": 534, - "Traps": 87, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1317, - "Pokemon": 535, - "Traps": 87, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1318, - "Pokemon": 535, - "Traps": 87, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1319, - "Pokemon": 535, - "Traps": 87, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1320, - "Pokemon": 535, - "Traps": 92, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - } - ] -} +{ + "name": "FantasyStraitAltFloorID", + "tables": [ + { + "MainData": 1302, + "Pokemon": 526, + "Traps": 87, + "Items": 87, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1303, + "Pokemon": 526, + "Traps": 87, + "Items": 87, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1304, + "Pokemon": 527, + "Traps": 87, + "Items": 87, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1305, + "Pokemon": 528, + "Traps": 87, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1306, + "Pokemon": 529, + "Traps": 87, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1307, + "Pokemon": 529, + "Traps": 87, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1308, + "Pokemon": 530, + "Traps": 87, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1309, + "Pokemon": 530, + "Traps": 87, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1310, + "Pokemon": 530, + "Traps": 87, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1311, + "Pokemon": 531, + "Traps": 87, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1312, + "Pokemon": 531, + "Traps": 87, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1313, + "Pokemon": 531, + "Traps": 87, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1314, + "Pokemon": 531, + "Traps": 87, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1315, + "Pokemon": 534, + "Traps": 87, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1316, + "Pokemon": 534, + "Traps": 87, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1317, + "Pokemon": 535, + "Traps": 87, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1318, + "Pokemon": 535, + "Traps": 87, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1319, + "Pokemon": 535, + "Traps": 87, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1320, + "Pokemon": 535, + "Traps": 92, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + } + ] +} diff --git a/data/dungeon/FaroffSea/floor_id.json b/data/dungeon/FaroffSea/floor_id.json index 8853274..473c344 100644 --- a/data/dungeon/FaroffSea/floor_id.json +++ b/data/dungeon/FaroffSea/floor_id.json @@ -1,680 +1,680 @@ -{ - "name": "FarOffSeaFloorID", - "tables": [ - { - "MainData": 1450, - "Pokemon": 689, - "Traps": 6, - "Items": 164, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1451, - "Pokemon": 689, - "Traps": 6, - "Items": 164, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1452, - "Pokemon": 689, - "Traps": 6, - "Items": 164, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1453, - "Pokemon": 689, - "Traps": 6, - "Items": 164, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1454, - "Pokemon": 689, - "Traps": 6, - "Items": 164, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1455, - "Pokemon": 690, - "Traps": 6, - "Items": 164, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1456, - "Pokemon": 690, - "Traps": 6, - "Items": 164, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1457, - "Pokemon": 690, - "Traps": 6, - "Items": 164, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1458, - "Pokemon": 691, - "Traps": 6, - "Items": 164, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1459, - "Pokemon": 692, - "Traps": 6, - "Items": 164, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1460, - "Pokemon": 693, - "Traps": 6, - "Items": 164, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1461, - "Pokemon": 693, - "Traps": 6, - "Items": 164, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1462, - "Pokemon": 693, - "Traps": 6, - "Items": 164, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1463, - "Pokemon": 694, - "Traps": 6, - "Items": 164, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1464, - "Pokemon": 695, - "Traps": 6, - "Items": 164, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1465, - "Pokemon": 695, - "Traps": 6, - "Items": 164, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1466, - "Pokemon": 695, - "Traps": 6, - "Items": 164, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1467, - "Pokemon": 695, - "Traps": 6, - "Items": 164, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1468, - "Pokemon": 695, - "Traps": 6, - "Items": 164, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1469, - "Pokemon": 696, - "Traps": 6, - "Items": 164, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1470, - "Pokemon": 697, - "Traps": 6, - "Items": 164, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1471, - "Pokemon": 697, - "Traps": 6, - "Items": 164, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1472, - "Pokemon": 697, - "Traps": 6, - "Items": 164, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1473, - "Pokemon": 698, - "Traps": 6, - "Items": 164, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1474, - "Pokemon": 698, - "Traps": 6, - "Items": 164, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1475, - "Pokemon": 699, - "Traps": 6, - "Items": 164, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1476, - "Pokemon": 699, - "Traps": 6, - "Items": 164, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1477, - "Pokemon": 699, - "Traps": 6, - "Items": 164, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1478, - "Pokemon": 699, - "Traps": 6, - "Items": 164, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1479, - "Pokemon": 700, - "Traps": 6, - "Items": 164, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1480, - "Pokemon": 701, - "Traps": 6, - "Items": 164, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1481, - "Pokemon": 701, - "Traps": 6, - "Items": 164, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1482, - "Pokemon": 701, - "Traps": 6, - "Items": 164, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1483, - "Pokemon": 701, - "Traps": 6, - "Items": 164, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1484, - "Pokemon": 702, - "Traps": 6, - "Items": 164, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1485, - "Pokemon": 703, - "Traps": 6, - "Items": 164, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1486, - "Pokemon": 704, - "Traps": 6, - "Items": 164, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1487, - "Pokemon": 704, - "Traps": 6, - "Items": 164, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1488, - "Pokemon": 704, - "Traps": 6, - "Items": 164, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1489, - "Pokemon": 705, - "Traps": 6, - "Items": 164, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1490, - "Pokemon": 706, - "Traps": 6, - "Items": 164, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1491, - "Pokemon": 706, - "Traps": 6, - "Items": 164, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1492, - "Pokemon": 706, - "Traps": 6, - "Items": 164, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1493, - "Pokemon": 706, - "Traps": 6, - "Items": 164, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1494, - "Pokemon": 707, - "Traps": 6, - "Items": 164, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1495, - "Pokemon": 707, - "Traps": 6, - "Items": 164, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1496, - "Pokemon": 707, - "Traps": 6, - "Items": 164, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1497, - "Pokemon": 707, - "Traps": 6, - "Items": 164, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1498, - "Pokemon": 707, - "Traps": 6, - "Items": 164, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1499, - "Pokemon": 708, - "Traps": 6, - "Items": 164, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1500, - "Pokemon": 709, - "Traps": 6, - "Items": 165, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1501, - "Pokemon": 709, - "Traps": 6, - "Items": 165, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1502, - "Pokemon": 709, - "Traps": 6, - "Items": 165, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1503, - "Pokemon": 709, - "Traps": 6, - "Items": 165, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1504, - "Pokemon": 710, - "Traps": 6, - "Items": 165, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1505, - "Pokemon": 710, - "Traps": 6, - "Items": 165, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1506, - "Pokemon": 710, - "Traps": 6, - "Items": 165, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1507, - "Pokemon": 710, - "Traps": 6, - "Items": 165, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1508, - "Pokemon": 710, - "Traps": 6, - "Items": 165, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1509, - "Pokemon": 711, - "Traps": 6, - "Items": 165, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1510, - "Pokemon": 153, - "Traps": 6, - "Items": 165, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1511, - "Pokemon": 153, - "Traps": 6, - "Items": 165, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1512, - "Pokemon": 153, - "Traps": 6, - "Items": 165, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1513, - "Pokemon": 153, - "Traps": 6, - "Items": 165, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1514, - "Pokemon": 712, - "Traps": 6, - "Items": 165, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1515, - "Pokemon": 712, - "Traps": 6, - "Items": 165, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1516, - "Pokemon": 712, - "Traps": 6, - "Items": 165, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1517, - "Pokemon": 712, - "Traps": 6, - "Items": 165, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1518, - "Pokemon": 712, - "Traps": 6, - "Items": 165, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1519, - "Pokemon": 713, - "Traps": 6, - "Items": 165, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1520, - "Pokemon": 714, - "Traps": 6, - "Items": 165, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1521, - "Pokemon": 714, - "Traps": 6, - "Items": 165, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1522, - "Pokemon": 714, - "Traps": 6, - "Items": 165, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1523, - "Pokemon": 714, - "Traps": 6, - "Items": 165, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - }, - { - "MainData": 1524, - "Pokemon": 714, - "Traps": 6, - "Items": 165, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 62 - } - ] -} +{ + "name": "FarOffSeaFloorID", + "tables": [ + { + "MainData": 1450, + "Pokemon": 689, + "Traps": 6, + "Items": 164, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1451, + "Pokemon": 689, + "Traps": 6, + "Items": 164, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1452, + "Pokemon": 689, + "Traps": 6, + "Items": 164, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1453, + "Pokemon": 689, + "Traps": 6, + "Items": 164, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1454, + "Pokemon": 689, + "Traps": 6, + "Items": 164, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1455, + "Pokemon": 690, + "Traps": 6, + "Items": 164, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1456, + "Pokemon": 690, + "Traps": 6, + "Items": 164, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1457, + "Pokemon": 690, + "Traps": 6, + "Items": 164, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1458, + "Pokemon": 691, + "Traps": 6, + "Items": 164, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1459, + "Pokemon": 692, + "Traps": 6, + "Items": 164, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1460, + "Pokemon": 693, + "Traps": 6, + "Items": 164, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1461, + "Pokemon": 693, + "Traps": 6, + "Items": 164, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1462, + "Pokemon": 693, + "Traps": 6, + "Items": 164, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1463, + "Pokemon": 694, + "Traps": 6, + "Items": 164, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1464, + "Pokemon": 695, + "Traps": 6, + "Items": 164, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1465, + "Pokemon": 695, + "Traps": 6, + "Items": 164, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1466, + "Pokemon": 695, + "Traps": 6, + "Items": 164, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1467, + "Pokemon": 695, + "Traps": 6, + "Items": 164, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1468, + "Pokemon": 695, + "Traps": 6, + "Items": 164, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1469, + "Pokemon": 696, + "Traps": 6, + "Items": 164, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1470, + "Pokemon": 697, + "Traps": 6, + "Items": 164, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1471, + "Pokemon": 697, + "Traps": 6, + "Items": 164, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1472, + "Pokemon": 697, + "Traps": 6, + "Items": 164, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1473, + "Pokemon": 698, + "Traps": 6, + "Items": 164, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1474, + "Pokemon": 698, + "Traps": 6, + "Items": 164, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1475, + "Pokemon": 699, + "Traps": 6, + "Items": 164, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1476, + "Pokemon": 699, + "Traps": 6, + "Items": 164, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1477, + "Pokemon": 699, + "Traps": 6, + "Items": 164, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1478, + "Pokemon": 699, + "Traps": 6, + "Items": 164, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1479, + "Pokemon": 700, + "Traps": 6, + "Items": 164, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1480, + "Pokemon": 701, + "Traps": 6, + "Items": 164, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1481, + "Pokemon": 701, + "Traps": 6, + "Items": 164, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1482, + "Pokemon": 701, + "Traps": 6, + "Items": 164, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1483, + "Pokemon": 701, + "Traps": 6, + "Items": 164, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1484, + "Pokemon": 702, + "Traps": 6, + "Items": 164, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1485, + "Pokemon": 703, + "Traps": 6, + "Items": 164, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1486, + "Pokemon": 704, + "Traps": 6, + "Items": 164, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1487, + "Pokemon": 704, + "Traps": 6, + "Items": 164, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1488, + "Pokemon": 704, + "Traps": 6, + "Items": 164, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1489, + "Pokemon": 705, + "Traps": 6, + "Items": 164, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1490, + "Pokemon": 706, + "Traps": 6, + "Items": 164, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1491, + "Pokemon": 706, + "Traps": 6, + "Items": 164, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1492, + "Pokemon": 706, + "Traps": 6, + "Items": 164, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1493, + "Pokemon": 706, + "Traps": 6, + "Items": 164, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1494, + "Pokemon": 707, + "Traps": 6, + "Items": 164, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1495, + "Pokemon": 707, + "Traps": 6, + "Items": 164, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1496, + "Pokemon": 707, + "Traps": 6, + "Items": 164, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1497, + "Pokemon": 707, + "Traps": 6, + "Items": 164, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1498, + "Pokemon": 707, + "Traps": 6, + "Items": 164, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1499, + "Pokemon": 708, + "Traps": 6, + "Items": 164, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1500, + "Pokemon": 709, + "Traps": 6, + "Items": 165, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1501, + "Pokemon": 709, + "Traps": 6, + "Items": 165, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1502, + "Pokemon": 709, + "Traps": 6, + "Items": 165, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1503, + "Pokemon": 709, + "Traps": 6, + "Items": 165, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1504, + "Pokemon": 710, + "Traps": 6, + "Items": 165, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1505, + "Pokemon": 710, + "Traps": 6, + "Items": 165, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1506, + "Pokemon": 710, + "Traps": 6, + "Items": 165, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1507, + "Pokemon": 710, + "Traps": 6, + "Items": 165, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1508, + "Pokemon": 710, + "Traps": 6, + "Items": 165, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1509, + "Pokemon": 711, + "Traps": 6, + "Items": 165, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1510, + "Pokemon": 153, + "Traps": 6, + "Items": 165, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1511, + "Pokemon": 153, + "Traps": 6, + "Items": 165, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1512, + "Pokemon": 153, + "Traps": 6, + "Items": 165, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1513, + "Pokemon": 153, + "Traps": 6, + "Items": 165, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1514, + "Pokemon": 712, + "Traps": 6, + "Items": 165, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1515, + "Pokemon": 712, + "Traps": 6, + "Items": 165, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1516, + "Pokemon": 712, + "Traps": 6, + "Items": 165, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1517, + "Pokemon": 712, + "Traps": 6, + "Items": 165, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1518, + "Pokemon": 712, + "Traps": 6, + "Items": 165, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1519, + "Pokemon": 713, + "Traps": 6, + "Items": 165, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1520, + "Pokemon": 714, + "Traps": 6, + "Items": 165, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1521, + "Pokemon": 714, + "Traps": 6, + "Items": 165, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1522, + "Pokemon": 714, + "Traps": 6, + "Items": 165, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1523, + "Pokemon": 714, + "Traps": 6, + "Items": 165, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + }, + { + "MainData": 1524, + "Pokemon": 714, + "Traps": 6, + "Items": 165, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 62 + } + ] +} diff --git a/data/dungeon/FieryField/floor_id.json b/data/dungeon/FieryField/floor_id.json index b3b2c00..1f4bdd5 100644 --- a/data/dungeon/FieryField/floor_id.json +++ b/data/dungeon/FieryField/floor_id.json @@ -1,275 +1,275 @@ -{ - "name": "FieryFieldFloorID", - "tables": [ - { - "MainData": 840, - "Pokemon": 381, - "Traps": 72, - "Items": 98, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 841, - "Pokemon": 381, - "Traps": 72, - "Items": 98, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 842, - "Pokemon": 381, - "Traps": 72, - "Items": 98, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 843, - "Pokemon": 382, - "Traps": 72, - "Items": 98, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 844, - "Pokemon": 383, - "Traps": 72, - "Items": 98, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 845, - "Pokemon": 384, - "Traps": 72, - "Items": 98, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 846, - "Pokemon": 384, - "Traps": 72, - "Items": 98, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 847, - "Pokemon": 385, - "Traps": 72, - "Items": 98, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 848, - "Pokemon": 386, - "Traps": 72, - "Items": 98, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 849, - "Pokemon": 387, - "Traps": 73, - "Items": 98, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 850, - "Pokemon": 387, - "Traps": 74, - "Items": 98, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 851, - "Pokemon": 387, - "Traps": 74, - "Items": 98, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 852, - "Pokemon": 387, - "Traps": 74, - "Items": 98, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 853, - "Pokemon": 387, - "Traps": 74, - "Items": 98, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 854, - "Pokemon": 388, - "Traps": 74, - "Items": 98, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 855, - "Pokemon": 388, - "Traps": 74, - "Items": 98, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 856, - "Pokemon": 389, - "Traps": 74, - "Items": 98, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 857, - "Pokemon": 389, - "Traps": 74, - "Items": 98, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 858, - "Pokemon": 389, - "Traps": 74, - "Items": 98, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 859, - "Pokemon": 389, - "Traps": 74, - "Items": 98, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 860, - "Pokemon": 390, - "Traps": 74, - "Items": 98, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 861, - "Pokemon": 391, - "Traps": 74, - "Items": 98, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 862, - "Pokemon": 391, - "Traps": 74, - "Items": 98, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 863, - "Pokemon": 391, - "Traps": 74, - "Items": 98, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 864, - "Pokemon": 392, - "Traps": 74, - "Items": 98, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 865, - "Pokemon": 393, - "Traps": 74, - "Items": 98, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 866, - "Pokemon": 393, - "Traps": 74, - "Items": 98, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 867, - "Pokemon": 393, - "Traps": 74, - "Items": 98, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 868, - "Pokemon": 393, - "Traps": 74, - "Items": 99, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 869, - "Pokemon": 394, - "Traps": 74, - "Items": 99, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - } - ] -} +{ + "name": "FieryFieldFloorID", + "tables": [ + { + "MainData": 840, + "Pokemon": 381, + "Traps": 72, + "Items": 98, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 841, + "Pokemon": 381, + "Traps": 72, + "Items": 98, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 842, + "Pokemon": 381, + "Traps": 72, + "Items": 98, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 843, + "Pokemon": 382, + "Traps": 72, + "Items": 98, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 844, + "Pokemon": 383, + "Traps": 72, + "Items": 98, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 845, + "Pokemon": 384, + "Traps": 72, + "Items": 98, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 846, + "Pokemon": 384, + "Traps": 72, + "Items": 98, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 847, + "Pokemon": 385, + "Traps": 72, + "Items": 98, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 848, + "Pokemon": 386, + "Traps": 72, + "Items": 98, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 849, + "Pokemon": 387, + "Traps": 73, + "Items": 98, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 850, + "Pokemon": 387, + "Traps": 74, + "Items": 98, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 851, + "Pokemon": 387, + "Traps": 74, + "Items": 98, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 852, + "Pokemon": 387, + "Traps": 74, + "Items": 98, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 853, + "Pokemon": 387, + "Traps": 74, + "Items": 98, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 854, + "Pokemon": 388, + "Traps": 74, + "Items": 98, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 855, + "Pokemon": 388, + "Traps": 74, + "Items": 98, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 856, + "Pokemon": 389, + "Traps": 74, + "Items": 98, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 857, + "Pokemon": 389, + "Traps": 74, + "Items": 98, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 858, + "Pokemon": 389, + "Traps": 74, + "Items": 98, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 859, + "Pokemon": 389, + "Traps": 74, + "Items": 98, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 860, + "Pokemon": 390, + "Traps": 74, + "Items": 98, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 861, + "Pokemon": 391, + "Traps": 74, + "Items": 98, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 862, + "Pokemon": 391, + "Traps": 74, + "Items": 98, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 863, + "Pokemon": 391, + "Traps": 74, + "Items": 98, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 864, + "Pokemon": 392, + "Traps": 74, + "Items": 98, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 865, + "Pokemon": 393, + "Traps": 74, + "Items": 98, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 866, + "Pokemon": 393, + "Traps": 74, + "Items": 98, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 867, + "Pokemon": 393, + "Traps": 74, + "Items": 98, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 868, + "Pokemon": 393, + "Traps": 74, + "Items": 99, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 869, + "Pokemon": 394, + "Traps": 74, + "Items": 99, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + } + ] +} diff --git a/data/dungeon/FrostyForest/floor_id.json b/data/dungeon/FrostyForest/floor_id.json index 9e907aa..538dae7 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 c35cf48..66e0441 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 + } + ] + } + ] +} diff --git a/data/dungeon/FrostyGrotto/floor_id.json b/data/dungeon/FrostyGrotto/floor_id.json index 2b8c806..886b207 100644 --- a/data/dungeon/FrostyGrotto/floor_id.json +++ b/data/dungeon/FrostyGrotto/floor_id.json @@ -1,50 +1,50 @@ -{ - "name": "FrostyGrottoFloorID", - "tables": [ - { - "MainData": 102, - "Pokemon": 70, - "Traps": 3, - "Items": 30, - "KecleonShop": 28, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 103, - "Pokemon": 70, - "Traps": 3, - "Items": 30, - "KecleonShop": 28, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 104, - "Pokemon": 70, - "Traps": 3, - "Items": 30, - "KecleonShop": 28, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 105, - "Pokemon": 70, - "Traps": 3, - "Items": 31, - "KecleonShop": 28, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 106, - "Pokemon": 71, - "Traps": 3, - "Items": 31, - "KecleonShop": 28, - "MonsterRoomItems": 2, - "BuriedItems": 3 - } - ] -} +{ + "name": "FrostyGrottoFloorID", + "tables": [ + { + "MainData": 102, + "Pokemon": 70, + "Traps": 3, + "Items": 30, + "KecleonShop": 28, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 103, + "Pokemon": 70, + "Traps": 3, + "Items": 30, + "KecleonShop": 28, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 104, + "Pokemon": 70, + "Traps": 3, + "Items": 30, + "KecleonShop": 28, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 105, + "Pokemon": 70, + "Traps": 3, + "Items": 31, + "KecleonShop": 28, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 106, + "Pokemon": 71, + "Traps": 3, + "Items": 31, + "KecleonShop": 28, + "MonsterRoomItems": 2, + "BuriedItems": 3 + } + ] +} diff --git a/data/dungeon/FrostyGrotto/pokemon_found.json b/data/dungeon/FrostyGrotto/pokemon_found.json index 241f094..65ad404 100644 --- a/data/dungeon/FrostyGrotto/pokemon_found.json +++ b/data/dungeon/FrostyGrotto/pokemon_found.json @@ -1,47 +1,47 @@ -{ - "tables": [{ - "name": "FrostyGrotto_1F_4F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_RHYHORN", - "level": 16, - "probability": 5000 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_METANG", - "level": 17, - "probability": 5000 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "FrostyGrotto_5F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_ARTICUNO", - "level": 33, - "probability": 10000 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - } - ] -} +{ + "tables": [{ + "name": "FrostyGrotto_1F_4F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_RHYHORN", + "level": 16, + "probability": 5000 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_METANG", + "level": 17, + "probability": 5000 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "FrostyGrotto_5F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_ARTICUNO", + "level": 33, + "probability": 10000 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + } + ] +} diff --git a/data/dungeon/GrandSea/floor_id.json b/data/dungeon/GrandSea/floor_id.json index a69fa5c..4f3333d 100644 --- a/data/dungeon/GrandSea/floor_id.json +++ b/data/dungeon/GrandSea/floor_id.json @@ -1,275 +1,275 @@ -{ - "name": "GrandSeaFloorID", - "tables": [ - { - "MainData": 996, - "Pokemon": 460, - "Traps": 6, - "Items": 113, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 997, - "Pokemon": 460, - "Traps": 6, - "Items": 113, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 998, - "Pokemon": 460, - "Traps": 6, - "Items": 113, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 999, - "Pokemon": 460, - "Traps": 6, - "Items": 114, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 1000, - "Pokemon": 461, - "Traps": 6, - "Items": 114, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 1001, - "Pokemon": 462, - "Traps": 6, - "Items": 114, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 1002, - "Pokemon": 462, - "Traps": 6, - "Items": 114, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 1003, - "Pokemon": 462, - "Traps": 6, - "Items": 114, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 1004, - "Pokemon": 462, - "Traps": 6, - "Items": 114, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 1005, - "Pokemon": 463, - "Traps": 6, - "Items": 114, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 1006, - "Pokemon": 464, - "Traps": 6, - "Items": 114, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 1007, - "Pokemon": 464, - "Traps": 6, - "Items": 114, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 1008, - "Pokemon": 464, - "Traps": 6, - "Items": 114, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 1009, - "Pokemon": 465, - "Traps": 6, - "Items": 114, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 1010, - "Pokemon": 466, - "Traps": 6, - "Items": 114, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 1011, - "Pokemon": 467, - "Traps": 6, - "Items": 114, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 1012, - "Pokemon": 467, - "Traps": 6, - "Items": 114, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 1013, - "Pokemon": 467, - "Traps": 6, - "Items": 114, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 1014, - "Pokemon": 467, - "Traps": 6, - "Items": 114, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 1015, - "Pokemon": 468, - "Traps": 6, - "Items": 114, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 1016, - "Pokemon": 469, - "Traps": 6, - "Items": 114, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 1017, - "Pokemon": 469, - "Traps": 6, - "Items": 114, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 1018, - "Pokemon": 469, - "Traps": 6, - "Items": 114, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 1019, - "Pokemon": 470, - "Traps": 6, - "Items": 114, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 1020, - "Pokemon": 471, - "Traps": 6, - "Items": 114, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 1021, - "Pokemon": 472, - "Traps": 6, - "Items": 114, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 1022, - "Pokemon": 473, - "Traps": 6, - "Items": 114, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 1023, - "Pokemon": 473, - "Traps": 6, - "Items": 114, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 1024, - "Pokemon": 473, - "Traps": 6, - "Items": 114, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 1025, - "Pokemon": 474, - "Traps": 6, - "Items": 114, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 66 - } - ] -} +{ + "name": "GrandSeaFloorID", + "tables": [ + { + "MainData": 996, + "Pokemon": 460, + "Traps": 6, + "Items": 113, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 997, + "Pokemon": 460, + "Traps": 6, + "Items": 113, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 998, + "Pokemon": 460, + "Traps": 6, + "Items": 113, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 999, + "Pokemon": 460, + "Traps": 6, + "Items": 114, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1000, + "Pokemon": 461, + "Traps": 6, + "Items": 114, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1001, + "Pokemon": 462, + "Traps": 6, + "Items": 114, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1002, + "Pokemon": 462, + "Traps": 6, + "Items": 114, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1003, + "Pokemon": 462, + "Traps": 6, + "Items": 114, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1004, + "Pokemon": 462, + "Traps": 6, + "Items": 114, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1005, + "Pokemon": 463, + "Traps": 6, + "Items": 114, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1006, + "Pokemon": 464, + "Traps": 6, + "Items": 114, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1007, + "Pokemon": 464, + "Traps": 6, + "Items": 114, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1008, + "Pokemon": 464, + "Traps": 6, + "Items": 114, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1009, + "Pokemon": 465, + "Traps": 6, + "Items": 114, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1010, + "Pokemon": 466, + "Traps": 6, + "Items": 114, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1011, + "Pokemon": 467, + "Traps": 6, + "Items": 114, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1012, + "Pokemon": 467, + "Traps": 6, + "Items": 114, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1013, + "Pokemon": 467, + "Traps": 6, + "Items": 114, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1014, + "Pokemon": 467, + "Traps": 6, + "Items": 114, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1015, + "Pokemon": 468, + "Traps": 6, + "Items": 114, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1016, + "Pokemon": 469, + "Traps": 6, + "Items": 114, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1017, + "Pokemon": 469, + "Traps": 6, + "Items": 114, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1018, + "Pokemon": 469, + "Traps": 6, + "Items": 114, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1019, + "Pokemon": 470, + "Traps": 6, + "Items": 114, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1020, + "Pokemon": 471, + "Traps": 6, + "Items": 114, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1021, + "Pokemon": 472, + "Traps": 6, + "Items": 114, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1022, + "Pokemon": 473, + "Traps": 6, + "Items": 114, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1023, + "Pokemon": 473, + "Traps": 6, + "Items": 114, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1024, + "Pokemon": 473, + "Traps": 6, + "Items": 114, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1025, + "Pokemon": 474, + "Traps": 6, + "Items": 114, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + } + ] +} diff --git a/data/dungeon/GreatCanyon/floor_id.json b/data/dungeon/GreatCanyon/floor_id.json index 2e30d01..064c14e 100644 --- a/data/dungeon/GreatCanyon/floor_id.json +++ b/data/dungeon/GreatCanyon/floor_id.json @@ -1,113 +1,113 @@ -{ - "name": "GreatCanyonFloorID", - "tables": [ - { - "MainData": 52, - "Pokemon": 39, - "Traps": 3, - "Items": 18, - "KecleonShop": 19, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 53, - "Pokemon": 39, - "Traps": 3, - "Items": 18, - "KecleonShop": 19, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 54, - "Pokemon": 39, - "Traps": 3, - "Items": 18, - "KecleonShop": 19, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 55, - "Pokemon": 40, - "Traps": 3, - "Items": 20, - "KecleonShop": 19, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 56, - "Pokemon": 41, - "Traps": 3, - "Items": 20, - "KecleonShop": 19, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 57, - "Pokemon": 42, - "Traps": 3, - "Items": 20, - "KecleonShop": 19, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 58, - "Pokemon": 43, - "Traps": 3, - "Items": 20, - "KecleonShop": 19, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 59, - "Pokemon": 44, - "Traps": 3, - "Items": 20, - "KecleonShop": 19, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 60, - "Pokemon": 45, - "Traps": 3, - "Items": 20, - "KecleonShop": 19, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 61, - "Pokemon": 46, - "Traps": 3, - "Items": 20, - "KecleonShop": 19, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 62, - "Pokemon": 46, - "Traps": 3, - "Items": 20, - "KecleonShop": 19, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 63, - "Pokemon": 47, - "Traps": 3, - "Items": 20, - "KecleonShop": 19, - "MonsterRoomItems": 2, - "BuriedItems": 3 - } - ] -} +{ + "name": "GreatCanyonFloorID", + "tables": [ + { + "MainData": 52, + "Pokemon": 39, + "Traps": 3, + "Items": 18, + "KecleonShop": 19, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 53, + "Pokemon": 39, + "Traps": 3, + "Items": 18, + "KecleonShop": 19, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 54, + "Pokemon": 39, + "Traps": 3, + "Items": 18, + "KecleonShop": 19, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 55, + "Pokemon": 40, + "Traps": 3, + "Items": 20, + "KecleonShop": 19, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 56, + "Pokemon": 41, + "Traps": 3, + "Items": 20, + "KecleonShop": 19, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 57, + "Pokemon": 42, + "Traps": 3, + "Items": 20, + "KecleonShop": 19, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 58, + "Pokemon": 43, + "Traps": 3, + "Items": 20, + "KecleonShop": 19, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 59, + "Pokemon": 44, + "Traps": 3, + "Items": 20, + "KecleonShop": 19, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 60, + "Pokemon": 45, + "Traps": 3, + "Items": 20, + "KecleonShop": 19, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 61, + "Pokemon": 46, + "Traps": 3, + "Items": 20, + "KecleonShop": 19, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 62, + "Pokemon": 46, + "Traps": 3, + "Items": 20, + "KecleonShop": 19, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 63, + "Pokemon": 47, + "Traps": 3, + "Items": 20, + "KecleonShop": 19, + "MonsterRoomItems": 2, + "BuriedItems": 3 + } + ] +} diff --git a/data/dungeon/GreatCanyon/pokemon_found.json b/data/dungeon/GreatCanyon/pokemon_found.json index bf2dde4..c7af421 100644 --- a/data/dungeon/GreatCanyon/pokemon_found.json +++ b/data/dungeon/GreatCanyon/pokemon_found.json @@ -1,284 +1,284 @@ -{ - "tables": [{ - "name": "GreatCanyon_1F_3F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_DODUO", - "level": 14, - "probability": 1429 - }, - { - "species": "SPECIES_SKIPLOOM", - "level": 13, - "probability": 2857 - }, - { - "species": "SPECIES_DUNSPARCE", - "level": 13, - "probability": 2857 - }, - { - "species": "SPECIES_PHANPY", - "level": 14, - "probability": 2857 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "GreatCanyon_4F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_VILEPLUME", - "level": 14, - "probability": 4000 - }, - { - "species": "SPECIES_DODUO", - "level": 14, - "probability": 2000 - }, - { - "species": "SPECIES_BRELOOM", - "level": 14, - "probability": 4000 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "GreatCanyon_5F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_VILEPLUME", - "level": 14, - "probability": 2500 - }, - { - "species": "SPECIES_MURKROW", - "level": 14, - "probability": 2500 - }, - { - "species": "SPECIES_BRELOOM", - "level": 14, - "probability": 2500 - }, - { - "species": "SPECIES_CACTURNE", - "level": 14, - "probability": 2500 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "GreatCanyon_6F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_VILEPLUME", - "level": 14, - "probability": 2000 - }, - { - "species": "SPECIES_NOCTOWL", - "level": 14, - "probability": 2000 - }, - { - "species": "SPECIES_MURKROW", - "level": 14, - "probability": 2000 - }, - { - "species": "SPECIES_BRELOOM", - "level": 14, - "probability": 2000 - }, - { - "species": "SPECIES_CACTURNE", - "level": 14, - "probability": 2000 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "GreatCanyon_7F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_NOCTOWL", - "level": 14, - "probability": 2500 - }, - { - "species": "SPECIES_MURKROW", - "level": 14, - "probability": 2500 - }, - { - "species": "SPECIES_HERACROSS", - "level": 14, - "probability": 2500 - }, - { - "species": "SPECIES_CACTURNE", - "level": 14, - "probability": 2500 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "GreatCanyon_8F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_NOCTOWL", - "level": 14, - "probability": 2500 - }, - { - "species": "SPECIES_ARIADOS", - "level": 14, - "probability": 2500 - }, - { - "species": "SPECIES_HERACROSS", - "level": 14, - "probability": 2500 - }, - { - "species": "SPECIES_CACTURNE", - "level": 14, - "probability": 2500 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "GreatCanyon_9F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_ARIADOS", - "level": 14, - "probability": 5000 - }, - { - "species": "SPECIES_HERACROSS", - "level": 14, - "probability": 5000 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "GreatCanyon_10F_11F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_TAUROS", - "level": 15, - "probability": 3077 - }, - { - "species": "SPECIES_ARIADOS", - "level": 14, - "probability": 3077 - }, - { - "species": "SPECIES_HOUNDOOM", - "level": 15, - "probability": 3846 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "GreatCanyon_12F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_TAUROS", - "level": 15, - "probability": 4444 - }, - { - "species": "SPECIES_HOUNDOOM", - "level": 15, - "probability": 5556 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }] -} +{ + "tables": [{ + "name": "GreatCanyon_1F_3F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_DODUO", + "level": 14, + "probability": 1429 + }, + { + "species": "SPECIES_SKIPLOOM", + "level": 13, + "probability": 2857 + }, + { + "species": "SPECIES_DUNSPARCE", + "level": 13, + "probability": 2857 + }, + { + "species": "SPECIES_PHANPY", + "level": 14, + "probability": 2857 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "GreatCanyon_4F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_VILEPLUME", + "level": 14, + "probability": 4000 + }, + { + "species": "SPECIES_DODUO", + "level": 14, + "probability": 2000 + }, + { + "species": "SPECIES_BRELOOM", + "level": 14, + "probability": 4000 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "GreatCanyon_5F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_VILEPLUME", + "level": 14, + "probability": 2500 + }, + { + "species": "SPECIES_MURKROW", + "level": 14, + "probability": 2500 + }, + { + "species": "SPECIES_BRELOOM", + "level": 14, + "probability": 2500 + }, + { + "species": "SPECIES_CACTURNE", + "level": 14, + "probability": 2500 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "GreatCanyon_6F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_VILEPLUME", + "level": 14, + "probability": 2000 + }, + { + "species": "SPECIES_NOCTOWL", + "level": 14, + "probability": 2000 + }, + { + "species": "SPECIES_MURKROW", + "level": 14, + "probability": 2000 + }, + { + "species": "SPECIES_BRELOOM", + "level": 14, + "probability": 2000 + }, + { + "species": "SPECIES_CACTURNE", + "level": 14, + "probability": 2000 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "GreatCanyon_7F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_NOCTOWL", + "level": 14, + "probability": 2500 + }, + { + "species": "SPECIES_MURKROW", + "level": 14, + "probability": 2500 + }, + { + "species": "SPECIES_HERACROSS", + "level": 14, + "probability": 2500 + }, + { + "species": "SPECIES_CACTURNE", + "level": 14, + "probability": 2500 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "GreatCanyon_8F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_NOCTOWL", + "level": 14, + "probability": 2500 + }, + { + "species": "SPECIES_ARIADOS", + "level": 14, + "probability": 2500 + }, + { + "species": "SPECIES_HERACROSS", + "level": 14, + "probability": 2500 + }, + { + "species": "SPECIES_CACTURNE", + "level": 14, + "probability": 2500 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "GreatCanyon_9F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_ARIADOS", + "level": 14, + "probability": 5000 + }, + { + "species": "SPECIES_HERACROSS", + "level": 14, + "probability": 5000 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "GreatCanyon_10F_11F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_TAUROS", + "level": 15, + "probability": 3077 + }, + { + "species": "SPECIES_ARIADOS", + "level": 14, + "probability": 3077 + }, + { + "species": "SPECIES_HOUNDOOM", + "level": 15, + "probability": 3846 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "GreatCanyon_12F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_TAUROS", + "level": 15, + "probability": 4444 + }, + { + "species": "SPECIES_HOUNDOOM", + "level": 15, + "probability": 5556 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }] +} diff --git a/data/dungeon/HowlingForest/floor_id.json b/data/dungeon/HowlingForest/floor_id.json index e24db95..71262ba 100644 --- a/data/dungeon/HowlingForest/floor_id.json +++ b/data/dungeon/HowlingForest/floor_id.json @@ -1,140 +1,140 @@ -{ - "name": "HowlingForestFloorID", - "tables": [ - { - "MainData": 1257, - "Pokemon": 576, - "Traps": 10, - "Items": 148, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1258, - "Pokemon": 576, - "Traps": 10, - "Items": 148, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1259, - "Pokemon": 576, - "Traps": 10, - "Items": 148, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1260, - "Pokemon": 577, - "Traps": 10, - "Items": 149, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1261, - "Pokemon": 578, - "Traps": 10, - "Items": 149, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1262, - "Pokemon": 578, - "Traps": 10, - "Items": 149, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1263, - "Pokemon": 579, - "Traps": 10, - "Items": 150, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1264, - "Pokemon": 579, - "Traps": 10, - "Items": 150, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1265, - "Pokemon": 580, - "Traps": 10, - "Items": 150, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1266, - "Pokemon": 580, - "Traps": 10, - "Items": 150, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1267, - "Pokemon": 581, - "Traps": 10, - "Items": 150, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1268, - "Pokemon": 582, - "Traps": 10, - "Items": 150, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1269, - "Pokemon": 582, - "Traps": 10, - "Items": 150, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1270, - "Pokemon": 583, - "Traps": 10, - "Items": 150, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1271, - "Pokemon": 584, - "Traps": 10, - "Items": 150, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - } - ] -} +{ + "name": "HowlingForestFloorID", + "tables": [ + { + "MainData": 1257, + "Pokemon": 576, + "Traps": 10, + "Items": 148, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1258, + "Pokemon": 576, + "Traps": 10, + "Items": 148, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1259, + "Pokemon": 576, + "Traps": 10, + "Items": 148, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1260, + "Pokemon": 577, + "Traps": 10, + "Items": 149, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1261, + "Pokemon": 578, + "Traps": 10, + "Items": 149, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1262, + "Pokemon": 578, + "Traps": 10, + "Items": 149, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1263, + "Pokemon": 579, + "Traps": 10, + "Items": 150, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1264, + "Pokemon": 579, + "Traps": 10, + "Items": 150, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1265, + "Pokemon": 580, + "Traps": 10, + "Items": 150, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1266, + "Pokemon": 580, + "Traps": 10, + "Items": 150, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1267, + "Pokemon": 581, + "Traps": 10, + "Items": 150, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1268, + "Pokemon": 582, + "Traps": 10, + "Items": 150, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1269, + "Pokemon": 582, + "Traps": 10, + "Items": 150, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1270, + "Pokemon": 583, + "Traps": 10, + "Items": 150, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1271, + "Pokemon": 584, + "Traps": 10, + "Items": 150, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + } + ] +} diff --git a/data/dungeon/JoyousTower/floor_id.json b/data/dungeon/JoyousTower/floor_id.json index 7dfa4e1..c78c93c 100644 --- a/data/dungeon/JoyousTower/floor_id.json +++ b/data/dungeon/JoyousTower/floor_id.json @@ -1,896 +1,896 @@ -{ - "name": "JoyousTowerFloorID", - "tables": [ - { - "MainData": 1351, - "Pokemon": 611, - "Traps": 94, - "Items": 157, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1352, - "Pokemon": 612, - "Traps": 30, - "Items": 157, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1353, - "Pokemon": 613, - "Traps": 30, - "Items": 157, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1354, - "Pokemon": 614, - "Traps": 30, - "Items": 159, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1355, - "Pokemon": 615, - "Traps": 30, - "Items": 159, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1356, - "Pokemon": 616, - "Traps": 30, - "Items": 159, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1357, - "Pokemon": 617, - "Traps": 30, - "Items": 159, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1358, - "Pokemon": 618, - "Traps": 30, - "Items": 159, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1359, - "Pokemon": 619, - "Traps": 30, - "Items": 159, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1360, - "Pokemon": 619, - "Traps": 95, - "Items": 159, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1361, - "Pokemon": 620, - "Traps": 96, - "Items": 159, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1362, - "Pokemon": 621, - "Traps": 96, - "Items": 159, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1363, - "Pokemon": 622, - "Traps": 95, - "Items": 159, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1364, - "Pokemon": 623, - "Traps": 95, - "Items": 159, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1365, - "Pokemon": 624, - "Traps": 95, - "Items": 159, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1366, - "Pokemon": 625, - "Traps": 95, - "Items": 159, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1367, - "Pokemon": 626, - "Traps": 95, - "Items": 159, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1368, - "Pokemon": 627, - "Traps": 95, - "Items": 159, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1369, - "Pokemon": 628, - "Traps": 95, - "Items": 159, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1370, - "Pokemon": 629, - "Traps": 97, - "Items": 159, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1371, - "Pokemon": 630, - "Traps": 98, - "Items": 159, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1372, - "Pokemon": 631, - "Traps": 98, - "Items": 159, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1373, - "Pokemon": 632, - "Traps": 98, - "Items": 159, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1374, - "Pokemon": 633, - "Traps": 98, - "Items": 159, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1375, - "Pokemon": 634, - "Traps": 98, - "Items": 159, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1376, - "Pokemon": 635, - "Traps": 98, - "Items": 160, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1377, - "Pokemon": 636, - "Traps": 98, - "Items": 160, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1378, - "Pokemon": 637, - "Traps": 98, - "Items": 160, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1379, - "Pokemon": 638, - "Traps": 98, - "Items": 160, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1380, - "Pokemon": 639, - "Traps": 99, - "Items": 160, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1381, - "Pokemon": 640, - "Traps": 100, - "Items": 160, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1382, - "Pokemon": 640, - "Traps": 100, - "Items": 160, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1383, - "Pokemon": 641, - "Traps": 100, - "Items": 160, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1384, - "Pokemon": 641, - "Traps": 100, - "Items": 160, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1385, - "Pokemon": 642, - "Traps": 100, - "Items": 160, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1386, - "Pokemon": 643, - "Traps": 100, - "Items": 160, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1387, - "Pokemon": 644, - "Traps": 100, - "Items": 160, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1388, - "Pokemon": 644, - "Traps": 100, - "Items": 160, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1389, - "Pokemon": 645, - "Traps": 100, - "Items": 160, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1390, - "Pokemon": 646, - "Traps": 101, - "Items": 160, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1391, - "Pokemon": 647, - "Traps": 101, - "Items": 160, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1392, - "Pokemon": 648, - "Traps": 101, - "Items": 160, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1393, - "Pokemon": 649, - "Traps": 101, - "Items": 160, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1394, - "Pokemon": 650, - "Traps": 101, - "Items": 160, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1395, - "Pokemon": 651, - "Traps": 101, - "Items": 160, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1396, - "Pokemon": 652, - "Traps": 101, - "Items": 160, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1397, - "Pokemon": 653, - "Traps": 101, - "Items": 160, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1398, - "Pokemon": 653, - "Traps": 101, - "Items": 160, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1399, - "Pokemon": 653, - "Traps": 101, - "Items": 160, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1400, - "Pokemon": 654, - "Traps": 102, - "Items": 160, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1401, - "Pokemon": 655, - "Traps": 103, - "Items": 160, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1402, - "Pokemon": 656, - "Traps": 103, - "Items": 160, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1403, - "Pokemon": 657, - "Traps": 103, - "Items": 160, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1404, - "Pokemon": 657, - "Traps": 103, - "Items": 160, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1405, - "Pokemon": 658, - "Traps": 103, - "Items": 160, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1406, - "Pokemon": 659, - "Traps": 103, - "Items": 160, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1407, - "Pokemon": 660, - "Traps": 103, - "Items": 160, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1408, - "Pokemon": 661, - "Traps": 103, - "Items": 160, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1409, - "Pokemon": 662, - "Traps": 103, - "Items": 160, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1410, - "Pokemon": 663, - "Traps": 104, - "Items": 161, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1411, - "Pokemon": 664, - "Traps": 104, - "Items": 161, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1412, - "Pokemon": 665, - "Traps": 104, - "Items": 161, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1413, - "Pokemon": 666, - "Traps": 104, - "Items": 161, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1414, - "Pokemon": 666, - "Traps": 104, - "Items": 161, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1415, - "Pokemon": 667, - "Traps": 104, - "Items": 161, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1416, - "Pokemon": 668, - "Traps": 104, - "Items": 161, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1417, - "Pokemon": 669, - "Traps": 104, - "Items": 161, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1418, - "Pokemon": 670, - "Traps": 104, - "Items": 161, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1419, - "Pokemon": 670, - "Traps": 104, - "Items": 161, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1420, - "Pokemon": 671, - "Traps": 105, - "Items": 161, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1421, - "Pokemon": 672, - "Traps": 106, - "Items": 161, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1422, - "Pokemon": 673, - "Traps": 106, - "Items": 161, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1423, - "Pokemon": 673, - "Traps": 107, - "Items": 161, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1424, - "Pokemon": 674, - "Traps": 108, - "Items": 161, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1425, - "Pokemon": 674, - "Traps": 106, - "Items": 161, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1426, - "Pokemon": 675, - "Traps": 106, - "Items": 161, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1427, - "Pokemon": 676, - "Traps": 106, - "Items": 161, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1428, - "Pokemon": 677, - "Traps": 106, - "Items": 162, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1429, - "Pokemon": 678, - "Traps": 109, - "Items": 162, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1430, - "Pokemon": 679, - "Traps": 110, - "Items": 162, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1431, - "Pokemon": 679, - "Traps": 111, - "Items": 162, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1432, - "Pokemon": 679, - "Traps": 111, - "Items": 162, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1433, - "Pokemon": 680, - "Traps": 111, - "Items": 162, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1434, - "Pokemon": 680, - "Traps": 111, - "Items": 162, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1435, - "Pokemon": 681, - "Traps": 111, - "Items": 162, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1436, - "Pokemon": 682, - "Traps": 111, - "Items": 162, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1437, - "Pokemon": 682, - "Traps": 111, - "Items": 162, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1438, - "Pokemon": 683, - "Traps": 111, - "Items": 162, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1439, - "Pokemon": 684, - "Traps": 111, - "Items": 162, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1440, - "Pokemon": 685, - "Traps": 111, - "Items": 162, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1441, - "Pokemon": 685, - "Traps": 111, - "Items": 163, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1442, - "Pokemon": 686, - "Traps": 111, - "Items": 163, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1443, - "Pokemon": 687, - "Traps": 111, - "Items": 163, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1444, - "Pokemon": 688, - "Traps": 111, - "Items": 163, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1445, - "Pokemon": 688, - "Traps": 111, - "Items": 163, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1446, - "Pokemon": 688, - "Traps": 111, - "Items": 163, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1447, - "Pokemon": 688, - "Traps": 111, - "Items": 163, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1448, - "Pokemon": 688, - "Traps": 111, - "Items": 163, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 1449, - "Pokemon": 688, - "Traps": 111, - "Items": 163, - "KecleonShop": 158, - "MonsterRoomItems": 46, - "BuriedItems": 66 - } - ] -} +{ + "name": "JoyousTowerFloorID", + "tables": [ + { + "MainData": 1351, + "Pokemon": 611, + "Traps": 94, + "Items": 157, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1352, + "Pokemon": 612, + "Traps": 30, + "Items": 157, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1353, + "Pokemon": 613, + "Traps": 30, + "Items": 157, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1354, + "Pokemon": 614, + "Traps": 30, + "Items": 159, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1355, + "Pokemon": 615, + "Traps": 30, + "Items": 159, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1356, + "Pokemon": 616, + "Traps": 30, + "Items": 159, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1357, + "Pokemon": 617, + "Traps": 30, + "Items": 159, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1358, + "Pokemon": 618, + "Traps": 30, + "Items": 159, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1359, + "Pokemon": 619, + "Traps": 30, + "Items": 159, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1360, + "Pokemon": 619, + "Traps": 95, + "Items": 159, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1361, + "Pokemon": 620, + "Traps": 96, + "Items": 159, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1362, + "Pokemon": 621, + "Traps": 96, + "Items": 159, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1363, + "Pokemon": 622, + "Traps": 95, + "Items": 159, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1364, + "Pokemon": 623, + "Traps": 95, + "Items": 159, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1365, + "Pokemon": 624, + "Traps": 95, + "Items": 159, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1366, + "Pokemon": 625, + "Traps": 95, + "Items": 159, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1367, + "Pokemon": 626, + "Traps": 95, + "Items": 159, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1368, + "Pokemon": 627, + "Traps": 95, + "Items": 159, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1369, + "Pokemon": 628, + "Traps": 95, + "Items": 159, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1370, + "Pokemon": 629, + "Traps": 97, + "Items": 159, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1371, + "Pokemon": 630, + "Traps": 98, + "Items": 159, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1372, + "Pokemon": 631, + "Traps": 98, + "Items": 159, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1373, + "Pokemon": 632, + "Traps": 98, + "Items": 159, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1374, + "Pokemon": 633, + "Traps": 98, + "Items": 159, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1375, + "Pokemon": 634, + "Traps": 98, + "Items": 159, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1376, + "Pokemon": 635, + "Traps": 98, + "Items": 160, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1377, + "Pokemon": 636, + "Traps": 98, + "Items": 160, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1378, + "Pokemon": 637, + "Traps": 98, + "Items": 160, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1379, + "Pokemon": 638, + "Traps": 98, + "Items": 160, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1380, + "Pokemon": 639, + "Traps": 99, + "Items": 160, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1381, + "Pokemon": 640, + "Traps": 100, + "Items": 160, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1382, + "Pokemon": 640, + "Traps": 100, + "Items": 160, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1383, + "Pokemon": 641, + "Traps": 100, + "Items": 160, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1384, + "Pokemon": 641, + "Traps": 100, + "Items": 160, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1385, + "Pokemon": 642, + "Traps": 100, + "Items": 160, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1386, + "Pokemon": 643, + "Traps": 100, + "Items": 160, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1387, + "Pokemon": 644, + "Traps": 100, + "Items": 160, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1388, + "Pokemon": 644, + "Traps": 100, + "Items": 160, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1389, + "Pokemon": 645, + "Traps": 100, + "Items": 160, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1390, + "Pokemon": 646, + "Traps": 101, + "Items": 160, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1391, + "Pokemon": 647, + "Traps": 101, + "Items": 160, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1392, + "Pokemon": 648, + "Traps": 101, + "Items": 160, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1393, + "Pokemon": 649, + "Traps": 101, + "Items": 160, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1394, + "Pokemon": 650, + "Traps": 101, + "Items": 160, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1395, + "Pokemon": 651, + "Traps": 101, + "Items": 160, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1396, + "Pokemon": 652, + "Traps": 101, + "Items": 160, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1397, + "Pokemon": 653, + "Traps": 101, + "Items": 160, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1398, + "Pokemon": 653, + "Traps": 101, + "Items": 160, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1399, + "Pokemon": 653, + "Traps": 101, + "Items": 160, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1400, + "Pokemon": 654, + "Traps": 102, + "Items": 160, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1401, + "Pokemon": 655, + "Traps": 103, + "Items": 160, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1402, + "Pokemon": 656, + "Traps": 103, + "Items": 160, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1403, + "Pokemon": 657, + "Traps": 103, + "Items": 160, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1404, + "Pokemon": 657, + "Traps": 103, + "Items": 160, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1405, + "Pokemon": 658, + "Traps": 103, + "Items": 160, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1406, + "Pokemon": 659, + "Traps": 103, + "Items": 160, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1407, + "Pokemon": 660, + "Traps": 103, + "Items": 160, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1408, + "Pokemon": 661, + "Traps": 103, + "Items": 160, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1409, + "Pokemon": 662, + "Traps": 103, + "Items": 160, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1410, + "Pokemon": 663, + "Traps": 104, + "Items": 161, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1411, + "Pokemon": 664, + "Traps": 104, + "Items": 161, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1412, + "Pokemon": 665, + "Traps": 104, + "Items": 161, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1413, + "Pokemon": 666, + "Traps": 104, + "Items": 161, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1414, + "Pokemon": 666, + "Traps": 104, + "Items": 161, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1415, + "Pokemon": 667, + "Traps": 104, + "Items": 161, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1416, + "Pokemon": 668, + "Traps": 104, + "Items": 161, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1417, + "Pokemon": 669, + "Traps": 104, + "Items": 161, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1418, + "Pokemon": 670, + "Traps": 104, + "Items": 161, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1419, + "Pokemon": 670, + "Traps": 104, + "Items": 161, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1420, + "Pokemon": 671, + "Traps": 105, + "Items": 161, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1421, + "Pokemon": 672, + "Traps": 106, + "Items": 161, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1422, + "Pokemon": 673, + "Traps": 106, + "Items": 161, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1423, + "Pokemon": 673, + "Traps": 107, + "Items": 161, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1424, + "Pokemon": 674, + "Traps": 108, + "Items": 161, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1425, + "Pokemon": 674, + "Traps": 106, + "Items": 161, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1426, + "Pokemon": 675, + "Traps": 106, + "Items": 161, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1427, + "Pokemon": 676, + "Traps": 106, + "Items": 161, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1428, + "Pokemon": 677, + "Traps": 106, + "Items": 162, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1429, + "Pokemon": 678, + "Traps": 109, + "Items": 162, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1430, + "Pokemon": 679, + "Traps": 110, + "Items": 162, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1431, + "Pokemon": 679, + "Traps": 111, + "Items": 162, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1432, + "Pokemon": 679, + "Traps": 111, + "Items": 162, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1433, + "Pokemon": 680, + "Traps": 111, + "Items": 162, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1434, + "Pokemon": 680, + "Traps": 111, + "Items": 162, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1435, + "Pokemon": 681, + "Traps": 111, + "Items": 162, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1436, + "Pokemon": 682, + "Traps": 111, + "Items": 162, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1437, + "Pokemon": 682, + "Traps": 111, + "Items": 162, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1438, + "Pokemon": 683, + "Traps": 111, + "Items": 162, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1439, + "Pokemon": 684, + "Traps": 111, + "Items": 162, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1440, + "Pokemon": 685, + "Traps": 111, + "Items": 162, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1441, + "Pokemon": 685, + "Traps": 111, + "Items": 163, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1442, + "Pokemon": 686, + "Traps": 111, + "Items": 163, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1443, + "Pokemon": 687, + "Traps": 111, + "Items": 163, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1444, + "Pokemon": 688, + "Traps": 111, + "Items": 163, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1445, + "Pokemon": 688, + "Traps": 111, + "Items": 163, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1446, + "Pokemon": 688, + "Traps": 111, + "Items": 163, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1447, + "Pokemon": 688, + "Traps": 111, + "Items": 163, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1448, + "Pokemon": 688, + "Traps": 111, + "Items": 163, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 1449, + "Pokemon": 688, + "Traps": 111, + "Items": 163, + "KecleonShop": 158, + "MonsterRoomItems": 46, + "BuriedItems": 66 + } + ] +} diff --git a/data/dungeon/LapisCave/floor_id.json b/data/dungeon/LapisCave/floor_id.json index 9ea5aca..ef52aa7 100644 --- a/data/dungeon/LapisCave/floor_id.json +++ b/data/dungeon/LapisCave/floor_id.json @@ -1,131 +1,131 @@ -{ - "name": "LapisCaveFloorID", - "tables": [ - { - "MainData": 64, - "Pokemon": 48, - "Traps": 4, - "Items": 21, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 65, - "Pokemon": 48, - "Traps": 4, - "Items": 21, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 66, - "Pokemon": 48, - "Traps": 4, - "Items": 21, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 67, - "Pokemon": 49, - "Traps": 4, - "Items": 21, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 68, - "Pokemon": 50, - "Traps": 4, - "Items": 22, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 69, - "Pokemon": 50, - "Traps": 4, - "Items": 22, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 70, - "Pokemon": 50, - "Traps": 4, - "Items": 23, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 71, - "Pokemon": 50, - "Traps": 4, - "Items": 23, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 72, - "Pokemon": 51, - "Traps": 4, - "Items": 23, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 73, - "Pokemon": 51, - "Traps": 4, - "Items": 23, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 74, - "Pokemon": 52, - "Traps": 4, - "Items": 23, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 75, - "Pokemon": 52, - "Traps": 4, - "Items": 23, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 76, - "Pokemon": 53, - "Traps": 4, - "Items": 23, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 77, - "Pokemon": 54, - "Traps": 4, - "Items": 23, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - } - ] -} +{ + "name": "LapisCaveFloorID", + "tables": [ + { + "MainData": 64, + "Pokemon": 48, + "Traps": 4, + "Items": 21, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 65, + "Pokemon": 48, + "Traps": 4, + "Items": 21, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 66, + "Pokemon": 48, + "Traps": 4, + "Items": 21, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 67, + "Pokemon": 49, + "Traps": 4, + "Items": 21, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 68, + "Pokemon": 50, + "Traps": 4, + "Items": 22, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 69, + "Pokemon": 50, + "Traps": 4, + "Items": 22, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 70, + "Pokemon": 50, + "Traps": 4, + "Items": 23, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 71, + "Pokemon": 50, + "Traps": 4, + "Items": 23, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 72, + "Pokemon": 51, + "Traps": 4, + "Items": 23, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 73, + "Pokemon": 51, + "Traps": 4, + "Items": 23, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 74, + "Pokemon": 52, + "Traps": 4, + "Items": 23, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 75, + "Pokemon": 52, + "Traps": 4, + "Items": 23, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 76, + "Pokemon": 53, + "Traps": 4, + "Items": 23, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 77, + "Pokemon": 54, + "Traps": 4, + "Items": 23, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + } + ] +} diff --git a/data/dungeon/LapisCave/pokemon_found.json b/data/dungeon/LapisCave/pokemon_found.json index 7964480..4e46b1c 100644 --- a/data/dungeon/LapisCave/pokemon_found.json +++ b/data/dungeon/LapisCave/pokemon_found.json @@ -1,174 +1,174 @@ -{ - "tables": [{ - "name": "LapisCave_1F_3F_Pokemon", - "pokemon": [{ - "species": "SPECIES_ZUBAT", - "level": 17, - "probability": 5000 - }, - { - "species": "SPECIES_NINCADA", - "level": 14, - "probability": 5000 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "LapisCave_4F_Pokemon", - "pokemon": [{ - "species": "SPECIES_NIDORINA", - "level": 15, - "probability": 3333 - }, - { - "species": "SPECIES_NIDORINO", - "level": 15, - "probability": 3334 - }, - { - "species": "SPECIES_NINCADA", - "level": 14, - "probability": 3333 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "LapisCave_5F_8F_Pokemon", - "pokemon": [{ - "species": "SPECIES_NIDORINA", - "level": 15, - "probability": 3333 - }, - { - "species": "SPECIES_NIDORINO", - "level": 15, - "probability": 3334 - }, - { - "species": "SPECIES_ILLIMISE", - "level": 15, - "probability": 3333 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "LapisCave_9F_10F_Pokemon", - "pokemon": [{ - "species": "SPECIES_TANGELA", - "level": 14, - "probability": 5000 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_BAGON", - "level": 16, - "probability": 5000 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "LapisCave_11F_12F_Pokemon", - "pokemon": [{ - "species": "SPECIES_GOLBAT", - "level": 10, - "probability": 3333 - }, - { - "species": "SPECIES_TANGELA", - "level": 14, - "probability": 3334 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_BAGON", - "level": 16, - "probability": 3333 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "LapisCave_13F_Pokemon", - "pokemon": [{ - "species": "SPECIES_GOLBAT", - "level": 10, - "probability": 5000 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_BAGON", - "level": 16, - "probability": 5000 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "LapisCave_14F_Pokemon", - "pokemon": [{ - "species": "SPECIES_GOLBAT", - "level": 10, - "probability": 10000 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }] -} +{ + "tables": [{ + "name": "LapisCave_1F_3F_Pokemon", + "pokemon": [{ + "species": "SPECIES_ZUBAT", + "level": 17, + "probability": 5000 + }, + { + "species": "SPECIES_NINCADA", + "level": 14, + "probability": 5000 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "LapisCave_4F_Pokemon", + "pokemon": [{ + "species": "SPECIES_NIDORINA", + "level": 15, + "probability": 3333 + }, + { + "species": "SPECIES_NIDORINO", + "level": 15, + "probability": 3334 + }, + { + "species": "SPECIES_NINCADA", + "level": 14, + "probability": 3333 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "LapisCave_5F_8F_Pokemon", + "pokemon": [{ + "species": "SPECIES_NIDORINA", + "level": 15, + "probability": 3333 + }, + { + "species": "SPECIES_NIDORINO", + "level": 15, + "probability": 3334 + }, + { + "species": "SPECIES_ILLIMISE", + "level": 15, + "probability": 3333 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "LapisCave_9F_10F_Pokemon", + "pokemon": [{ + "species": "SPECIES_TANGELA", + "level": 14, + "probability": 5000 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_BAGON", + "level": 16, + "probability": 5000 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "LapisCave_11F_12F_Pokemon", + "pokemon": [{ + "species": "SPECIES_GOLBAT", + "level": 10, + "probability": 3333 + }, + { + "species": "SPECIES_TANGELA", + "level": 14, + "probability": 3334 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_BAGON", + "level": 16, + "probability": 3333 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "LapisCave_13F_Pokemon", + "pokemon": [{ + "species": "SPECIES_GOLBAT", + "level": 10, + "probability": 5000 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_BAGON", + "level": 16, + "probability": 5000 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "LapisCave_14F_Pokemon", + "pokemon": [{ + "species": "SPECIES_GOLBAT", + "level": 10, + "probability": 10000 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }] +} diff --git a/data/dungeon/LightningField/floor_id.json b/data/dungeon/LightningField/floor_id.json index 3cb8074..222b181 100644 --- a/data/dungeon/LightningField/floor_id.json +++ b/data/dungeon/LightningField/floor_id.json @@ -1,275 +1,275 @@ -{ - "name": "LightningFieldFloorID", - "tables": [ - { - "MainData": 920, - "Pokemon": 427, - "Traps": 72, - "Items": 105, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 921, - "Pokemon": 427, - "Traps": 72, - "Items": 105, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 922, - "Pokemon": 427, - "Traps": 72, - "Items": 105, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 923, - "Pokemon": 427, - "Traps": 72, - "Items": 105, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 924, - "Pokemon": 427, - "Traps": 72, - "Items": 105, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 925, - "Pokemon": 428, - "Traps": 72, - "Items": 105, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 926, - "Pokemon": 429, - "Traps": 72, - "Items": 105, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 927, - "Pokemon": 430, - "Traps": 72, - "Items": 105, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 928, - "Pokemon": 430, - "Traps": 72, - "Items": 105, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 929, - "Pokemon": 430, - "Traps": 73, - "Items": 105, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 930, - "Pokemon": 431, - "Traps": 74, - "Items": 105, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 931, - "Pokemon": 431, - "Traps": 74, - "Items": 105, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 932, - "Pokemon": 431, - "Traps": 74, - "Items": 105, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 933, - "Pokemon": 432, - "Traps": 74, - "Items": 105, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 934, - "Pokemon": 433, - "Traps": 74, - "Items": 105, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 935, - "Pokemon": 434, - "Traps": 74, - "Items": 105, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 936, - "Pokemon": 434, - "Traps": 74, - "Items": 105, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 937, - "Pokemon": 435, - "Traps": 74, - "Items": 105, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 938, - "Pokemon": 435, - "Traps": 74, - "Items": 105, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 939, - "Pokemon": 436, - "Traps": 74, - "Items": 105, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 940, - "Pokemon": 436, - "Traps": 74, - "Items": 105, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 941, - "Pokemon": 437, - "Traps": 74, - "Items": 105, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 942, - "Pokemon": 438, - "Traps": 74, - "Items": 105, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 943, - "Pokemon": 438, - "Traps": 74, - "Items": 105, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 944, - "Pokemon": 439, - "Traps": 74, - "Items": 105, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 945, - "Pokemon": 440, - "Traps": 74, - "Items": 105, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 946, - "Pokemon": 440, - "Traps": 74, - "Items": 105, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 947, - "Pokemon": 440, - "Traps": 74, - "Items": 105, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 948, - "Pokemon": 441, - "Traps": 74, - "Items": 106, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 949, - "Pokemon": 442, - "Traps": 74, - "Items": 106, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - } - ] -} +{ + "name": "LightningFieldFloorID", + "tables": [ + { + "MainData": 920, + "Pokemon": 427, + "Traps": 72, + "Items": 105, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 921, + "Pokemon": 427, + "Traps": 72, + "Items": 105, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 922, + "Pokemon": 427, + "Traps": 72, + "Items": 105, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 923, + "Pokemon": 427, + "Traps": 72, + "Items": 105, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 924, + "Pokemon": 427, + "Traps": 72, + "Items": 105, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 925, + "Pokemon": 428, + "Traps": 72, + "Items": 105, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 926, + "Pokemon": 429, + "Traps": 72, + "Items": 105, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 927, + "Pokemon": 430, + "Traps": 72, + "Items": 105, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 928, + "Pokemon": 430, + "Traps": 72, + "Items": 105, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 929, + "Pokemon": 430, + "Traps": 73, + "Items": 105, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 930, + "Pokemon": 431, + "Traps": 74, + "Items": 105, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 931, + "Pokemon": 431, + "Traps": 74, + "Items": 105, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 932, + "Pokemon": 431, + "Traps": 74, + "Items": 105, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 933, + "Pokemon": 432, + "Traps": 74, + "Items": 105, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 934, + "Pokemon": 433, + "Traps": 74, + "Items": 105, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 935, + "Pokemon": 434, + "Traps": 74, + "Items": 105, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 936, + "Pokemon": 434, + "Traps": 74, + "Items": 105, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 937, + "Pokemon": 435, + "Traps": 74, + "Items": 105, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 938, + "Pokemon": 435, + "Traps": 74, + "Items": 105, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 939, + "Pokemon": 436, + "Traps": 74, + "Items": 105, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 940, + "Pokemon": 436, + "Traps": 74, + "Items": 105, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 941, + "Pokemon": 437, + "Traps": 74, + "Items": 105, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 942, + "Pokemon": 438, + "Traps": 74, + "Items": 105, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 943, + "Pokemon": 438, + "Traps": 74, + "Items": 105, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 944, + "Pokemon": 439, + "Traps": 74, + "Items": 105, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 945, + "Pokemon": 440, + "Traps": 74, + "Items": 105, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 946, + "Pokemon": 440, + "Traps": 74, + "Items": 105, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 947, + "Pokemon": 440, + "Traps": 74, + "Items": 105, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 948, + "Pokemon": 441, + "Traps": 74, + "Items": 106, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 949, + "Pokemon": 442, + "Traps": 74, + "Items": 106, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + } + ] +} diff --git a/data/dungeon/MagmaCavern/floor_id.json b/data/dungeon/MagmaCavern/floor_id.json index 23dcfdd..d9d59d5 100644 --- a/data/dungeon/MagmaCavern/floor_id.json +++ b/data/dungeon/MagmaCavern/floor_id.json @@ -1,212 +1,212 @@ -{ - "name": "MagmaCavernFloorID", - "tables": [ - { - "MainData": 127, - "Pokemon": 81, - "Traps": 4, - "Items": 36, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 128, - "Pokemon": 81, - "Traps": 4, - "Items": 36, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 129, - "Pokemon": 81, - "Traps": 4, - "Items": 36, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 130, - "Pokemon": 82, - "Traps": 4, - "Items": 38, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 131, - "Pokemon": 83, - "Traps": 4, - "Items": 38, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 132, - "Pokemon": 83, - "Traps": 4, - "Items": 38, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 133, - "Pokemon": 84, - "Traps": 4, - "Items": 38, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 134, - "Pokemon": 85, - "Traps": 4, - "Items": 38, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 135, - "Pokemon": 86, - "Traps": 4, - "Items": 38, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 136, - "Pokemon": 86, - "Traps": 4, - "Items": 39, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 137, - "Pokemon": 87, - "Traps": 4, - "Items": 39, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 138, - "Pokemon": 88, - "Traps": 4, - "Items": 39, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 139, - "Pokemon": 89, - "Traps": 4, - "Items": 39, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 140, - "Pokemon": 90, - "Traps": 4, - "Items": 39, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 141, - "Pokemon": 91, - "Traps": 4, - "Items": 39, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 142, - "Pokemon": 91, - "Traps": 4, - "Items": 39, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 143, - "Pokemon": 91, - "Traps": 4, - "Items": 39, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 144, - "Pokemon": 91, - "Traps": 4, - "Items": 39, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 145, - "Pokemon": 91, - "Traps": 4, - "Items": 39, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 146, - "Pokemon": 91, - "Traps": 4, - "Items": 39, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 147, - "Pokemon": 92, - "Traps": 4, - "Items": 39, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 148, - "Pokemon": 93, - "Traps": 4, - "Items": 39, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 149, - "Pokemon": 93, - "Traps": 4, - "Items": 39, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - } - ] -} +{ + "name": "MagmaCavernFloorID", + "tables": [ + { + "MainData": 127, + "Pokemon": 81, + "Traps": 4, + "Items": 36, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 128, + "Pokemon": 81, + "Traps": 4, + "Items": 36, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 129, + "Pokemon": 81, + "Traps": 4, + "Items": 36, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 130, + "Pokemon": 82, + "Traps": 4, + "Items": 38, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 131, + "Pokemon": 83, + "Traps": 4, + "Items": 38, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 132, + "Pokemon": 83, + "Traps": 4, + "Items": 38, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 133, + "Pokemon": 84, + "Traps": 4, + "Items": 38, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 134, + "Pokemon": 85, + "Traps": 4, + "Items": 38, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 135, + "Pokemon": 86, + "Traps": 4, + "Items": 38, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 136, + "Pokemon": 86, + "Traps": 4, + "Items": 39, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 137, + "Pokemon": 87, + "Traps": 4, + "Items": 39, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 138, + "Pokemon": 88, + "Traps": 4, + "Items": 39, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 139, + "Pokemon": 89, + "Traps": 4, + "Items": 39, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 140, + "Pokemon": 90, + "Traps": 4, + "Items": 39, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 141, + "Pokemon": 91, + "Traps": 4, + "Items": 39, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 142, + "Pokemon": 91, + "Traps": 4, + "Items": 39, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 143, + "Pokemon": 91, + "Traps": 4, + "Items": 39, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 144, + "Pokemon": 91, + "Traps": 4, + "Items": 39, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 145, + "Pokemon": 91, + "Traps": 4, + "Items": 39, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 146, + "Pokemon": 91, + "Traps": 4, + "Items": 39, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 147, + "Pokemon": 92, + "Traps": 4, + "Items": 39, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 148, + "Pokemon": 93, + "Traps": 4, + "Items": 39, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 149, + "Pokemon": 93, + "Traps": 4, + "Items": 39, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + } + ] +} diff --git a/data/dungeon/MagmaCavern/pokemon_found.json b/data/dungeon/MagmaCavern/pokemon_found.json index d40c6af..59411a2 100644 --- a/data/dungeon/MagmaCavern/pokemon_found.json +++ b/data/dungeon/MagmaCavern/pokemon_found.json @@ -1,391 +1,391 @@ -{ - "tables": [{ - "name": "MagmaCavern_1F_3F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_RATICATE", - "level": 19, - "probability": 2500 - }, - { - "species": "SPECIES_SANDSHREW", - "level": 20, - "probability": 2500 - }, - { - "species": "SPECIES_NIDOQUEEN", - "level": 20, - "probability": 2500 - }, - { - "species": "SPECIES_NIDOKING", - "level": 21, - "probability": 2500 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "MagmaCavern_4F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_SANDSHREW", - "level": 20, - "probability": 3333 - }, - { - "species": "SPECIES_NIDOQUEEN", - "level": 20, - "probability": 3334 - }, - { - "species": "SPECIES_NIDOKING", - "level": 21, - "probability": 3333 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "MagmaCavern_5F_6F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_SANDSHREW", - "level": 20, - "probability": 2500 - }, - { - "species": "SPECIES_NIDOQUEEN", - "level": 20, - "probability": 2500 - }, - { - "species": "SPECIES_NIDOKING", - "level": 21, - "probability": 2500 - }, - { - "species": "SPECIES_GRAVELER", - "level": 22, - "probability": 2500 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "MagmaCavern_7F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_GRAVELER", - "level": 22, - "probability": 5000 - }, - { - "species": "SPECIES_MAGMAR", - "level": 21, - "probability": 5000 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "MagmaCavern_8F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_ARBOK", - "level": 21, - "probability": 2500 - }, - { - "species": "SPECIES_GRAVELER", - "level": 22, - "probability": 2500 - }, - { - "species": "SPECIES_MAGMAR", - "level": 21, - "probability": 2500 - }, - { - "species": "SPECIES_MAWILE", - "level": 20, - "probability": 2500 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "MagmaCavern_9F_10F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_ARBOK", - "level": 21, - "probability": 2000 - }, - { - "species": "SPECIES_GRAVELER", - "level": 22, - "probability": 2000 - }, - { - "species": "SPECIES_MAGMAR", - "level": 21, - "probability": 2000 - }, - { - "species": "SPECIES_MAGCARGO", - "level": 21, - "probability": 2000 - }, - { - "species": "SPECIES_MAWILE", - "level": 20, - "probability": 2000 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "MagmaCavern_11F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_ARBOK", - "level": 21, - "probability": 2500 - }, - { - "species": "SPECIES_MAGMAR", - "level": 21, - "probability": 2500 - }, - { - "species": "SPECIES_MAGCARGO", - "level": 21, - "probability": 2500 - }, - { - "species": "SPECIES_MAWILE", - "level": 20, - "probability": 2500 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "MagmaCavern_12F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_ARBOK", - "level": 21, - "probability": 3333 - }, - { - "species": "SPECIES_MAGCARGO", - "level": 21, - "probability": 3334 - }, - { - "species": "SPECIES_MAWILE", - "level": 20, - "probability": 3333 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "MagmaCavern_13F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_ARBOK", - "level": 21, - "probability": 5000 - }, - { - "species": "SPECIES_MAGCARGO", - "level": 21, - "probability": 5000 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "MagmaCavern_14F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_ARBOK", - "level": 21, - "probability": 3333 - }, - { - "species": "SPECIES_RHYDON", - "level": 23, - "probability": 3334 - }, - { - "species": "SPECIES_MAGCARGO", - "level": 21, - "probability": 3333 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "MagmaCavern_15F_20F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_SANDSLASH", - "level": 24, - "probability": 2500 - }, - { - "species": "SPECIES_GOLEM", - "level": 15, - "probability": 2500 - }, - { - "species": "SPECIES_GRIMER", - "level": 20, - "probability": 2500 - }, - { - "species": "SPECIES_RHYDON", - "level": 23, - "probability": 2500 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "MagmaCavern_21F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_GRIMER", - "level": 20, - "probability": 8000 - }, - { - "species": "SPECIES_ONIX", - "level": 30, - "probability": 2000 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "MagmaCavern_22F_23F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_ONIX", - "level": 30, - "probability": 10000 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - } - ] -} +{ + "tables": [{ + "name": "MagmaCavern_1F_3F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_RATICATE", + "level": 19, + "probability": 2500 + }, + { + "species": "SPECIES_SANDSHREW", + "level": 20, + "probability": 2500 + }, + { + "species": "SPECIES_NIDOQUEEN", + "level": 20, + "probability": 2500 + }, + { + "species": "SPECIES_NIDOKING", + "level": 21, + "probability": 2500 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "MagmaCavern_4F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_SANDSHREW", + "level": 20, + "probability": 3333 + }, + { + "species": "SPECIES_NIDOQUEEN", + "level": 20, + "probability": 3334 + }, + { + "species": "SPECIES_NIDOKING", + "level": 21, + "probability": 3333 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "MagmaCavern_5F_6F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_SANDSHREW", + "level": 20, + "probability": 2500 + }, + { + "species": "SPECIES_NIDOQUEEN", + "level": 20, + "probability": 2500 + }, + { + "species": "SPECIES_NIDOKING", + "level": 21, + "probability": 2500 + }, + { + "species": "SPECIES_GRAVELER", + "level": 22, + "probability": 2500 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "MagmaCavern_7F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_GRAVELER", + "level": 22, + "probability": 5000 + }, + { + "species": "SPECIES_MAGMAR", + "level": 21, + "probability": 5000 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "MagmaCavern_8F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_ARBOK", + "level": 21, + "probability": 2500 + }, + { + "species": "SPECIES_GRAVELER", + "level": 22, + "probability": 2500 + }, + { + "species": "SPECIES_MAGMAR", + "level": 21, + "probability": 2500 + }, + { + "species": "SPECIES_MAWILE", + "level": 20, + "probability": 2500 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "MagmaCavern_9F_10F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_ARBOK", + "level": 21, + "probability": 2000 + }, + { + "species": "SPECIES_GRAVELER", + "level": 22, + "probability": 2000 + }, + { + "species": "SPECIES_MAGMAR", + "level": 21, + "probability": 2000 + }, + { + "species": "SPECIES_MAGCARGO", + "level": 21, + "probability": 2000 + }, + { + "species": "SPECIES_MAWILE", + "level": 20, + "probability": 2000 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "MagmaCavern_11F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_ARBOK", + "level": 21, + "probability": 2500 + }, + { + "species": "SPECIES_MAGMAR", + "level": 21, + "probability": 2500 + }, + { + "species": "SPECIES_MAGCARGO", + "level": 21, + "probability": 2500 + }, + { + "species": "SPECIES_MAWILE", + "level": 20, + "probability": 2500 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "MagmaCavern_12F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_ARBOK", + "level": 21, + "probability": 3333 + }, + { + "species": "SPECIES_MAGCARGO", + "level": 21, + "probability": 3334 + }, + { + "species": "SPECIES_MAWILE", + "level": 20, + "probability": 3333 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "MagmaCavern_13F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_ARBOK", + "level": 21, + "probability": 5000 + }, + { + "species": "SPECIES_MAGCARGO", + "level": 21, + "probability": 5000 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "MagmaCavern_14F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_ARBOK", + "level": 21, + "probability": 3333 + }, + { + "species": "SPECIES_RHYDON", + "level": 23, + "probability": 3334 + }, + { + "species": "SPECIES_MAGCARGO", + "level": 21, + "probability": 3333 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "MagmaCavern_15F_20F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_SANDSLASH", + "level": 24, + "probability": 2500 + }, + { + "species": "SPECIES_GOLEM", + "level": 15, + "probability": 2500 + }, + { + "species": "SPECIES_GRIMER", + "level": 20, + "probability": 2500 + }, + { + "species": "SPECIES_RHYDON", + "level": 23, + "probability": 2500 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "MagmaCavern_21F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_GRIMER", + "level": 20, + "probability": 8000 + }, + { + "species": "SPECIES_ONIX", + "level": 30, + "probability": 2000 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "MagmaCavern_22F_23F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_ONIX", + "level": 30, + "probability": 10000 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + } + ] +} diff --git a/data/dungeon/MagmaCavernPit/floor_id.json b/data/dungeon/MagmaCavernPit/floor_id.json index 837d1d1..42995f5 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 c2cd5f2..c0e312f 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 + } + ] + }] +} diff --git a/data/dungeon/MarvelousSea/floor_id.json b/data/dungeon/MarvelousSea/floor_id.json index ffd84e4..a0660cf 100644 --- a/data/dungeon/MarvelousSea/floor_id.json +++ b/data/dungeon/MarvelousSea/floor_id.json @@ -1,185 +1,185 @@ -{ - "name": "MarvelousSeaFloorID", - "tables": [ - { - "MainData": 1071, - "Pokemon": 502, - "Traps": 86, - "Items": 121, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1072, - "Pokemon": 502, - "Traps": 86, - "Items": 121, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1073, - "Pokemon": 502, - "Traps": 86, - "Items": 121, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1074, - "Pokemon": 502, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1075, - "Pokemon": 502, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1076, - "Pokemon": 503, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1077, - "Pokemon": 503, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1078, - "Pokemon": 503, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1079, - "Pokemon": 504, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1080, - "Pokemon": 505, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1081, - "Pokemon": 505, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1082, - "Pokemon": 505, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1083, - "Pokemon": 505, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1084, - "Pokemon": 506, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1085, - "Pokemon": 507, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1086, - "Pokemon": 507, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1087, - "Pokemon": 507, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1088, - "Pokemon": 507, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1089, - "Pokemon": 507, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1090, - "Pokemon": 508, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - } - ] -} +{ + "name": "MarvelousSeaFloorID", + "tables": [ + { + "MainData": 1071, + "Pokemon": 502, + "Traps": 86, + "Items": 121, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1072, + "Pokemon": 502, + "Traps": 86, + "Items": 121, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1073, + "Pokemon": 502, + "Traps": 86, + "Items": 121, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1074, + "Pokemon": 502, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1075, + "Pokemon": 502, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1076, + "Pokemon": 503, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1077, + "Pokemon": 503, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1078, + "Pokemon": 503, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1079, + "Pokemon": 504, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1080, + "Pokemon": 505, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1081, + "Pokemon": 505, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1082, + "Pokemon": 505, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1083, + "Pokemon": 505, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1084, + "Pokemon": 506, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1085, + "Pokemon": 507, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1086, + "Pokemon": 507, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1087, + "Pokemon": 507, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1088, + "Pokemon": 507, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1089, + "Pokemon": 507, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 1090, + "Pokemon": 508, + "Traps": 86, + "Items": 122, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + } + ] +} diff --git a/data/dungeon/MeteorCave/floor_id.json b/data/dungeon/MeteorCave/floor_id.json index 7a5dc81..6d25001 100644 --- a/data/dungeon/MeteorCave/floor_id.json +++ b/data/dungeon/MeteorCave/floor_id.json @@ -1,185 +1,185 @@ -{ - "name": "MeteorCaveFloorID", - "tables": [ - { - "MainData": 326, - "Pokemon": 161, - "Traps": 7, - "Items": 56, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 327, - "Pokemon": 161, - "Traps": 7, - "Items": 56, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 328, - "Pokemon": 161, - "Traps": 7, - "Items": 56, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 329, - "Pokemon": 161, - "Traps": 7, - "Items": 58, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 330, - "Pokemon": 161, - "Traps": 7, - "Items": 58, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 331, - "Pokemon": 161, - "Traps": 7, - "Items": 58, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 332, - "Pokemon": 161, - "Traps": 7, - "Items": 59, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 333, - "Pokemon": 161, - "Traps": 7, - "Items": 59, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 334, - "Pokemon": 161, - "Traps": 7, - "Items": 59, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 335, - "Pokemon": 161, - "Traps": 8, - "Items": 59, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 336, - "Pokemon": 161, - "Traps": 8, - "Items": 59, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 337, - "Pokemon": 161, - "Traps": 8, - "Items": 59, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 338, - "Pokemon": 161, - "Traps": 8, - "Items": 59, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 339, - "Pokemon": 161, - "Traps": 8, - "Items": 59, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 340, - "Pokemon": 161, - "Traps": 8, - "Items": 59, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 341, - "Pokemon": 161, - "Traps": 8, - "Items": 59, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 342, - "Pokemon": 161, - "Traps": 8, - "Items": 59, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 343, - "Pokemon": 161, - "Traps": 8, - "Items": 59, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 344, - "Pokemon": 161, - "Traps": 8, - "Items": 59, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 345, - "Pokemon": 162, - "Traps": 9, - "Items": 59, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 57 - } - ] -} +{ + "name": "MeteorCaveFloorID", + "tables": [ + { + "MainData": 326, + "Pokemon": 161, + "Traps": 7, + "Items": 56, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 327, + "Pokemon": 161, + "Traps": 7, + "Items": 56, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 328, + "Pokemon": 161, + "Traps": 7, + "Items": 56, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 329, + "Pokemon": 161, + "Traps": 7, + "Items": 58, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 330, + "Pokemon": 161, + "Traps": 7, + "Items": 58, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 331, + "Pokemon": 161, + "Traps": 7, + "Items": 58, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 332, + "Pokemon": 161, + "Traps": 7, + "Items": 59, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 333, + "Pokemon": 161, + "Traps": 7, + "Items": 59, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 334, + "Pokemon": 161, + "Traps": 7, + "Items": 59, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 335, + "Pokemon": 161, + "Traps": 8, + "Items": 59, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 336, + "Pokemon": 161, + "Traps": 8, + "Items": 59, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 337, + "Pokemon": 161, + "Traps": 8, + "Items": 59, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 338, + "Pokemon": 161, + "Traps": 8, + "Items": 59, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 339, + "Pokemon": 161, + "Traps": 8, + "Items": 59, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 340, + "Pokemon": 161, + "Traps": 8, + "Items": 59, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 341, + "Pokemon": 161, + "Traps": 8, + "Items": 59, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 342, + "Pokemon": 161, + "Traps": 8, + "Items": 59, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 343, + "Pokemon": 161, + "Traps": 8, + "Items": 59, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 344, + "Pokemon": 161, + "Traps": 8, + "Items": 59, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 345, + "Pokemon": 162, + "Traps": 9, + "Items": 59, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 57 + } + ] +} diff --git a/data/dungeon/MtBlaze/floor_id.json b/data/dungeon/MtBlaze/floor_id.json index 6c6cc42..6dcb1a4 100644 --- a/data/dungeon/MtBlaze/floor_id.json +++ b/data/dungeon/MtBlaze/floor_id.json @@ -1,113 +1,113 @@ -{ - "name": "MtBlazeFloorID", - "tables": [ - { - "MainData": 78, - "Pokemon": 55, - "Traps": 3, - "Items": 24, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 79, - "Pokemon": 55, - "Traps": 3, - "Items": 24, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 80, - "Pokemon": 55, - "Traps": 3, - "Items": 24, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 81, - "Pokemon": 56, - "Traps": 3, - "Items": 25, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 82, - "Pokemon": 57, - "Traps": 3, - "Items": 25, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 83, - "Pokemon": 58, - "Traps": 3, - "Items": 25, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 84, - "Pokemon": 59, - "Traps": 3, - "Items": 25, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 85, - "Pokemon": 60, - "Traps": 3, - "Items": 25, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 86, - "Pokemon": 60, - "Traps": 3, - "Items": 25, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 87, - "Pokemon": 61, - "Traps": 3, - "Items": 25, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 88, - "Pokemon": 61, - "Traps": 3, - "Items": 25, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 89, - "Pokemon": 61, - "Traps": 3, - "Items": 25, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - } - ] -} +{ + "name": "MtBlazeFloorID", + "tables": [ + { + "MainData": 78, + "Pokemon": 55, + "Traps": 3, + "Items": 24, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 79, + "Pokemon": 55, + "Traps": 3, + "Items": 24, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 80, + "Pokemon": 55, + "Traps": 3, + "Items": 24, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 81, + "Pokemon": 56, + "Traps": 3, + "Items": 25, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 82, + "Pokemon": 57, + "Traps": 3, + "Items": 25, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 83, + "Pokemon": 58, + "Traps": 3, + "Items": 25, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 84, + "Pokemon": 59, + "Traps": 3, + "Items": 25, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 85, + "Pokemon": 60, + "Traps": 3, + "Items": 25, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 86, + "Pokemon": 60, + "Traps": 3, + "Items": 25, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 87, + "Pokemon": 61, + "Traps": 3, + "Items": 25, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 88, + "Pokemon": 61, + "Traps": 3, + "Items": 25, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 89, + "Pokemon": 61, + "Traps": 3, + "Items": 25, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + } + ] +} diff --git a/data/dungeon/MtBlaze/pokemon_found.json b/data/dungeon/MtBlaze/pokemon_found.json index b269470..2961618 100644 --- a/data/dungeon/MtBlaze/pokemon_found.json +++ b/data/dungeon/MtBlaze/pokemon_found.json @@ -1,220 +1,220 @@ -{ - "tables": [{ - "name": "MtBlaze_1F_3F_Pokemon", - "pokemon": [{ - "species": "SPECIES_PIDGEOT", - "level": 16, - "probability": 2857 - }, - { - "species": "SPECIES_SLUGMA", - "level": 16, - "probability": 1429 - }, - { - "species": "SPECIES_MAGBY", - "level": 17, - "probability": 2857 - }, - { - "species": "SPECIES_NUMEL", - "level": 14, - "probability": 2857 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - - "name": "MtBlaze_4F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_SLUGMA", - "level": 16, - "probability": 2000 - }, - { - "species": "SPECIES_MAGBY", - "level": 17, - "probability": 4000 - }, - { - "species": "SPECIES_NUMEL", - "level": 14, - "probability": 4000 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - - ] - }, { - "name": "MtBlaze_5F_Pokemon", - "pokemon": [{ - "species": "SPECIES_SHUCKLE", - "level": 15, - "probability": 1304 - }, - { - "species": "SPECIES_SLUGMA", - "level": 16, - "probability": 1739 - }, - { - "species": "SPECIES_MAGBY", - "level": 17, - "probability": 3479 - }, - { - "species": "SPECIES_NUMEL", - "level": 14, - "probability": 3478 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "MtBlaze_6F_Pokemon", - "pokemon": [{ - "species": "SPECIES_SHUCKLE", - "level": 15, - "probability": 2000 - }, - { - "species": "SPECIES_SLUGMA", - "level": 16, - "probability": 2667 - }, - { - "species": "SPECIES_NUMEL", - "level": 14, - "probability": 5333 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "MtBlaze_7F_Pokemon", - "pokemon": [{ - "species": "SPECIES_SHUCKLE", - "level": 15, - "probability": 2000 - }, - { - "species": "SPECIES_SLUGMA", - "level": 16, - "probability": 2667 - }, - { - "species": "SPECIES_TORKOAL", - "level": 15, - "probability": 5333 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "MtBlaze_8F_9F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_RAPIDASH", - "level": 10, - "probability": 3478 - }, - { - "species": "SPECIES_SHUCKLE", - "level": 15, - "probability": 1305 - }, - { - "species": "SPECIES_SLUGMA", - "level": 16, - "probability": 1739 - }, - { - "species": "SPECIES_TORKOAL", - "level": 15, - "probability": 3478 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "MtBlaze_10F_12F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_RAPIDASH", - "level": 10, - "probability": 4000 - }, - { - "species": "SPECIES_SLUGMA", - "level": 16, - "probability": 2000 - }, - { - "species": "SPECIES_TORKOAL", - "level": 15, - "probability": 4000 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - } - ] -} +{ + "tables": [{ + "name": "MtBlaze_1F_3F_Pokemon", + "pokemon": [{ + "species": "SPECIES_PIDGEOT", + "level": 16, + "probability": 2857 + }, + { + "species": "SPECIES_SLUGMA", + "level": 16, + "probability": 1429 + }, + { + "species": "SPECIES_MAGBY", + "level": 17, + "probability": 2857 + }, + { + "species": "SPECIES_NUMEL", + "level": 14, + "probability": 2857 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + + "name": "MtBlaze_4F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_SLUGMA", + "level": 16, + "probability": 2000 + }, + { + "species": "SPECIES_MAGBY", + "level": 17, + "probability": 4000 + }, + { + "species": "SPECIES_NUMEL", + "level": 14, + "probability": 4000 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + + ] + }, { + "name": "MtBlaze_5F_Pokemon", + "pokemon": [{ + "species": "SPECIES_SHUCKLE", + "level": 15, + "probability": 1304 + }, + { + "species": "SPECIES_SLUGMA", + "level": 16, + "probability": 1739 + }, + { + "species": "SPECIES_MAGBY", + "level": 17, + "probability": 3479 + }, + { + "species": "SPECIES_NUMEL", + "level": 14, + "probability": 3478 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "MtBlaze_6F_Pokemon", + "pokemon": [{ + "species": "SPECIES_SHUCKLE", + "level": 15, + "probability": 2000 + }, + { + "species": "SPECIES_SLUGMA", + "level": 16, + "probability": 2667 + }, + { + "species": "SPECIES_NUMEL", + "level": 14, + "probability": 5333 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "MtBlaze_7F_Pokemon", + "pokemon": [{ + "species": "SPECIES_SHUCKLE", + "level": 15, + "probability": 2000 + }, + { + "species": "SPECIES_SLUGMA", + "level": 16, + "probability": 2667 + }, + { + "species": "SPECIES_TORKOAL", + "level": 15, + "probability": 5333 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "MtBlaze_8F_9F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_RAPIDASH", + "level": 10, + "probability": 3478 + }, + { + "species": "SPECIES_SHUCKLE", + "level": 15, + "probability": 1305 + }, + { + "species": "SPECIES_SLUGMA", + "level": 16, + "probability": 1739 + }, + { + "species": "SPECIES_TORKOAL", + "level": 15, + "probability": 3478 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "MtBlaze_10F_12F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_RAPIDASH", + "level": 10, + "probability": 4000 + }, + { + "species": "SPECIES_SLUGMA", + "level": 16, + "probability": 2000 + }, + { + "species": "SPECIES_TORKOAL", + "level": 15, + "probability": 4000 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + } + ] +} diff --git a/data/dungeon/MtBlazePeak/floor_id.json b/data/dungeon/MtBlazePeak/floor_id.json index e21fe80..72d5a3d 100644 --- a/data/dungeon/MtBlazePeak/floor_id.json +++ b/data/dungeon/MtBlazePeak/floor_id.json @@ -1,32 +1,32 @@ -{ - "name": "MtBlazePeakFloorID", - "tables": [ - { - "MainData": 90, - "Pokemon": 62, - "Traps": 1, - "Items": 26, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 91, - "Pokemon": 62, - "Traps": 1, - "Items": 26, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 92, - "Pokemon": 63, - "Traps": 1, - "Items": 26, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - } - ] -} +{ + "name": "MtBlazePeakFloorID", + "tables": [ + { + "MainData": 90, + "Pokemon": 62, + "Traps": 1, + "Items": 26, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 91, + "Pokemon": 62, + "Traps": 1, + "Items": 26, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 92, + "Pokemon": 63, + "Traps": 1, + "Items": 26, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + } + ] +} diff --git a/data/dungeon/MtBlazePeak/pokemon_found.json b/data/dungeon/MtBlazePeak/pokemon_found.json index 76c7400..f13a655 100644 --- a/data/dungeon/MtBlazePeak/pokemon_found.json +++ b/data/dungeon/MtBlazePeak/pokemon_found.json @@ -1,45 +1,45 @@ -{ - "tables": [{ - "name": "MtBlazePeak_1F_2F_Pokemon", - "pokemon": [{ - "species": "SPECIES_FEAROW", - "level": 17, - "probability": 5000 - }, - { - "species": "SPECIES_ARCANINE", - "level": 18, - "probability": 5000 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "MtBlazePeak_3F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_MOLTRES", - "level": 32, - "probability": 10000 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }] -} +{ + "tables": [{ + "name": "MtBlazePeak_1F_2F_Pokemon", + "pokemon": [{ + "species": "SPECIES_FEAROW", + "level": 17, + "probability": 5000 + }, + { + "species": "SPECIES_ARCANINE", + "level": 18, + "probability": 5000 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "MtBlazePeak_3F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_MOLTRES", + "level": 32, + "probability": 10000 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }] +} diff --git a/data/dungeon/MtFaraway/floor_id.json b/data/dungeon/MtFaraway/floor_id.json index 5ab9103..f90c5de 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 + } + ] +} diff --git a/data/dungeon/MtFreeze/floor_id.json b/data/dungeon/MtFreeze/floor_id.json index 9fc3948..3cd5011 100644 --- a/data/dungeon/MtFreeze/floor_id.json +++ b/data/dungeon/MtFreeze/floor_id.json @@ -1,140 +1,140 @@ -{ - "name": "MtFreezeFloorID", - "tables": [ - { - "MainData": 107, - "Pokemon": 72, - "Traps": 3, - "Items": 32, - "KecleonShop": 28, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 108, - "Pokemon": 72, - "Traps": 3, - "Items": 32, - "KecleonShop": 28, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 109, - "Pokemon": 73, - "Traps": 3, - "Items": 32, - "KecleonShop": 28, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 110, - "Pokemon": 73, - "Traps": 3, - "Items": 33, - "KecleonShop": 28, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 111, - "Pokemon": 73, - "Traps": 3, - "Items": 33, - "KecleonShop": 28, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 112, - "Pokemon": 74, - "Traps": 3, - "Items": 33, - "KecleonShop": 28, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 113, - "Pokemon": 75, - "Traps": 3, - "Items": 33, - "KecleonShop": 28, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 114, - "Pokemon": 76, - "Traps": 3, - "Items": 33, - "KecleonShop": 28, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 115, - "Pokemon": 76, - "Traps": 3, - "Items": 33, - "KecleonShop": 28, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 116, - "Pokemon": 76, - "Traps": 3, - "Items": 33, - "KecleonShop": 28, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 117, - "Pokemon": 76, - "Traps": 3, - "Items": 33, - "KecleonShop": 28, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 118, - "Pokemon": 77, - "Traps": 3, - "Items": 33, - "KecleonShop": 28, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 119, - "Pokemon": 78, - "Traps": 3, - "Items": 33, - "KecleonShop": 28, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 120, - "Pokemon": 78, - "Traps": 3, - "Items": 33, - "KecleonShop": 28, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 121, - "Pokemon": 78, - "Traps": 3, - "Items": 33, - "KecleonShop": 28, - "MonsterRoomItems": 2, - "BuriedItems": 3 - } - ] -} +{ + "name": "MtFreezeFloorID", + "tables": [ + { + "MainData": 107, + "Pokemon": 72, + "Traps": 3, + "Items": 32, + "KecleonShop": 28, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 108, + "Pokemon": 72, + "Traps": 3, + "Items": 32, + "KecleonShop": 28, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 109, + "Pokemon": 73, + "Traps": 3, + "Items": 32, + "KecleonShop": 28, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 110, + "Pokemon": 73, + "Traps": 3, + "Items": 33, + "KecleonShop": 28, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 111, + "Pokemon": 73, + "Traps": 3, + "Items": 33, + "KecleonShop": 28, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 112, + "Pokemon": 74, + "Traps": 3, + "Items": 33, + "KecleonShop": 28, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 113, + "Pokemon": 75, + "Traps": 3, + "Items": 33, + "KecleonShop": 28, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 114, + "Pokemon": 76, + "Traps": 3, + "Items": 33, + "KecleonShop": 28, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 115, + "Pokemon": 76, + "Traps": 3, + "Items": 33, + "KecleonShop": 28, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 116, + "Pokemon": 76, + "Traps": 3, + "Items": 33, + "KecleonShop": 28, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 117, + "Pokemon": 76, + "Traps": 3, + "Items": 33, + "KecleonShop": 28, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 118, + "Pokemon": 77, + "Traps": 3, + "Items": 33, + "KecleonShop": 28, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 119, + "Pokemon": 78, + "Traps": 3, + "Items": 33, + "KecleonShop": 28, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 120, + "Pokemon": 78, + "Traps": 3, + "Items": 33, + "KecleonShop": 28, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 121, + "Pokemon": 78, + "Traps": 3, + "Items": 33, + "KecleonShop": 28, + "MonsterRoomItems": 2, + "BuriedItems": 3 + } + ] +} diff --git a/data/dungeon/MtFreeze/pokemon_found.json b/data/dungeon/MtFreeze/pokemon_found.json index bdd07d0..413e22c 100644 --- a/data/dungeon/MtFreeze/pokemon_found.json +++ b/data/dungeon/MtFreeze/pokemon_found.json @@ -1,216 +1,216 @@ -{ - "tables": [{ - "name": "MtFreeze_1F_2F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_PINECO", - "level": 18, - "probability": 1111 - }, - { - "species": "SPECIES_SWABLU", - "level": 18, - "probability": 4445 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_SHELGON", - "level": 19, - "probability": 4444 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "MtFreeze_3F_5F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_SEEL", - "level": 18, - "probability": 2759 - }, - { - "species": "SPECIES_PINECO", - "level": 18, - "probability": 689 - }, - { - "species": "SPECIES_PUPITAR", - "level": 17, - "probability": 1035 - }, - { - "species": "SPECIES_SWABLU", - "level": 18, - "probability": 2758 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_SHELGON", - "level": 19, - "probability": 2759 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "MtFreeze_6F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_SEEL", - "level": 18, - "probability": 3333 - }, - { - "species": "SPECIES_SWABLU", - "level": 18, - "probability": 3334 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_SHELGON", - "level": 19, - "probability": 3333 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "MtFreeze_7F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_SEEL", - "level": 18, - "probability": 2857 - }, - { - "species": "SPECIES_VIGOROTH", - "level": 20, - "probability": 2857 - }, - { - "species": "SPECIES_ZANGOOSE", - "level": 18, - "probability": 2857 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_CHIMECHO", - "level": 22, - "probability": 1429 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "MtFreeze_8F_11F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_VIGOROTH", - "level": 20, - "probability": 4000 - }, - { - "species": "SPECIES_ZANGOOSE", - "level": 18, - "probability": 4000 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_CHIMECHO", - "level": 22, - "probability": 2000 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "MtFreeze_12F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_SLAKING", - "level": 15, - "probability": 4000 - }, - { - "species": "SPECIES_ZANGOOSE", - "level": 18, - "probability": 4000 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_CHIMECHO", - "level": 22, - "probability": 2000 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "MtFreeze_13F_15F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_SLAKING", - "level": 15, - "probability": 5000 - }, - { - "species": "SPECIES_SEVIPER", - "level": 19, - "probability": 5000 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }] -} +{ + "tables": [{ + "name": "MtFreeze_1F_2F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_PINECO", + "level": 18, + "probability": 1111 + }, + { + "species": "SPECIES_SWABLU", + "level": 18, + "probability": 4445 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_SHELGON", + "level": 19, + "probability": 4444 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "MtFreeze_3F_5F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_SEEL", + "level": 18, + "probability": 2759 + }, + { + "species": "SPECIES_PINECO", + "level": 18, + "probability": 689 + }, + { + "species": "SPECIES_PUPITAR", + "level": 17, + "probability": 1035 + }, + { + "species": "SPECIES_SWABLU", + "level": 18, + "probability": 2758 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_SHELGON", + "level": 19, + "probability": 2759 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "MtFreeze_6F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_SEEL", + "level": 18, + "probability": 3333 + }, + { + "species": "SPECIES_SWABLU", + "level": 18, + "probability": 3334 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_SHELGON", + "level": 19, + "probability": 3333 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "MtFreeze_7F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_SEEL", + "level": 18, + "probability": 2857 + }, + { + "species": "SPECIES_VIGOROTH", + "level": 20, + "probability": 2857 + }, + { + "species": "SPECIES_ZANGOOSE", + "level": 18, + "probability": 2857 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_CHIMECHO", + "level": 22, + "probability": 1429 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "MtFreeze_8F_11F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_VIGOROTH", + "level": 20, + "probability": 4000 + }, + { + "species": "SPECIES_ZANGOOSE", + "level": 18, + "probability": 4000 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_CHIMECHO", + "level": 22, + "probability": 2000 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "MtFreeze_12F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_SLAKING", + "level": 15, + "probability": 4000 + }, + { + "species": "SPECIES_ZANGOOSE", + "level": 18, + "probability": 4000 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_CHIMECHO", + "level": 22, + "probability": 2000 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "MtFreeze_13F_15F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_SLAKING", + "level": 15, + "probability": 5000 + }, + { + "species": "SPECIES_SEVIPER", + "level": 19, + "probability": 5000 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }] +} diff --git a/data/dungeon/MtFreezePeak/floor_id.json b/data/dungeon/MtFreezePeak/floor_id.json index 31275ad..23d45db 100644 --- a/data/dungeon/MtFreezePeak/floor_id.json +++ b/data/dungeon/MtFreezePeak/floor_id.json @@ -1,50 +1,50 @@ -{ - "name": "MtFreezePeakFloorID", - "tables": [ - { - "MainData": 122, - "Pokemon": 79, - "Traps": 3, - "Items": 34, - "KecleonShop": 28, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 123, - "Pokemon": 79, - "Traps": 3, - "Items": 34, - "KecleonShop": 28, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 124, - "Pokemon": 79, - "Traps": 3, - "Items": 34, - "KecleonShop": 28, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 125, - "Pokemon": 79, - "Traps": 3, - "Items": 35, - "KecleonShop": 28, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 126, - "Pokemon": 80, - "Traps": 3, - "Items": 35, - "KecleonShop": 28, - "MonsterRoomItems": 2, - "BuriedItems": 3 - } - ] -} +{ + "name": "MtFreezePeakFloorID", + "tables": [ + { + "MainData": 122, + "Pokemon": 79, + "Traps": 3, + "Items": 34, + "KecleonShop": 28, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 123, + "Pokemon": 79, + "Traps": 3, + "Items": 34, + "KecleonShop": 28, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 124, + "Pokemon": 79, + "Traps": 3, + "Items": 34, + "KecleonShop": 28, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 125, + "Pokemon": 79, + "Traps": 3, + "Items": 35, + "KecleonShop": 28, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 126, + "Pokemon": 80, + "Traps": 3, + "Items": 35, + "KecleonShop": 28, + "MonsterRoomItems": 2, + "BuriedItems": 3 + } + ] +} diff --git a/data/dungeon/MtFreezePeak/pokemon_found.json b/data/dungeon/MtFreezePeak/pokemon_found.json index 683135d..7d1a50c 100644 --- a/data/dungeon/MtFreezePeak/pokemon_found.json +++ b/data/dungeon/MtFreezePeak/pokemon_found.json @@ -1,56 +1,56 @@ -{ - "tables": [{ - "name": "MtFreezePeak_1F_4F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_GLALIE", - "level": 20, - "probability": 10000 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "MtFreezePeak_5F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_CHARIZARD", - "level": 55, - "probability": 0 - }, - { - "species": "SPECIES_ALAKAZAM", - "level": 50, - "probability": 0 - }, - { - "species": "SPECIES_TYRANITAR", - "level": 50, - "probability": 0 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_GLALIE", - "level": 20, - "probability": 10000 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }] -} +{ + "tables": [{ + "name": "MtFreezePeak_1F_4F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_GLALIE", + "level": 20, + "probability": 10000 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "MtFreezePeak_5F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_CHARIZARD", + "level": 55, + "probability": 0 + }, + { + "species": "SPECIES_ALAKAZAM", + "level": 50, + "probability": 0 + }, + { + "species": "SPECIES_TYRANITAR", + "level": 50, + "probability": 0 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_GLALIE", + "level": 20, + "probability": 10000 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }] +} diff --git a/data/dungeon/MtFreezePeakAlt/floor_id.json b/data/dungeon/MtFreezePeakAlt/floor_id.json index 03836e0..a3823ba 100644 --- a/data/dungeon/MtFreezePeakAlt/floor_id.json +++ b/data/dungeon/MtFreezePeakAlt/floor_id.json @@ -1,41 +1,41 @@ -{ - "name": "MtFreezePeakAltFloorID", - "tables": [ - { - "MainData": 346, - "Pokemon": 79, - "Traps": 10, - "Items": 34, - "KecleonShop": 28, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 347, - "Pokemon": 79, - "Traps": 10, - "Items": 34, - "KecleonShop": 28, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 348, - "Pokemon": 79, - "Traps": 10, - "Items": 34, - "KecleonShop": 28, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 349, - "Pokemon": 79, - "Traps": 10, - "Items": 35, - "KecleonShop": 28, - "MonsterRoomItems": 2, - "BuriedItems": 3 - } - ] -} +{ + "name": "MtFreezePeakAltFloorID", + "tables": [ + { + "MainData": 346, + "Pokemon": 79, + "Traps": 10, + "Items": 34, + "KecleonShop": 28, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 347, + "Pokemon": 79, + "Traps": 10, + "Items": 34, + "KecleonShop": 28, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 348, + "Pokemon": 79, + "Traps": 10, + "Items": 34, + "KecleonShop": 28, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 349, + "Pokemon": 79, + "Traps": 10, + "Items": 35, + "KecleonShop": 28, + "MonsterRoomItems": 2, + "BuriedItems": 3 + } + ] +} diff --git a/data/dungeon/MtSteel/floor_id.json b/data/dungeon/MtSteel/floor_id.json index 986c5f3..fc28d1a 100644 --- a/data/dungeon/MtSteel/floor_id.json +++ b/data/dungeon/MtSteel/floor_id.json @@ -1,86 +1,86 @@ -{ - "name": "MtSteelFloorID", - "tables": [ - { - "MainData": 8, - "Pokemon": 5, - "Traps": 1, - "Items": 8, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 9, - "Pokemon": 5, - "Traps": 1, - "Items": 8, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 10, - "Pokemon": 5, - "Traps": 1, - "Items": 8, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 11, - "Pokemon": 5, - "Traps": 1, - "Items": 9, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 12, - "Pokemon": 6, - "Traps": 1, - "Items": 9, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 13, - "Pokemon": 7, - "Traps": 1, - "Items": 9, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 14, - "Pokemon": 8, - "Traps": 1, - "Items": 10, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 15, - "Pokemon": 8, - "Traps": 1, - "Items": 10, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 16, - "Pokemon": 9, - "Traps": 1, - "Items": 10, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - } - ] -} +{ + "name": "MtSteelFloorID", + "tables": [ + { + "MainData": 8, + "Pokemon": 5, + "Traps": 1, + "Items": 8, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 9, + "Pokemon": 5, + "Traps": 1, + "Items": 8, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 10, + "Pokemon": 5, + "Traps": 1, + "Items": 8, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 11, + "Pokemon": 5, + "Traps": 1, + "Items": 9, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 12, + "Pokemon": 6, + "Traps": 1, + "Items": 9, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 13, + "Pokemon": 7, + "Traps": 1, + "Items": 9, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 14, + "Pokemon": 8, + "Traps": 1, + "Items": 10, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 15, + "Pokemon": 8, + "Traps": 1, + "Items": 10, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 16, + "Pokemon": 9, + "Traps": 1, + "Items": 10, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + } + ] +} diff --git a/data/dungeon/MtSteel/pokemon_found.json b/data/dungeon/MtSteel/pokemon_found.json index 8b8b110..dbaeff9 100644 --- a/data/dungeon/MtSteel/pokemon_found.json +++ b/data/dungeon/MtSteel/pokemon_found.json @@ -1,188 +1,188 @@ -{ - "tables": [{ - "name": "MtSteel_1F_4F_Pokemon", - "pokemon": [{ - "species": "SPECIES_SPEAROW", - "level": 4, - "probability": 2353 - }, - { - "species": "SPECIES_ZIGZAGOON", - "level": 5, - "probability": 2353 - }, - { - "species": "SPECIES_ARON", - "level": 6, - "probability": 2941 - }, - { - "species": "SPECIES_BALTOY", - "level": 5, - "probability": 2353 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "MtSteel_5F_Pokemon", - "pokemon": [{ - "species": "SPECIES_GEODUDE", - "level": 5, - "probability": 1905 - }, - { - "species": "SPECIES_TYROGUE", - "level": 6, - "probability": 1905 - }, - { - "species": "SPECIES_ZIGZAGOON", - "level": 5, - "probability": 1904 - }, - { - "species": "SPECIES_ARON", - "level": 6, - "probability": 2381 - }, - { - "species": "SPECIES_MEDITITE", - "level": 6, - "probability": 1905 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "MtSteel_6F_Pokemon", - "pokemon": [{ - "species": "SPECIES_GEODUDE", - "level": 5, - "probability": 2051 - }, - { - "species": "SPECIES_TYROGUE", - "level": 6, - "probability": 2052 - }, - { - "species": "SPECIES_ARON", - "level": 6, - "probability": 2564 - }, - { - "species": "SPECIES_MEDITITE", - "level": 6, - "probability": 2051 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_BELDUM", - "level": 5, - "probability": 1282 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "MtSteel_7F_8F_Pokemon", - "pokemon": [{ - "species": "SPECIES_GEODUDE", - "level": 5, - "probability": 1633 - }, - { - "species": "SPECIES_PINSIR", - "level": 6, - "probability": 2040 - }, - { - "species": "SPECIES_TYROGUE", - "level": 6, - "probability": 1633 - }, - { - "species": "SPECIES_ARON", - "level": 6, - "probability": 2041 - }, - { - "species": "SPECIES_MEDITITE", - "level": 6, - "probability": 1633 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_BELDUM", - "level": 5, - "probability": 1020 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "MtSteel_9F_Pokemon", - "pokemon": [{ - "species": "SPECIES_DIGLETT", - "level": 5, - "probability": 0 - }, - { - "species": "SPECIES_SKARMORY", - "level": 10, - "probability": 0 - }, - { - "species": "SPECIES_ARON", - "level": 6, - "probability": 6667 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_BELDUM", - "level": 5, - "probability": 3333 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }] -} +{ + "tables": [{ + "name": "MtSteel_1F_4F_Pokemon", + "pokemon": [{ + "species": "SPECIES_SPEAROW", + "level": 4, + "probability": 2353 + }, + { + "species": "SPECIES_ZIGZAGOON", + "level": 5, + "probability": 2353 + }, + { + "species": "SPECIES_ARON", + "level": 6, + "probability": 2941 + }, + { + "species": "SPECIES_BALTOY", + "level": 5, + "probability": 2353 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "MtSteel_5F_Pokemon", + "pokemon": [{ + "species": "SPECIES_GEODUDE", + "level": 5, + "probability": 1905 + }, + { + "species": "SPECIES_TYROGUE", + "level": 6, + "probability": 1905 + }, + { + "species": "SPECIES_ZIGZAGOON", + "level": 5, + "probability": 1904 + }, + { + "species": "SPECIES_ARON", + "level": 6, + "probability": 2381 + }, + { + "species": "SPECIES_MEDITITE", + "level": 6, + "probability": 1905 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "MtSteel_6F_Pokemon", + "pokemon": [{ + "species": "SPECIES_GEODUDE", + "level": 5, + "probability": 2051 + }, + { + "species": "SPECIES_TYROGUE", + "level": 6, + "probability": 2052 + }, + { + "species": "SPECIES_ARON", + "level": 6, + "probability": 2564 + }, + { + "species": "SPECIES_MEDITITE", + "level": 6, + "probability": 2051 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_BELDUM", + "level": 5, + "probability": 1282 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "MtSteel_7F_8F_Pokemon", + "pokemon": [{ + "species": "SPECIES_GEODUDE", + "level": 5, + "probability": 1633 + }, + { + "species": "SPECIES_PINSIR", + "level": 6, + "probability": 2040 + }, + { + "species": "SPECIES_TYROGUE", + "level": 6, + "probability": 1633 + }, + { + "species": "SPECIES_ARON", + "level": 6, + "probability": 2041 + }, + { + "species": "SPECIES_MEDITITE", + "level": 6, + "probability": 1633 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_BELDUM", + "level": 5, + "probability": 1020 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "MtSteel_9F_Pokemon", + "pokemon": [{ + "species": "SPECIES_DIGLETT", + "level": 5, + "probability": 0 + }, + { + "species": "SPECIES_SKARMORY", + "level": 10, + "probability": 0 + }, + { + "species": "SPECIES_ARON", + "level": 6, + "probability": 6667 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_BELDUM", + "level": 5, + "probability": 3333 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }] +} diff --git a/data/dungeon/MtThunder/floor_id.json b/data/dungeon/MtThunder/floor_id.json index db52745..0af734b 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 731f4ac..f6c5c76 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 + } + ] + }] +} diff --git a/data/dungeon/MtThunderPeak/floor_id.json b/data/dungeon/MtThunderPeak/floor_id.json index 6e39e10..f59f15a 100644 --- a/data/dungeon/MtThunderPeak/floor_id.json +++ b/data/dungeon/MtThunderPeak/floor_id.json @@ -1,33 +1,33 @@ -{ - "name": "MtThunderPeakFloorID", - "tables": [ - { - "MainData": 49, - "Pokemon": 37, - "Traps": 3, - "Items": 17, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 50, - "Pokemon": 37, - "Traps": 3, - "Items": 17, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 51, - "Pokemon": 38, - "Traps": 3, - "Items": 17, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - } - - ] -} +{ + "name": "MtThunderPeakFloorID", + "tables": [ + { + "MainData": 49, + "Pokemon": 37, + "Traps": 3, + "Items": 17, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 50, + "Pokemon": 37, + "Traps": 3, + "Items": 17, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 51, + "Pokemon": 38, + "Traps": 3, + "Items": 17, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + } + + ] +} diff --git a/data/dungeon/MtThunderPeak/pokemon_found.json b/data/dungeon/MtThunderPeak/pokemon_found.json index 22f230e..964e37f 100644 --- a/data/dungeon/MtThunderPeak/pokemon_found.json +++ b/data/dungeon/MtThunderPeak/pokemon_found.json @@ -1,59 +1,59 @@ -{ - "tables": [{ - "name": "MtThunderPeak_1F_2F_Pokemon", - "pokemon": [{ - "species": "SPECIES_GROWLITHE", - "level": 10, - "probability": 2000 - }, - { - "species": "SPECIES_ELECTABUZZ", - "level": 12, - "probability": 2000 - }, - { - "species": "SPECIES_AMPHAROS", - "level": 12, - "probability": 2000 - }, - { - "species": "SPECIES_GLIGAR", - "level": 12, - "probability": 2000 - }, - { - "species": "SPECIES_MANECTRIC", - "level": 9, - "probability": 2000 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "MtThunderPeak_3F_Pokemon", - "pokemon": [{ - "species": "SPECIES_ZAPDOS", - "level": 25, - "probability": 10000 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }] -} +{ + "tables": [{ + "name": "MtThunderPeak_1F_2F_Pokemon", + "pokemon": [{ + "species": "SPECIES_GROWLITHE", + "level": 10, + "probability": 2000 + }, + { + "species": "SPECIES_ELECTABUZZ", + "level": 12, + "probability": 2000 + }, + { + "species": "SPECIES_AMPHAROS", + "level": 12, + "probability": 2000 + }, + { + "species": "SPECIES_GLIGAR", + "level": 12, + "probability": 2000 + }, + { + "species": "SPECIES_MANECTRIC", + "level": 9, + "probability": 2000 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "MtThunderPeak_3F_Pokemon", + "pokemon": [{ + "species": "SPECIES_ZAPDOS", + "level": 25, + "probability": 10000 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }] +} diff --git a/data/dungeon/MurkyCave/floor_id.json b/data/dungeon/MurkyCave/floor_id.json index 1dfc130..54a95aa 100644 --- a/data/dungeon/MurkyCave/floor_id.json +++ b/data/dungeon/MurkyCave/floor_id.json @@ -1,176 +1,176 @@ -{ - "name": "MurkyCaveFloorID", - "tables": [ - { - "MainData": 977, - "Pokemon": 449, - "Traps": 63, - "Items": 111, - "KecleonShop": 19, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 978, - "Pokemon": 449, - "Traps": 63, - "Items": 111, - "KecleonShop": 19, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 979, - "Pokemon": 450, - "Traps": 63, - "Items": 111, - "KecleonShop": 19, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 980, - "Pokemon": 450, - "Traps": 63, - "Items": 112, - "KecleonShop": 19, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 981, - "Pokemon": 451, - "Traps": 63, - "Items": 112, - "KecleonShop": 19, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 982, - "Pokemon": 452, - "Traps": 63, - "Items": 112, - "KecleonShop": 19, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 983, - "Pokemon": 453, - "Traps": 63, - "Items": 112, - "KecleonShop": 19, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 984, - "Pokemon": 453, - "Traps": 63, - "Items": 112, - "KecleonShop": 19, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 985, - "Pokemon": 453, - "Traps": 63, - "Items": 112, - "KecleonShop": 19, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 986, - "Pokemon": 454, - "Traps": 63, - "Items": 112, - "KecleonShop": 19, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 987, - "Pokemon": 455, - "Traps": 63, - "Items": 112, - "KecleonShop": 19, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 988, - "Pokemon": 456, - "Traps": 63, - "Items": 112, - "KecleonShop": 19, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 989, - "Pokemon": 457, - "Traps": 63, - "Items": 112, - "KecleonShop": 19, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 990, - "Pokemon": 458, - "Traps": 63, - "Items": 112, - "KecleonShop": 19, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 991, - "Pokemon": 459, - "Traps": 63, - "Items": 112, - "KecleonShop": 19, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 992, - "Pokemon": 459, - "Traps": 63, - "Items": 112, - "KecleonShop": 19, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 993, - "Pokemon": 459, - "Traps": 63, - "Items": 112, - "KecleonShop": 19, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 994, - "Pokemon": 459, - "Traps": 63, - "Items": 112, - "KecleonShop": 19, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 995, - "Pokemon": 459, - "Traps": 85, - "Items": 112, - "KecleonShop": 19, - "MonsterRoomItems": 2, - "BuriedItems": 66 - } - ] -} +{ + "name": "MurkyCaveFloorID", + "tables": [ + { + "MainData": 977, + "Pokemon": 449, + "Traps": 63, + "Items": 111, + "KecleonShop": 19, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 978, + "Pokemon": 449, + "Traps": 63, + "Items": 111, + "KecleonShop": 19, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 979, + "Pokemon": 450, + "Traps": 63, + "Items": 111, + "KecleonShop": 19, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 980, + "Pokemon": 450, + "Traps": 63, + "Items": 112, + "KecleonShop": 19, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 981, + "Pokemon": 451, + "Traps": 63, + "Items": 112, + "KecleonShop": 19, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 982, + "Pokemon": 452, + "Traps": 63, + "Items": 112, + "KecleonShop": 19, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 983, + "Pokemon": 453, + "Traps": 63, + "Items": 112, + "KecleonShop": 19, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 984, + "Pokemon": 453, + "Traps": 63, + "Items": 112, + "KecleonShop": 19, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 985, + "Pokemon": 453, + "Traps": 63, + "Items": 112, + "KecleonShop": 19, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 986, + "Pokemon": 454, + "Traps": 63, + "Items": 112, + "KecleonShop": 19, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 987, + "Pokemon": 455, + "Traps": 63, + "Items": 112, + "KecleonShop": 19, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 988, + "Pokemon": 456, + "Traps": 63, + "Items": 112, + "KecleonShop": 19, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 989, + "Pokemon": 457, + "Traps": 63, + "Items": 112, + "KecleonShop": 19, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 990, + "Pokemon": 458, + "Traps": 63, + "Items": 112, + "KecleonShop": 19, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 991, + "Pokemon": 459, + "Traps": 63, + "Items": 112, + "KecleonShop": 19, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 992, + "Pokemon": 459, + "Traps": 63, + "Items": 112, + "KecleonShop": 19, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 993, + "Pokemon": 459, + "Traps": 63, + "Items": 112, + "KecleonShop": 19, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 994, + "Pokemon": 459, + "Traps": 63, + "Items": 112, + "KecleonShop": 19, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 995, + "Pokemon": 459, + "Traps": 85, + "Items": 112, + "KecleonShop": 19, + "MonsterRoomItems": 2, + "BuriedItems": 66 + } + ] +} diff --git a/data/dungeon/NorthernRange/floor_id.json b/data/dungeon/NorthernRange/floor_id.json index 27ca365..86a4c82 100644 --- a/data/dungeon/NorthernRange/floor_id.json +++ b/data/dungeon/NorthernRange/floor_id.json @@ -1,230 +1,230 @@ -{ - "name": "NorthernRangeFloorID", - "tables": [ - { - "MainData": 703, - "Pokemon": 327, - "Traps": 62, - "Items": 84, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 704, - "Pokemon": 327, - "Traps": 62, - "Items": 84, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 705, - "Pokemon": 327, - "Traps": 62, - "Items": 84, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 706, - "Pokemon": 327, - "Traps": 62, - "Items": 85, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 707, - "Pokemon": 327, - "Traps": 62, - "Items": 85, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 708, - "Pokemon": 328, - "Traps": 62, - "Items": 85, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 709, - "Pokemon": 329, - "Traps": 62, - "Items": 85, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 710, - "Pokemon": 330, - "Traps": 62, - "Items": 85, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 711, - "Pokemon": 330, - "Traps": 62, - "Items": 85, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 712, - "Pokemon": 330, - "Traps": 62, - "Items": 85, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 713, - "Pokemon": 330, - "Traps": 62, - "Items": 85, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 714, - "Pokemon": 331, - "Traps": 62, - "Items": 85, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 715, - "Pokemon": 331, - "Traps": 62, - "Items": 85, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 716, - "Pokemon": 332, - "Traps": 62, - "Items": 85, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 717, - "Pokemon": 332, - "Traps": 62, - "Items": 85, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 718, - "Pokemon": 332, - "Traps": 62, - "Items": 85, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 719, - "Pokemon": 333, - "Traps": 62, - "Items": 85, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 720, - "Pokemon": 334, - "Traps": 62, - "Items": 85, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 721, - "Pokemon": 335, - "Traps": 62, - "Items": 85, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 722, - "Pokemon": 336, - "Traps": 62, - "Items": 85, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 723, - "Pokemon": 337, - "Traps": 61, - "Items": 85, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 724, - "Pokemon": 337, - "Traps": 61, - "Items": 85, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 725, - "Pokemon": 337, - "Traps": 61, - "Items": 86, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 726, - "Pokemon": 337, - "Traps": 61, - "Items": 86, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 727, - "Pokemon": 338, - "Traps": 61, - "Items": 86, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - } - ] -} +{ + "name": "NorthernRangeFloorID", + "tables": [ + { + "MainData": 703, + "Pokemon": 327, + "Traps": 62, + "Items": 84, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 704, + "Pokemon": 327, + "Traps": 62, + "Items": 84, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 705, + "Pokemon": 327, + "Traps": 62, + "Items": 84, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 706, + "Pokemon": 327, + "Traps": 62, + "Items": 85, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 707, + "Pokemon": 327, + "Traps": 62, + "Items": 85, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 708, + "Pokemon": 328, + "Traps": 62, + "Items": 85, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 709, + "Pokemon": 329, + "Traps": 62, + "Items": 85, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 710, + "Pokemon": 330, + "Traps": 62, + "Items": 85, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 711, + "Pokemon": 330, + "Traps": 62, + "Items": 85, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 712, + "Pokemon": 330, + "Traps": 62, + "Items": 85, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 713, + "Pokemon": 330, + "Traps": 62, + "Items": 85, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 714, + "Pokemon": 331, + "Traps": 62, + "Items": 85, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 715, + "Pokemon": 331, + "Traps": 62, + "Items": 85, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 716, + "Pokemon": 332, + "Traps": 62, + "Items": 85, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 717, + "Pokemon": 332, + "Traps": 62, + "Items": 85, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 718, + "Pokemon": 332, + "Traps": 62, + "Items": 85, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 719, + "Pokemon": 333, + "Traps": 62, + "Items": 85, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 720, + "Pokemon": 334, + "Traps": 62, + "Items": 85, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 721, + "Pokemon": 335, + "Traps": 62, + "Items": 85, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 722, + "Pokemon": 336, + "Traps": 62, + "Items": 85, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 723, + "Pokemon": 337, + "Traps": 61, + "Items": 85, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 724, + "Pokemon": 337, + "Traps": 61, + "Items": 85, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 725, + "Pokemon": 337, + "Traps": 61, + "Items": 86, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 726, + "Pokemon": 337, + "Traps": 61, + "Items": 86, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 727, + "Pokemon": 338, + "Traps": 61, + "Items": 86, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + } + ] +} diff --git a/data/dungeon/NorthwindField/floor_id.json b/data/dungeon/NorthwindField/floor_id.json index e5a2481..b4a4cd8 100644 --- a/data/dungeon/NorthwindField/floor_id.json +++ b/data/dungeon/NorthwindField/floor_id.json @@ -1,275 +1,275 @@ -{ - "name": "NorthwindFieldFloorID", - "tables": [ - { - "MainData": 870, - "Pokemon": 395, - "Traps": 72, - "Items": 100, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 871, - "Pokemon": 395, - "Traps": 72, - "Items": 100, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 872, - "Pokemon": 396, - "Traps": 72, - "Items": 100, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 873, - "Pokemon": 396, - "Traps": 72, - "Items": 100, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 874, - "Pokemon": 397, - "Traps": 72, - "Items": 100, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 875, - "Pokemon": 397, - "Traps": 72, - "Items": 100, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 876, - "Pokemon": 398, - "Traps": 72, - "Items": 100, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 877, - "Pokemon": 399, - "Traps": 72, - "Items": 100, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 878, - "Pokemon": 399, - "Traps": 72, - "Items": 100, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 879, - "Pokemon": 400, - "Traps": 73, - "Items": 100, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 880, - "Pokemon": 401, - "Traps": 74, - "Items": 100, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 881, - "Pokemon": 401, - "Traps": 74, - "Items": 100, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 882, - "Pokemon": 401, - "Traps": 74, - "Items": 100, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 883, - "Pokemon": 401, - "Traps": 74, - "Items": 100, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 884, - "Pokemon": 401, - "Traps": 74, - "Items": 100, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 885, - "Pokemon": 401, - "Traps": 74, - "Items": 100, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 886, - "Pokemon": 402, - "Traps": 74, - "Items": 100, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 887, - "Pokemon": 402, - "Traps": 74, - "Items": 100, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 888, - "Pokemon": 403, - "Traps": 74, - "Items": 100, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 889, - "Pokemon": 404, - "Traps": 74, - "Items": 100, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 890, - "Pokemon": 403, - "Traps": 74, - "Items": 100, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 891, - "Pokemon": 403, - "Traps": 74, - "Items": 100, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 892, - "Pokemon": 405, - "Traps": 74, - "Items": 100, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 893, - "Pokemon": 405, - "Traps": 74, - "Items": 100, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 894, - "Pokemon": 406, - "Traps": 74, - "Items": 100, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 895, - "Pokemon": 407, - "Traps": 74, - "Items": 100, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 896, - "Pokemon": 408, - "Traps": 74, - "Items": 100, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 897, - "Pokemon": 409, - "Traps": 74, - "Items": 100, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 898, - "Pokemon": 410, - "Traps": 74, - "Items": 101, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 899, - "Pokemon": 411, - "Traps": 74, - "Items": 101, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - } - ] -} +{ + "name": "NorthwindFieldFloorID", + "tables": [ + { + "MainData": 870, + "Pokemon": 395, + "Traps": 72, + "Items": 100, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 871, + "Pokemon": 395, + "Traps": 72, + "Items": 100, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 872, + "Pokemon": 396, + "Traps": 72, + "Items": 100, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 873, + "Pokemon": 396, + "Traps": 72, + "Items": 100, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 874, + "Pokemon": 397, + "Traps": 72, + "Items": 100, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 875, + "Pokemon": 397, + "Traps": 72, + "Items": 100, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 876, + "Pokemon": 398, + "Traps": 72, + "Items": 100, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 877, + "Pokemon": 399, + "Traps": 72, + "Items": 100, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 878, + "Pokemon": 399, + "Traps": 72, + "Items": 100, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 879, + "Pokemon": 400, + "Traps": 73, + "Items": 100, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 880, + "Pokemon": 401, + "Traps": 74, + "Items": 100, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 881, + "Pokemon": 401, + "Traps": 74, + "Items": 100, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 882, + "Pokemon": 401, + "Traps": 74, + "Items": 100, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 883, + "Pokemon": 401, + "Traps": 74, + "Items": 100, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 884, + "Pokemon": 401, + "Traps": 74, + "Items": 100, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 885, + "Pokemon": 401, + "Traps": 74, + "Items": 100, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 886, + "Pokemon": 402, + "Traps": 74, + "Items": 100, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 887, + "Pokemon": 402, + "Traps": 74, + "Items": 100, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 888, + "Pokemon": 403, + "Traps": 74, + "Items": 100, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 889, + "Pokemon": 404, + "Traps": 74, + "Items": 100, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 890, + "Pokemon": 403, + "Traps": 74, + "Items": 100, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 891, + "Pokemon": 403, + "Traps": 74, + "Items": 100, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 892, + "Pokemon": 405, + "Traps": 74, + "Items": 100, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 893, + "Pokemon": 405, + "Traps": 74, + "Items": 100, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 894, + "Pokemon": 406, + "Traps": 74, + "Items": 100, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 895, + "Pokemon": 407, + "Traps": 74, + "Items": 100, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 896, + "Pokemon": 408, + "Traps": 74, + "Items": 100, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 897, + "Pokemon": 409, + "Traps": 74, + "Items": 100, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 898, + "Pokemon": 410, + "Traps": 74, + "Items": 101, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 899, + "Pokemon": 411, + "Traps": 74, + "Items": 101, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + } + ] +} diff --git a/data/dungeon/OddityCave/floor_id.json b/data/dungeon/OddityCave/floor_id.json index 3c6b0ea..3ab0136 100644 --- a/data/dungeon/OddityCave/floor_id.json +++ b/data/dungeon/OddityCave/floor_id.json @@ -1,140 +1,140 @@ -{ - "name": "OddityCaveFloorID", - "tables": [ - { - "MainData": 1036, - "Pokemon": 481, - "Traps": 62, - "Items": 119, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 109 - }, - { - "MainData": 1037, - "Pokemon": 481, - "Traps": 62, - "Items": 119, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 109 - }, - { - "MainData": 1038, - "Pokemon": 481, - "Traps": 62, - "Items": 119, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 109 - }, - { - "MainData": 1039, - "Pokemon": 482, - "Traps": 62, - "Items": 120, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 109 - }, - { - "MainData": 1040, - "Pokemon": 483, - "Traps": 62, - "Items": 120, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 109 - }, - { - "MainData": 1041, - "Pokemon": 484, - "Traps": 62, - "Items": 120, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 1042, - "Pokemon": 485, - "Traps": 62, - "Items": 120, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 1043, - "Pokemon": 486, - "Traps": 62, - "Items": 120, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 1044, - "Pokemon": 486, - "Traps": 62, - "Items": 120, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 1045, - "Pokemon": 487, - "Traps": 62, - "Items": 120, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 1046, - "Pokemon": 488, - "Traps": 62, - "Items": 120, - "KecleonShop": 28, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1047, - "Pokemon": 488, - "Traps": 62, - "Items": 120, - "KecleonShop": 28, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1048, - "Pokemon": 489, - "Traps": 62, - "Items": 120, - "KecleonShop": 28, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1049, - "Pokemon": 490, - "Traps": 62, - "Items": 120, - "KecleonShop": 28, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1050, - "Pokemon": 490, - "Traps": 62, - "Items": 120, - "KecleonShop": 28, - "MonsterRoomItems": 2, - "BuriedItems": 3 - } - ] -} +{ + "name": "OddityCaveFloorID", + "tables": [ + { + "MainData": 1036, + "Pokemon": 481, + "Traps": 62, + "Items": 119, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 109 + }, + { + "MainData": 1037, + "Pokemon": 481, + "Traps": 62, + "Items": 119, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 109 + }, + { + "MainData": 1038, + "Pokemon": 481, + "Traps": 62, + "Items": 119, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 109 + }, + { + "MainData": 1039, + "Pokemon": 482, + "Traps": 62, + "Items": 120, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 109 + }, + { + "MainData": 1040, + "Pokemon": 483, + "Traps": 62, + "Items": 120, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 109 + }, + { + "MainData": 1041, + "Pokemon": 484, + "Traps": 62, + "Items": 120, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 1042, + "Pokemon": 485, + "Traps": 62, + "Items": 120, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 1043, + "Pokemon": 486, + "Traps": 62, + "Items": 120, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 1044, + "Pokemon": 486, + "Traps": 62, + "Items": 120, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 1045, + "Pokemon": 487, + "Traps": 62, + "Items": 120, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 1046, + "Pokemon": 488, + "Traps": 62, + "Items": 120, + "KecleonShop": 28, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1047, + "Pokemon": 488, + "Traps": 62, + "Items": 120, + "KecleonShop": 28, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1048, + "Pokemon": 489, + "Traps": 62, + "Items": 120, + "KecleonShop": 28, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1049, + "Pokemon": 490, + "Traps": 62, + "Items": 120, + "KecleonShop": 28, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1050, + "Pokemon": 490, + "Traps": 62, + "Items": 120, + "KecleonShop": 28, + "MonsterRoomItems": 2, + "BuriedItems": 3 + } + ] +} diff --git a/data/dungeon/PitfallValley/floor_id.json b/data/dungeon/PitfallValley/floor_id.json index 0b06593..1a52a7e 100644 --- a/data/dungeon/PitfallValley/floor_id.json +++ b/data/dungeon/PitfallValley/floor_id.json @@ -1,230 +1,230 @@ -{ - "name": "PitfallValleyFloorID", - "tables": [ - { - "MainData": 678, - "Pokemon": 317, - "Traps": 59, - "Items": 84, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 679, - "Pokemon": 317, - "Traps": 59, - "Items": 84, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 680, - "Pokemon": 317, - "Traps": 59, - "Items": 84, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 681, - "Pokemon": 318, - "Traps": 59, - "Items": 85, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 682, - "Pokemon": 318, - "Traps": 59, - "Items": 85, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 683, - "Pokemon": 318, - "Traps": 59, - "Items": 85, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 684, - "Pokemon": 319, - "Traps": 59, - "Items": 85, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 685, - "Pokemon": 319, - "Traps": 59, - "Items": 85, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 686, - "Pokemon": 320, - "Traps": 59, - "Items": 85, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 687, - "Pokemon": 321, - "Traps": 59, - "Items": 85, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 688, - "Pokemon": 321, - "Traps": 59, - "Items": 85, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 689, - "Pokemon": 321, - "Traps": 59, - "Items": 85, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 690, - "Pokemon": 322, - "Traps": 59, - "Items": 85, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 691, - "Pokemon": 322, - "Traps": 59, - "Items": 85, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 692, - "Pokemon": 323, - "Traps": 59, - "Items": 85, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 693, - "Pokemon": 324, - "Traps": 59, - "Items": 85, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 694, - "Pokemon": 324, - "Traps": 59, - "Items": 85, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 695, - "Pokemon": 324, - "Traps": 59, - "Items": 85, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 696, - "Pokemon": 325, - "Traps": 59, - "Items": 85, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 697, - "Pokemon": 325, - "Traps": 59, - "Items": 85, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 698, - "Pokemon": 326, - "Traps": 60, - "Items": 85, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 699, - "Pokemon": 326, - "Traps": 60, - "Items": 85, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 700, - "Pokemon": 326, - "Traps": 60, - "Items": 86, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 701, - "Pokemon": 326, - "Traps": 60, - "Items": 86, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 702, - "Pokemon": 326, - "Traps": 61, - "Items": 86, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - } - ] -} +{ + "name": "PitfallValleyFloorID", + "tables": [ + { + "MainData": 678, + "Pokemon": 317, + "Traps": 59, + "Items": 84, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 679, + "Pokemon": 317, + "Traps": 59, + "Items": 84, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 680, + "Pokemon": 317, + "Traps": 59, + "Items": 84, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 681, + "Pokemon": 318, + "Traps": 59, + "Items": 85, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 682, + "Pokemon": 318, + "Traps": 59, + "Items": 85, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 683, + "Pokemon": 318, + "Traps": 59, + "Items": 85, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 684, + "Pokemon": 319, + "Traps": 59, + "Items": 85, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 685, + "Pokemon": 319, + "Traps": 59, + "Items": 85, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 686, + "Pokemon": 320, + "Traps": 59, + "Items": 85, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 687, + "Pokemon": 321, + "Traps": 59, + "Items": 85, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 688, + "Pokemon": 321, + "Traps": 59, + "Items": 85, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 689, + "Pokemon": 321, + "Traps": 59, + "Items": 85, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 690, + "Pokemon": 322, + "Traps": 59, + "Items": 85, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 691, + "Pokemon": 322, + "Traps": 59, + "Items": 85, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 692, + "Pokemon": 323, + "Traps": 59, + "Items": 85, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 693, + "Pokemon": 324, + "Traps": 59, + "Items": 85, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 694, + "Pokemon": 324, + "Traps": 59, + "Items": 85, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 695, + "Pokemon": 324, + "Traps": 59, + "Items": 85, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 696, + "Pokemon": 325, + "Traps": 59, + "Items": 85, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 697, + "Pokemon": 325, + "Traps": 59, + "Items": 85, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 698, + "Pokemon": 326, + "Traps": 60, + "Items": 85, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 699, + "Pokemon": 326, + "Traps": 60, + "Items": 85, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 700, + "Pokemon": 326, + "Traps": 60, + "Items": 86, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 701, + "Pokemon": 326, + "Traps": 60, + "Items": 86, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 702, + "Pokemon": 326, + "Traps": 61, + "Items": 86, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + } + ] +} diff --git a/data/dungeon/PurityForest/floor_id.json b/data/dungeon/PurityForest/floor_id.json index 17cfa6b..b60b18c 100644 --- a/data/dungeon/PurityForest/floor_id.json +++ b/data/dungeon/PurityForest/floor_id.json @@ -1,896 +1,896 @@ -{ - "name": "PurityForestFloorID", - "tables": [ - { - "MainData": 1664, - "Pokemon": 750, - "Traps": 137, - "Items": 168, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1665, - "Pokemon": 751, - "Traps": 137, - "Items": 168, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1666, - "Pokemon": 752, - "Traps": 30, - "Items": 168, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1667, - "Pokemon": 753, - "Traps": 30, - "Items": 171, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1668, - "Pokemon": 754, - "Traps": 30, - "Items": 171, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1669, - "Pokemon": 755, - "Traps": 30, - "Items": 171, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1670, - "Pokemon": 756, - "Traps": 30, - "Items": 171, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1671, - "Pokemon": 757, - "Traps": 30, - "Items": 171, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1672, - "Pokemon": 758, - "Traps": 30, - "Items": 171, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1673, - "Pokemon": 759, - "Traps": 95, - "Items": 171, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1674, - "Pokemon": 760, - "Traps": 96, - "Items": 171, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1675, - "Pokemon": 761, - "Traps": 96, - "Items": 171, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1676, - "Pokemon": 762, - "Traps": 96, - "Items": 171, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1677, - "Pokemon": 763, - "Traps": 96, - "Items": 171, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1678, - "Pokemon": 764, - "Traps": 96, - "Items": 171, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1679, - "Pokemon": 765, - "Traps": 96, - "Items": 171, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1680, - "Pokemon": 766, - "Traps": 96, - "Items": 171, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1681, - "Pokemon": 767, - "Traps": 96, - "Items": 171, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1682, - "Pokemon": 768, - "Traps": 96, - "Items": 171, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1683, - "Pokemon": 769, - "Traps": 138, - "Items": 172, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1684, - "Pokemon": 770, - "Traps": 139, - "Items": 171, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1685, - "Pokemon": 771, - "Traps": 139, - "Items": 171, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1686, - "Pokemon": 772, - "Traps": 139, - "Items": 171, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1687, - "Pokemon": 773, - "Traps": 139, - "Items": 171, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1688, - "Pokemon": 774, - "Traps": 139, - "Items": 171, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1689, - "Pokemon": 775, - "Traps": 139, - "Items": 171, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1690, - "Pokemon": 776, - "Traps": 139, - "Items": 171, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1691, - "Pokemon": 777, - "Traps": 139, - "Items": 171, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1692, - "Pokemon": 778, - "Traps": 139, - "Items": 171, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1693, - "Pokemon": 779, - "Traps": 99, - "Items": 171, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1694, - "Pokemon": 780, - "Traps": 100, - "Items": 171, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1695, - "Pokemon": 781, - "Traps": 100, - "Items": 171, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1696, - "Pokemon": 782, - "Traps": 100, - "Items": 171, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1697, - "Pokemon": 783, - "Traps": 100, - "Items": 171, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1698, - "Pokemon": 784, - "Traps": 100, - "Items": 171, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1699, - "Pokemon": 785, - "Traps": 100, - "Items": 171, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1700, - "Pokemon": 786, - "Traps": 100, - "Items": 171, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1701, - "Pokemon": 787, - "Traps": 100, - "Items": 171, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1702, - "Pokemon": 788, - "Traps": 100, - "Items": 171, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1703, - "Pokemon": 789, - "Traps": 101, - "Items": 171, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1704, - "Pokemon": 790, - "Traps": 101, - "Items": 171, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1705, - "Pokemon": 791, - "Traps": 101, - "Items": 171, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1706, - "Pokemon": 792, - "Traps": 101, - "Items": 171, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1707, - "Pokemon": 793, - "Traps": 101, - "Items": 171, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1708, - "Pokemon": 794, - "Traps": 101, - "Items": 171, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1709, - "Pokemon": 795, - "Traps": 101, - "Items": 171, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1710, - "Pokemon": 796, - "Traps": 101, - "Items": 171, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1711, - "Pokemon": 797, - "Traps": 101, - "Items": 171, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1712, - "Pokemon": 798, - "Traps": 101, - "Items": 171, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1713, - "Pokemon": 799, - "Traps": 140, - "Items": 173, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1714, - "Pokemon": 800, - "Traps": 141, - "Items": 173, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1715, - "Pokemon": 801, - "Traps": 141, - "Items": 173, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1716, - "Pokemon": 802, - "Traps": 141, - "Items": 173, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1717, - "Pokemon": 803, - "Traps": 141, - "Items": 173, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1718, - "Pokemon": 804, - "Traps": 141, - "Items": 173, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1719, - "Pokemon": 805, - "Traps": 141, - "Items": 173, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1720, - "Pokemon": 806, - "Traps": 141, - "Items": 173, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1721, - "Pokemon": 807, - "Traps": 141, - "Items": 173, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1722, - "Pokemon": 808, - "Traps": 141, - "Items": 173, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1723, - "Pokemon": 809, - "Traps": 142, - "Items": 174, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1724, - "Pokemon": 810, - "Traps": 142, - "Items": 174, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1725, - "Pokemon": 811, - "Traps": 142, - "Items": 174, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1726, - "Pokemon": 812, - "Traps": 142, - "Items": 174, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1727, - "Pokemon": 813, - "Traps": 142, - "Items": 174, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1728, - "Pokemon": 814, - "Traps": 142, - "Items": 174, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1729, - "Pokemon": 814, - "Traps": 142, - "Items": 174, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1730, - "Pokemon": 814, - "Traps": 142, - "Items": 174, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1731, - "Pokemon": 814, - "Traps": 142, - "Items": 174, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1732, - "Pokemon": 815, - "Traps": 142, - "Items": 174, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1733, - "Pokemon": 816, - "Traps": 143, - "Items": 174, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1734, - "Pokemon": 817, - "Traps": 144, - "Items": 174, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1735, - "Pokemon": 818, - "Traps": 144, - "Items": 174, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1736, - "Pokemon": 819, - "Traps": 145, - "Items": 174, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1737, - "Pokemon": 820, - "Traps": 146, - "Items": 174, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1738, - "Pokemon": 820, - "Traps": 144, - "Items": 174, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1739, - "Pokemon": 821, - "Traps": 144, - "Items": 174, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1740, - "Pokemon": 822, - "Traps": 144, - "Items": 174, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1741, - "Pokemon": 823, - "Traps": 144, - "Items": 174, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1742, - "Pokemon": 824, - "Traps": 147, - "Items": 174, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1743, - "Pokemon": 825, - "Traps": 111, - "Items": 174, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1744, - "Pokemon": 826, - "Traps": 111, - "Items": 174, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1745, - "Pokemon": 826, - "Traps": 111, - "Items": 174, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1746, - "Pokemon": 827, - "Traps": 111, - "Items": 174, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1747, - "Pokemon": 827, - "Traps": 111, - "Items": 174, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1748, - "Pokemon": 828, - "Traps": 111, - "Items": 174, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1749, - "Pokemon": 829, - "Traps": 111, - "Items": 174, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1750, - "Pokemon": 829, - "Traps": 111, - "Items": 174, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1751, - "Pokemon": 830, - "Traps": 111, - "Items": 174, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1752, - "Pokemon": 831, - "Traps": 111, - "Items": 174, - "KecleonShop": 169, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1753, - "Pokemon": 832, - "Traps": 111, - "Items": 174, - "KecleonShop": 175, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1754, - "Pokemon": 832, - "Traps": 111, - "Items": 174, - "KecleonShop": 175, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1755, - "Pokemon": 832, - "Traps": 111, - "Items": 174, - "KecleonShop": 175, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1756, - "Pokemon": 833, - "Traps": 111, - "Items": 174, - "KecleonShop": 175, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1757, - "Pokemon": 834, - "Traps": 111, - "Items": 174, - "KecleonShop": 175, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1758, - "Pokemon": 835, - "Traps": 111, - "Items": 174, - "KecleonShop": 175, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1759, - "Pokemon": 835, - "Traps": 111, - "Items": 174, - "KecleonShop": 175, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1760, - "Pokemon": 836, - "Traps": 111, - "Items": 174, - "KecleonShop": 175, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1761, - "Pokemon": 837, - "Traps": 111, - "Items": 174, - "KecleonShop": 175, - "MonsterRoomItems": 170, - "BuriedItems": 57 - }, - { - "MainData": 1762, - "Pokemon": 838, - "Traps": 111, - "Items": 174, - "KecleonShop": 175, - "MonsterRoomItems": 170, - "BuriedItems": 57 - } - ] -} +{ + "name": "PurityForestFloorID", + "tables": [ + { + "MainData": 1664, + "Pokemon": 750, + "Traps": 137, + "Items": 168, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1665, + "Pokemon": 751, + "Traps": 137, + "Items": 168, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1666, + "Pokemon": 752, + "Traps": 30, + "Items": 168, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1667, + "Pokemon": 753, + "Traps": 30, + "Items": 171, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1668, + "Pokemon": 754, + "Traps": 30, + "Items": 171, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1669, + "Pokemon": 755, + "Traps": 30, + "Items": 171, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1670, + "Pokemon": 756, + "Traps": 30, + "Items": 171, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1671, + "Pokemon": 757, + "Traps": 30, + "Items": 171, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1672, + "Pokemon": 758, + "Traps": 30, + "Items": 171, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1673, + "Pokemon": 759, + "Traps": 95, + "Items": 171, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1674, + "Pokemon": 760, + "Traps": 96, + "Items": 171, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1675, + "Pokemon": 761, + "Traps": 96, + "Items": 171, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1676, + "Pokemon": 762, + "Traps": 96, + "Items": 171, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1677, + "Pokemon": 763, + "Traps": 96, + "Items": 171, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1678, + "Pokemon": 764, + "Traps": 96, + "Items": 171, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1679, + "Pokemon": 765, + "Traps": 96, + "Items": 171, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1680, + "Pokemon": 766, + "Traps": 96, + "Items": 171, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1681, + "Pokemon": 767, + "Traps": 96, + "Items": 171, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1682, + "Pokemon": 768, + "Traps": 96, + "Items": 171, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1683, + "Pokemon": 769, + "Traps": 138, + "Items": 172, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1684, + "Pokemon": 770, + "Traps": 139, + "Items": 171, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1685, + "Pokemon": 771, + "Traps": 139, + "Items": 171, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1686, + "Pokemon": 772, + "Traps": 139, + "Items": 171, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1687, + "Pokemon": 773, + "Traps": 139, + "Items": 171, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1688, + "Pokemon": 774, + "Traps": 139, + "Items": 171, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1689, + "Pokemon": 775, + "Traps": 139, + "Items": 171, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1690, + "Pokemon": 776, + "Traps": 139, + "Items": 171, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1691, + "Pokemon": 777, + "Traps": 139, + "Items": 171, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1692, + "Pokemon": 778, + "Traps": 139, + "Items": 171, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1693, + "Pokemon": 779, + "Traps": 99, + "Items": 171, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1694, + "Pokemon": 780, + "Traps": 100, + "Items": 171, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1695, + "Pokemon": 781, + "Traps": 100, + "Items": 171, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1696, + "Pokemon": 782, + "Traps": 100, + "Items": 171, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1697, + "Pokemon": 783, + "Traps": 100, + "Items": 171, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1698, + "Pokemon": 784, + "Traps": 100, + "Items": 171, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1699, + "Pokemon": 785, + "Traps": 100, + "Items": 171, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1700, + "Pokemon": 786, + "Traps": 100, + "Items": 171, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1701, + "Pokemon": 787, + "Traps": 100, + "Items": 171, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1702, + "Pokemon": 788, + "Traps": 100, + "Items": 171, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1703, + "Pokemon": 789, + "Traps": 101, + "Items": 171, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1704, + "Pokemon": 790, + "Traps": 101, + "Items": 171, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1705, + "Pokemon": 791, + "Traps": 101, + "Items": 171, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1706, + "Pokemon": 792, + "Traps": 101, + "Items": 171, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1707, + "Pokemon": 793, + "Traps": 101, + "Items": 171, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1708, + "Pokemon": 794, + "Traps": 101, + "Items": 171, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1709, + "Pokemon": 795, + "Traps": 101, + "Items": 171, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1710, + "Pokemon": 796, + "Traps": 101, + "Items": 171, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1711, + "Pokemon": 797, + "Traps": 101, + "Items": 171, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1712, + "Pokemon": 798, + "Traps": 101, + "Items": 171, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1713, + "Pokemon": 799, + "Traps": 140, + "Items": 173, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1714, + "Pokemon": 800, + "Traps": 141, + "Items": 173, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1715, + "Pokemon": 801, + "Traps": 141, + "Items": 173, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1716, + "Pokemon": 802, + "Traps": 141, + "Items": 173, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1717, + "Pokemon": 803, + "Traps": 141, + "Items": 173, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1718, + "Pokemon": 804, + "Traps": 141, + "Items": 173, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1719, + "Pokemon": 805, + "Traps": 141, + "Items": 173, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1720, + "Pokemon": 806, + "Traps": 141, + "Items": 173, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1721, + "Pokemon": 807, + "Traps": 141, + "Items": 173, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1722, + "Pokemon": 808, + "Traps": 141, + "Items": 173, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1723, + "Pokemon": 809, + "Traps": 142, + "Items": 174, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1724, + "Pokemon": 810, + "Traps": 142, + "Items": 174, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1725, + "Pokemon": 811, + "Traps": 142, + "Items": 174, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1726, + "Pokemon": 812, + "Traps": 142, + "Items": 174, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1727, + "Pokemon": 813, + "Traps": 142, + "Items": 174, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1728, + "Pokemon": 814, + "Traps": 142, + "Items": 174, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1729, + "Pokemon": 814, + "Traps": 142, + "Items": 174, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1730, + "Pokemon": 814, + "Traps": 142, + "Items": 174, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1731, + "Pokemon": 814, + "Traps": 142, + "Items": 174, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1732, + "Pokemon": 815, + "Traps": 142, + "Items": 174, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1733, + "Pokemon": 816, + "Traps": 143, + "Items": 174, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1734, + "Pokemon": 817, + "Traps": 144, + "Items": 174, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1735, + "Pokemon": 818, + "Traps": 144, + "Items": 174, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1736, + "Pokemon": 819, + "Traps": 145, + "Items": 174, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1737, + "Pokemon": 820, + "Traps": 146, + "Items": 174, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1738, + "Pokemon": 820, + "Traps": 144, + "Items": 174, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1739, + "Pokemon": 821, + "Traps": 144, + "Items": 174, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1740, + "Pokemon": 822, + "Traps": 144, + "Items": 174, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1741, + "Pokemon": 823, + "Traps": 144, + "Items": 174, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1742, + "Pokemon": 824, + "Traps": 147, + "Items": 174, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1743, + "Pokemon": 825, + "Traps": 111, + "Items": 174, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1744, + "Pokemon": 826, + "Traps": 111, + "Items": 174, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1745, + "Pokemon": 826, + "Traps": 111, + "Items": 174, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1746, + "Pokemon": 827, + "Traps": 111, + "Items": 174, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1747, + "Pokemon": 827, + "Traps": 111, + "Items": 174, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1748, + "Pokemon": 828, + "Traps": 111, + "Items": 174, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1749, + "Pokemon": 829, + "Traps": 111, + "Items": 174, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1750, + "Pokemon": 829, + "Traps": 111, + "Items": 174, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1751, + "Pokemon": 830, + "Traps": 111, + "Items": 174, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1752, + "Pokemon": 831, + "Traps": 111, + "Items": 174, + "KecleonShop": 169, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1753, + "Pokemon": 832, + "Traps": 111, + "Items": 174, + "KecleonShop": 175, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1754, + "Pokemon": 832, + "Traps": 111, + "Items": 174, + "KecleonShop": 175, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1755, + "Pokemon": 832, + "Traps": 111, + "Items": 174, + "KecleonShop": 175, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1756, + "Pokemon": 833, + "Traps": 111, + "Items": 174, + "KecleonShop": 175, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1757, + "Pokemon": 834, + "Traps": 111, + "Items": 174, + "KecleonShop": 175, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1758, + "Pokemon": 835, + "Traps": 111, + "Items": 174, + "KecleonShop": 175, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1759, + "Pokemon": 835, + "Traps": 111, + "Items": 174, + "KecleonShop": 175, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1760, + "Pokemon": 836, + "Traps": 111, + "Items": 174, + "KecleonShop": 175, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1761, + "Pokemon": 837, + "Traps": 111, + "Items": 174, + "KecleonShop": 175, + "MonsterRoomItems": 170, + "BuriedItems": 57 + }, + { + "MainData": 1762, + "Pokemon": 838, + "Traps": 111, + "Items": 174, + "KecleonShop": 175, + "MonsterRoomItems": 170, + "BuriedItems": 57 + } + ] +} diff --git a/data/dungeon/RemainsIsland/floor_id.json b/data/dungeon/RemainsIsland/floor_id.json index 62383f7..77b9b20 100644 --- a/data/dungeon/RemainsIsland/floor_id.json +++ b/data/dungeon/RemainsIsland/floor_id.json @@ -1,185 +1,185 @@ -{ - "name": "RemainsIslandFloorID", - "tables": [ - { - "MainData": 1051, - "Pokemon": 491, - "Traps": 62, - "Items": 119, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 109 - }, - { - "MainData": 1052, - "Pokemon": 491, - "Traps": 62, - "Items": 119, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 109 - }, - { - "MainData": 1053, - "Pokemon": 491, - "Traps": 62, - "Items": 119, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 109 - }, - { - "MainData": 1054, - "Pokemon": 492, - "Traps": 62, - "Items": 120, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 109 - }, - { - "MainData": 1055, - "Pokemon": 493, - "Traps": 62, - "Items": 120, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 109 - }, - { - "MainData": 1056, - "Pokemon": 493, - "Traps": 62, - "Items": 120, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 109 - }, - { - "MainData": 1057, - "Pokemon": 494, - "Traps": 62, - "Items": 120, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 109 - }, - { - "MainData": 1058, - "Pokemon": 494, - "Traps": 62, - "Items": 120, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 109 - }, - { - "MainData": 1059, - "Pokemon": 495, - "Traps": 62, - "Items": 120, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 109 - }, - { - "MainData": 1060, - "Pokemon": 496, - "Traps": 62, - "Items": 120, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 109 - }, - { - "MainData": 1061, - "Pokemon": 496, - "Traps": 62, - "Items": 120, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 109 - }, - { - "MainData": 1062, - "Pokemon": 496, - "Traps": 62, - "Items": 120, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 109 - }, - { - "MainData": 1063, - "Pokemon": 497, - "Traps": 62, - "Items": 120, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 109 - }, - { - "MainData": 1064, - "Pokemon": 498, - "Traps": 62, - "Items": 120, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 109 - }, - { - "MainData": 1065, - "Pokemon": 499, - "Traps": 62, - "Items": 120, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 109 - }, - { - "MainData": 1066, - "Pokemon": 500, - "Traps": 62, - "Items": 120, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 109 - }, - { - "MainData": 1067, - "Pokemon": 500, - "Traps": 62, - "Items": 120, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 109 - }, - { - "MainData": 1068, - "Pokemon": 500, - "Traps": 62, - "Items": 120, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 109 - }, - { - "MainData": 1069, - "Pokemon": 500, - "Traps": 62, - "Items": 120, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 109 - }, - { - "MainData": 1070, - "Pokemon": 501, - "Traps": 62, - "Items": 120, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 109 - } - ] -} +{ + "name": "RemainsIslandFloorID", + "tables": [ + { + "MainData": 1051, + "Pokemon": 491, + "Traps": 62, + "Items": 119, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 109 + }, + { + "MainData": 1052, + "Pokemon": 491, + "Traps": 62, + "Items": 119, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 109 + }, + { + "MainData": 1053, + "Pokemon": 491, + "Traps": 62, + "Items": 119, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 109 + }, + { + "MainData": 1054, + "Pokemon": 492, + "Traps": 62, + "Items": 120, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 109 + }, + { + "MainData": 1055, + "Pokemon": 493, + "Traps": 62, + "Items": 120, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 109 + }, + { + "MainData": 1056, + "Pokemon": 493, + "Traps": 62, + "Items": 120, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 109 + }, + { + "MainData": 1057, + "Pokemon": 494, + "Traps": 62, + "Items": 120, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 109 + }, + { + "MainData": 1058, + "Pokemon": 494, + "Traps": 62, + "Items": 120, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 109 + }, + { + "MainData": 1059, + "Pokemon": 495, + "Traps": 62, + "Items": 120, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 109 + }, + { + "MainData": 1060, + "Pokemon": 496, + "Traps": 62, + "Items": 120, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 109 + }, + { + "MainData": 1061, + "Pokemon": 496, + "Traps": 62, + "Items": 120, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 109 + }, + { + "MainData": 1062, + "Pokemon": 496, + "Traps": 62, + "Items": 120, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 109 + }, + { + "MainData": 1063, + "Pokemon": 497, + "Traps": 62, + "Items": 120, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 109 + }, + { + "MainData": 1064, + "Pokemon": 498, + "Traps": 62, + "Items": 120, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 109 + }, + { + "MainData": 1065, + "Pokemon": 499, + "Traps": 62, + "Items": 120, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 109 + }, + { + "MainData": 1066, + "Pokemon": 500, + "Traps": 62, + "Items": 120, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 109 + }, + { + "MainData": 1067, + "Pokemon": 500, + "Traps": 62, + "Items": 120, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 109 + }, + { + "MainData": 1068, + "Pokemon": 500, + "Traps": 62, + "Items": 120, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 109 + }, + { + "MainData": 1069, + "Pokemon": 500, + "Traps": 62, + "Items": 120, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 109 + }, + { + "MainData": 1070, + "Pokemon": 501, + "Traps": 62, + "Items": 120, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 109 + } + ] +} diff --git a/data/dungeon/RockPath/floor_id.json b/data/dungeon/RockPath/floor_id.json index 6c8aed9..5a6666e 100644 --- a/data/dungeon/RockPath/floor_id.json +++ b/data/dungeon/RockPath/floor_id.json @@ -1,41 +1,41 @@ -{ - "name": "RockPathFloorID", - "tables": [ - { - "MainData": 1121, - "Pokemon": 521, - "Traps": 10, - "Items": 123, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1122, - "Pokemon": 521, - "Traps": 10, - "Items": 123, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1123, - "Pokemon": 521, - "Traps": 10, - "Items": 123, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1124, - "Pokemon": 521, - "Traps": 10, - "Items": 123, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - } - ] -} +{ + "name": "RockPathFloorID", + "tables": [ + { + "MainData": 1121, + "Pokemon": 521, + "Traps": 10, + "Items": 123, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1122, + "Pokemon": 521, + "Traps": 10, + "Items": 123, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1123, + "Pokemon": 521, + "Traps": 10, + "Items": 123, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1124, + "Pokemon": 521, + "Traps": 10, + "Items": 123, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + } + ] +} diff --git a/data/dungeon/SilentChasm/floor_id.json b/data/dungeon/SilentChasm/floor_id.json index 4f90018..4ae1414 100644 --- a/data/dungeon/SilentChasm/floor_id.json +++ b/data/dungeon/SilentChasm/floor_id.json @@ -1,86 +1,86 @@ -{ - "name": "SilentChasmFloorID", - "tables": [ - { - "MainData": 30, - "Pokemon": 22, - "Traps": 1, - "Items": 13, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 31, - "Pokemon": 22, - "Traps": 1, - "Items": 13, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 32, - "Pokemon": 22, - "Traps": 1, - "Items": 13, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 33, - "Pokemon": 23, - "Traps": 1, - "Items": 14, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 34, - "Pokemon": 24, - "Traps": 1, - "Items": 14, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 35, - "Pokemon": 25, - "Traps": 1, - "Items": 14, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 36, - "Pokemon": 26, - "Traps": 1, - "Items": 14, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 37, - "Pokemon": 27, - "Traps": 1, - "Items": 14, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 38, - "Pokemon": 28, - "Traps": 1, - "Items": 14, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - } - ] -} +{ + "name": "SilentChasmFloorID", + "tables": [ + { + "MainData": 30, + "Pokemon": 22, + "Traps": 1, + "Items": 13, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 31, + "Pokemon": 22, + "Traps": 1, + "Items": 13, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 32, + "Pokemon": 22, + "Traps": 1, + "Items": 13, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 33, + "Pokemon": 23, + "Traps": 1, + "Items": 14, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 34, + "Pokemon": 24, + "Traps": 1, + "Items": 14, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 35, + "Pokemon": 25, + "Traps": 1, + "Items": 14, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 36, + "Pokemon": 26, + "Traps": 1, + "Items": 14, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 37, + "Pokemon": 27, + "Traps": 1, + "Items": 14, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 38, + "Pokemon": 28, + "Traps": 1, + "Items": 14, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + } + ] +} diff --git a/data/dungeon/SilentChasm/pokemon_found.json b/data/dungeon/SilentChasm/pokemon_found.json index 5edadea..6cbcca8 100644 --- a/data/dungeon/SilentChasm/pokemon_found.json +++ b/data/dungeon/SilentChasm/pokemon_found.json @@ -1,316 +1,316 @@ -{ - "tables": [{ - "name": "SilentChasm_1F_3F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_WEEDLE", - "level": 8, - "probability": 1667 - }, - { - "species": "SPECIES_GLOOM", - "level": 10, - "probability": 1000 - }, - { - "species": "SPECIES_FARFETCHD", - "level": 10, - "probability": 2666 - }, - { - "species": "SPECIES_YANMA", - "level": 10, - "probability": 2000 - }, - { - "species": "SPECIES_TEDDIURSA", - "level": 10, - "probability": 2667 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "SilentChasm_4F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_WEEDLE", - "level": 8, - "probability": 2778 - }, - { - "species": "SPECIES_GLOOM", - "level": 10, - "probability": 1666 - }, - { - "species": "SPECIES_YANMA", - "level": 10, - "probability": 3334 - }, - { - "species": "SPECIES_DUSTOX", - "level": 10, - "probability": 2222 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "SilentChasm_5F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_WEEDLE", - "level": 8, - "probability": 1515 - }, - { - "species": "SPECIES_GLOOM", - "level": 10, - "probability": 909 - }, - { - "species": "SPECIES_POLIWAG", - "level": 10, - "probability": 909 - }, - { - "species": "SPECIES_YANMA", - "level": 10, - "probability": 1819 - }, - { - "species": "SPECIES_HOUNDOUR", - "level": 11, - "probability": 2424 - }, - { - "species": "SPECIES_DUSTOX", - "level": 10, - "probability": 2424 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "SilentChasm_6F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_WEEDLE", - "level": 8, - "probability": 1064 - }, - { - "species": "SPECIES_GLOOM", - "level": 10, - "probability": 638 - }, - { - "species": "SPECIES_POLIWAG", - "level": 10, - "probability": 638 - }, - { - "species": "SPECIES_SPINARAK", - "level": 11, - "probability": 1277 - }, - { - "species": "SPECIES_YANMA", - "level": 10, - "probability": 1277 - }, - { - "species": "SPECIES_HOUNDOUR", - "level": 11, - "probability": 1702 - }, - { - "species": "SPECIES_DUSTOX", - "level": 10, - "probability": 1702 - }, - { - "species": "SPECIES_TRAPINCH", - "level": 11, - "probability": 1702 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "SilentChasm_7F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_GLOOM", - "level": 10, - "probability": 652 - }, - { - "species": "SPECIES_PARAS", - "level": 11, - "probability": 870 - }, - { - "species": "SPECIES_POLIWAG", - "level": 10, - "probability": 652 - }, - { - "species": "SPECIES_SPINARAK", - "level": 11, - "probability": 1304 - }, - { - "species": "SPECIES_YANMA", - "level": 10, - "probability": 1305 - }, - { - "species": "SPECIES_HOUNDOUR", - "level": 11, - "probability": 1739 - }, - { - "species": "SPECIES_DUSTOX", - "level": 10, - "probability": 1739 - }, - { - "species": "SPECIES_TRAPINCH", - "level": 11, - "probability": 1739 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "SilentChasm_8F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_GLOOM", - "level": 10, - "probability": 1000 - }, - { - "species": "SPECIES_PARAS", - "level": 11, - "probability": 1333 - }, - { - "species": "SPECIES_POLIWAG", - "level": 10, - "probability": 1000 - }, - { - "species": "SPECIES_SPINARAK", - "level": 11, - "probability": 2000 - }, - { - "species": "SPECIES_YANMA", - "level": 10, - "probability": 2000 - }, - { - "species": "SPECIES_TRAPINCH", - "level": 11, - "probability": 2667 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "SilentChasm_9F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_BEEDRILL", - "level": 10, - "probability": 1724 - }, - { - "species": "SPECIES_GLOOM", - "level": 10, - "probability": 1035 - }, - { - "species": "SPECIES_PARAS", - "level": 11, - "probability": 1379 - }, - { - "species": "SPECIES_POLIWAG", - "level": 10, - "probability": 1034 - }, - { - "species": "SPECIES_SPINARAK", - "level": 11, - "probability": 2069 - }, - { - "species": "SPECIES_TRAPINCH", - "level": 11, - "probability": 2759 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }] -} +{ + "tables": [{ + "name": "SilentChasm_1F_3F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_WEEDLE", + "level": 8, + "probability": 1667 + }, + { + "species": "SPECIES_GLOOM", + "level": 10, + "probability": 1000 + }, + { + "species": "SPECIES_FARFETCHD", + "level": 10, + "probability": 2666 + }, + { + "species": "SPECIES_YANMA", + "level": 10, + "probability": 2000 + }, + { + "species": "SPECIES_TEDDIURSA", + "level": 10, + "probability": 2667 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "SilentChasm_4F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_WEEDLE", + "level": 8, + "probability": 2778 + }, + { + "species": "SPECIES_GLOOM", + "level": 10, + "probability": 1666 + }, + { + "species": "SPECIES_YANMA", + "level": 10, + "probability": 3334 + }, + { + "species": "SPECIES_DUSTOX", + "level": 10, + "probability": 2222 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "SilentChasm_5F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_WEEDLE", + "level": 8, + "probability": 1515 + }, + { + "species": "SPECIES_GLOOM", + "level": 10, + "probability": 909 + }, + { + "species": "SPECIES_POLIWAG", + "level": 10, + "probability": 909 + }, + { + "species": "SPECIES_YANMA", + "level": 10, + "probability": 1819 + }, + { + "species": "SPECIES_HOUNDOUR", + "level": 11, + "probability": 2424 + }, + { + "species": "SPECIES_DUSTOX", + "level": 10, + "probability": 2424 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "SilentChasm_6F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_WEEDLE", + "level": 8, + "probability": 1064 + }, + { + "species": "SPECIES_GLOOM", + "level": 10, + "probability": 638 + }, + { + "species": "SPECIES_POLIWAG", + "level": 10, + "probability": 638 + }, + { + "species": "SPECIES_SPINARAK", + "level": 11, + "probability": 1277 + }, + { + "species": "SPECIES_YANMA", + "level": 10, + "probability": 1277 + }, + { + "species": "SPECIES_HOUNDOUR", + "level": 11, + "probability": 1702 + }, + { + "species": "SPECIES_DUSTOX", + "level": 10, + "probability": 1702 + }, + { + "species": "SPECIES_TRAPINCH", + "level": 11, + "probability": 1702 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "SilentChasm_7F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_GLOOM", + "level": 10, + "probability": 652 + }, + { + "species": "SPECIES_PARAS", + "level": 11, + "probability": 870 + }, + { + "species": "SPECIES_POLIWAG", + "level": 10, + "probability": 652 + }, + { + "species": "SPECIES_SPINARAK", + "level": 11, + "probability": 1304 + }, + { + "species": "SPECIES_YANMA", + "level": 10, + "probability": 1305 + }, + { + "species": "SPECIES_HOUNDOUR", + "level": 11, + "probability": 1739 + }, + { + "species": "SPECIES_DUSTOX", + "level": 10, + "probability": 1739 + }, + { + "species": "SPECIES_TRAPINCH", + "level": 11, + "probability": 1739 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "SilentChasm_8F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_GLOOM", + "level": 10, + "probability": 1000 + }, + { + "species": "SPECIES_PARAS", + "level": 11, + "probability": 1333 + }, + { + "species": "SPECIES_POLIWAG", + "level": 10, + "probability": 1000 + }, + { + "species": "SPECIES_SPINARAK", + "level": 11, + "probability": 2000 + }, + { + "species": "SPECIES_YANMA", + "level": 10, + "probability": 2000 + }, + { + "species": "SPECIES_TRAPINCH", + "level": 11, + "probability": 2667 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "SilentChasm_9F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_BEEDRILL", + "level": 10, + "probability": 1724 + }, + { + "species": "SPECIES_GLOOM", + "level": 10, + "probability": 1035 + }, + { + "species": "SPECIES_PARAS", + "level": 11, + "probability": 1379 + }, + { + "species": "SPECIES_POLIWAG", + "level": 10, + "probability": 1034 + }, + { + "species": "SPECIES_SPINARAK", + "level": 11, + "probability": 2069 + }, + { + "species": "SPECIES_TRAPINCH", + "level": 11, + "probability": 2759 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }] +} diff --git a/data/dungeon/SilverTrench/floor_id.json b/data/dungeon/SilverTrench/floor_id.json index 18be825..becad21 100644 --- a/data/dungeon/SilverTrench/floor_id.json +++ b/data/dungeon/SilverTrench/floor_id.json @@ -1,896 +1,896 @@ -{ - "name": "SilverTrenchFloorID", - "tables": [ - { - "MainData": 227, - "Pokemon": 128, - "Traps": 6, - "Items": 50, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 228, - "Pokemon": 128, - "Traps": 6, - "Items": 50, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 229, - "Pokemon": 128, - "Traps": 6, - "Items": 50, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 230, - "Pokemon": 128, - "Traps": 6, - "Items": 50, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 231, - "Pokemon": 129, - "Traps": 6, - "Items": 50, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 232, - "Pokemon": 130, - "Traps": 6, - "Items": 50, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 233, - "Pokemon": 130, - "Traps": 6, - "Items": 50, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 234, - "Pokemon": 130, - "Traps": 6, - "Items": 50, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 235, - "Pokemon": 131, - "Traps": 6, - "Items": 50, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 236, - "Pokemon": 132, - "Traps": 6, - "Items": 51, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 237, - "Pokemon": 132, - "Traps": 6, - "Items": 51, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 238, - "Pokemon": 132, - "Traps": 6, - "Items": 51, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 239, - "Pokemon": 132, - "Traps": 6, - "Items": 51, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 240, - "Pokemon": 133, - "Traps": 6, - "Items": 51, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 241, - "Pokemon": 134, - "Traps": 6, - "Items": 51, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 242, - "Pokemon": 134, - "Traps": 6, - "Items": 51, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 243, - "Pokemon": 134, - "Traps": 6, - "Items": 51, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 244, - "Pokemon": 134, - "Traps": 6, - "Items": 51, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 245, - "Pokemon": 134, - "Traps": 6, - "Items": 51, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 246, - "Pokemon": 135, - "Traps": 6, - "Items": 51, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 247, - "Pokemon": 136, - "Traps": 6, - "Items": 52, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 248, - "Pokemon": 136, - "Traps": 6, - "Items": 52, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 249, - "Pokemon": 136, - "Traps": 6, - "Items": 52, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 250, - "Pokemon": 137, - "Traps": 6, - "Items": 52, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 251, - "Pokemon": 138, - "Traps": 6, - "Items": 52, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 252, - "Pokemon": 139, - "Traps": 6, - "Items": 52, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 253, - "Pokemon": 139, - "Traps": 6, - "Items": 52, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 254, - "Pokemon": 139, - "Traps": 6, - "Items": 52, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 255, - "Pokemon": 139, - "Traps": 6, - "Items": 52, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 256, - "Pokemon": 140, - "Traps": 6, - "Items": 52, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 257, - "Pokemon": 141, - "Traps": 6, - "Items": 53, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 258, - "Pokemon": 141, - "Traps": 6, - "Items": 53, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 259, - "Pokemon": 141, - "Traps": 6, - "Items": 53, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 260, - "Pokemon": 142, - "Traps": 6, - "Items": 53, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 261, - "Pokemon": 143, - "Traps": 6, - "Items": 53, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 262, - "Pokemon": 144, - "Traps": 6, - "Items": 53, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 263, - "Pokemon": 145, - "Traps": 6, - "Items": 53, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 264, - "Pokemon": 145, - "Traps": 6, - "Items": 53, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 265, - "Pokemon": 145, - "Traps": 6, - "Items": 53, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 266, - "Pokemon": 146, - "Traps": 6, - "Items": 53, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 267, - "Pokemon": 147, - "Traps": 6, - "Items": 54, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 268, - "Pokemon": 147, - "Traps": 6, - "Items": 54, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 269, - "Pokemon": 147, - "Traps": 6, - "Items": 54, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 270, - "Pokemon": 147, - "Traps": 6, - "Items": 54, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 271, - "Pokemon": 148, - "Traps": 6, - "Items": 54, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 272, - "Pokemon": 148, - "Traps": 6, - "Items": 54, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 273, - "Pokemon": 148, - "Traps": 6, - "Items": 54, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 274, - "Pokemon": 148, - "Traps": 6, - "Items": 54, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 275, - "Pokemon": 148, - "Traps": 6, - "Items": 54, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 276, - "Pokemon": 149, - "Traps": 6, - "Items": 54, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 277, - "Pokemon": 150, - "Traps": 6, - "Items": 54, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 278, - "Pokemon": 150, - "Traps": 6, - "Items": 54, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 279, - "Pokemon": 150, - "Traps": 6, - "Items": 54, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 280, - "Pokemon": 150, - "Traps": 6, - "Items": 54, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 281, - "Pokemon": 151, - "Traps": 6, - "Items": 54, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 282, - "Pokemon": 151, - "Traps": 6, - "Items": 54, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 283, - "Pokemon": 151, - "Traps": 6, - "Items": 54, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 284, - "Pokemon": 151, - "Traps": 6, - "Items": 54, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 285, - "Pokemon": 151, - "Traps": 6, - "Items": 54, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 286, - "Pokemon": 152, - "Traps": 6, - "Items": 54, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 287, - "Pokemon": 153, - "Traps": 6, - "Items": 54, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 288, - "Pokemon": 153, - "Traps": 6, - "Items": 54, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 289, - "Pokemon": 153, - "Traps": 6, - "Items": 54, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 290, - "Pokemon": 153, - "Traps": 6, - "Items": 54, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 291, - "Pokemon": 154, - "Traps": 6, - "Items": 54, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 292, - "Pokemon": 154, - "Traps": 6, - "Items": 54, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 293, - "Pokemon": 154, - "Traps": 6, - "Items": 54, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 294, - "Pokemon": 154, - "Traps": 6, - "Items": 54, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 295, - "Pokemon": 154, - "Traps": 6, - "Items": 54, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 296, - "Pokemon": 155, - "Traps": 6, - "Items": 54, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 297, - "Pokemon": 156, - "Traps": 6, - "Items": 55, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 298, - "Pokemon": 156, - "Traps": 6, - "Items": 55, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 299, - "Pokemon": 156, - "Traps": 6, - "Items": 55, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 300, - "Pokemon": 156, - "Traps": 6, - "Items": 55, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 301, - "Pokemon": 156, - "Traps": 6, - "Items": 55, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 302, - "Pokemon": 156, - "Traps": 6, - "Items": 55, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 303, - "Pokemon": 156, - "Traps": 6, - "Items": 55, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 304, - "Pokemon": 156, - "Traps": 6, - "Items": 55, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 305, - "Pokemon": 156, - "Traps": 6, - "Items": 55, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 306, - "Pokemon": 157, - "Traps": 6, - "Items": 55, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 307, - "Pokemon": 158, - "Traps": 6, - "Items": 55, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 308, - "Pokemon": 158, - "Traps": 6, - "Items": 55, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 309, - "Pokemon": 158, - "Traps": 6, - "Items": 55, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 310, - "Pokemon": 158, - "Traps": 6, - "Items": 55, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 311, - "Pokemon": 158, - "Traps": 6, - "Items": 55, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 312, - "Pokemon": 158, - "Traps": 6, - "Items": 55, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 313, - "Pokemon": 158, - "Traps": 6, - "Items": 55, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 314, - "Pokemon": 158, - "Traps": 6, - "Items": 55, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 315, - "Pokemon": 158, - "Traps": 6, - "Items": 55, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 316, - "Pokemon": 159, - "Traps": 6, - "Items": 55, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 317, - "Pokemon": 159, - "Traps": 6, - "Items": 55, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 318, - "Pokemon": 159, - "Traps": 6, - "Items": 55, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 319, - "Pokemon": 159, - "Traps": 6, - "Items": 55, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 320, - "Pokemon": 159, - "Traps": 6, - "Items": 55, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 321, - "Pokemon": 159, - "Traps": 6, - "Items": 55, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 322, - "Pokemon": 159, - "Traps": 6, - "Items": 55, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 323, - "Pokemon": 159, - "Traps": 6, - "Items": 55, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 324, - "Pokemon": 159, - "Traps": 6, - "Items": 55, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 325, - "Pokemon": 160, - "Traps": 6, - "Items": 55, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - } - ] -} +{ + "name": "SilverTrenchFloorID", + "tables": [ + { + "MainData": 227, + "Pokemon": 128, + "Traps": 6, + "Items": 50, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 228, + "Pokemon": 128, + "Traps": 6, + "Items": 50, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 229, + "Pokemon": 128, + "Traps": 6, + "Items": 50, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 230, + "Pokemon": 128, + "Traps": 6, + "Items": 50, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 231, + "Pokemon": 129, + "Traps": 6, + "Items": 50, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 232, + "Pokemon": 130, + "Traps": 6, + "Items": 50, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 233, + "Pokemon": 130, + "Traps": 6, + "Items": 50, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 234, + "Pokemon": 130, + "Traps": 6, + "Items": 50, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 235, + "Pokemon": 131, + "Traps": 6, + "Items": 50, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 236, + "Pokemon": 132, + "Traps": 6, + "Items": 51, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 237, + "Pokemon": 132, + "Traps": 6, + "Items": 51, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 238, + "Pokemon": 132, + "Traps": 6, + "Items": 51, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 239, + "Pokemon": 132, + "Traps": 6, + "Items": 51, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 240, + "Pokemon": 133, + "Traps": 6, + "Items": 51, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 241, + "Pokemon": 134, + "Traps": 6, + "Items": 51, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 242, + "Pokemon": 134, + "Traps": 6, + "Items": 51, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 243, + "Pokemon": 134, + "Traps": 6, + "Items": 51, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 244, + "Pokemon": 134, + "Traps": 6, + "Items": 51, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 245, + "Pokemon": 134, + "Traps": 6, + "Items": 51, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 246, + "Pokemon": 135, + "Traps": 6, + "Items": 51, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 247, + "Pokemon": 136, + "Traps": 6, + "Items": 52, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 248, + "Pokemon": 136, + "Traps": 6, + "Items": 52, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 249, + "Pokemon": 136, + "Traps": 6, + "Items": 52, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 250, + "Pokemon": 137, + "Traps": 6, + "Items": 52, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 251, + "Pokemon": 138, + "Traps": 6, + "Items": 52, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 252, + "Pokemon": 139, + "Traps": 6, + "Items": 52, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 253, + "Pokemon": 139, + "Traps": 6, + "Items": 52, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 254, + "Pokemon": 139, + "Traps": 6, + "Items": 52, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 255, + "Pokemon": 139, + "Traps": 6, + "Items": 52, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 256, + "Pokemon": 140, + "Traps": 6, + "Items": 52, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 257, + "Pokemon": 141, + "Traps": 6, + "Items": 53, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 258, + "Pokemon": 141, + "Traps": 6, + "Items": 53, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 259, + "Pokemon": 141, + "Traps": 6, + "Items": 53, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 260, + "Pokemon": 142, + "Traps": 6, + "Items": 53, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 261, + "Pokemon": 143, + "Traps": 6, + "Items": 53, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 262, + "Pokemon": 144, + "Traps": 6, + "Items": 53, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 263, + "Pokemon": 145, + "Traps": 6, + "Items": 53, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 264, + "Pokemon": 145, + "Traps": 6, + "Items": 53, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 265, + "Pokemon": 145, + "Traps": 6, + "Items": 53, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 266, + "Pokemon": 146, + "Traps": 6, + "Items": 53, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 267, + "Pokemon": 147, + "Traps": 6, + "Items": 54, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 268, + "Pokemon": 147, + "Traps": 6, + "Items": 54, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 269, + "Pokemon": 147, + "Traps": 6, + "Items": 54, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 270, + "Pokemon": 147, + "Traps": 6, + "Items": 54, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 271, + "Pokemon": 148, + "Traps": 6, + "Items": 54, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 272, + "Pokemon": 148, + "Traps": 6, + "Items": 54, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 273, + "Pokemon": 148, + "Traps": 6, + "Items": 54, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 274, + "Pokemon": 148, + "Traps": 6, + "Items": 54, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 275, + "Pokemon": 148, + "Traps": 6, + "Items": 54, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 276, + "Pokemon": 149, + "Traps": 6, + "Items": 54, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 277, + "Pokemon": 150, + "Traps": 6, + "Items": 54, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 278, + "Pokemon": 150, + "Traps": 6, + "Items": 54, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 279, + "Pokemon": 150, + "Traps": 6, + "Items": 54, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 280, + "Pokemon": 150, + "Traps": 6, + "Items": 54, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 281, + "Pokemon": 151, + "Traps": 6, + "Items": 54, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 282, + "Pokemon": 151, + "Traps": 6, + "Items": 54, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 283, + "Pokemon": 151, + "Traps": 6, + "Items": 54, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 284, + "Pokemon": 151, + "Traps": 6, + "Items": 54, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 285, + "Pokemon": 151, + "Traps": 6, + "Items": 54, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 286, + "Pokemon": 152, + "Traps": 6, + "Items": 54, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 287, + "Pokemon": 153, + "Traps": 6, + "Items": 54, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 288, + "Pokemon": 153, + "Traps": 6, + "Items": 54, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 289, + "Pokemon": 153, + "Traps": 6, + "Items": 54, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 290, + "Pokemon": 153, + "Traps": 6, + "Items": 54, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 291, + "Pokemon": 154, + "Traps": 6, + "Items": 54, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 292, + "Pokemon": 154, + "Traps": 6, + "Items": 54, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 293, + "Pokemon": 154, + "Traps": 6, + "Items": 54, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 294, + "Pokemon": 154, + "Traps": 6, + "Items": 54, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 295, + "Pokemon": 154, + "Traps": 6, + "Items": 54, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 296, + "Pokemon": 155, + "Traps": 6, + "Items": 54, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 297, + "Pokemon": 156, + "Traps": 6, + "Items": 55, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 298, + "Pokemon": 156, + "Traps": 6, + "Items": 55, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 299, + "Pokemon": 156, + "Traps": 6, + "Items": 55, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 300, + "Pokemon": 156, + "Traps": 6, + "Items": 55, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 301, + "Pokemon": 156, + "Traps": 6, + "Items": 55, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 302, + "Pokemon": 156, + "Traps": 6, + "Items": 55, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 303, + "Pokemon": 156, + "Traps": 6, + "Items": 55, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 304, + "Pokemon": 156, + "Traps": 6, + "Items": 55, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 305, + "Pokemon": 156, + "Traps": 6, + "Items": 55, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 306, + "Pokemon": 157, + "Traps": 6, + "Items": 55, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 307, + "Pokemon": 158, + "Traps": 6, + "Items": 55, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 308, + "Pokemon": 158, + "Traps": 6, + "Items": 55, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 309, + "Pokemon": 158, + "Traps": 6, + "Items": 55, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 310, + "Pokemon": 158, + "Traps": 6, + "Items": 55, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 311, + "Pokemon": 158, + "Traps": 6, + "Items": 55, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 312, + "Pokemon": 158, + "Traps": 6, + "Items": 55, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 313, + "Pokemon": 158, + "Traps": 6, + "Items": 55, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 314, + "Pokemon": 158, + "Traps": 6, + "Items": 55, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 315, + "Pokemon": 158, + "Traps": 6, + "Items": 55, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 316, + "Pokemon": 159, + "Traps": 6, + "Items": 55, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 317, + "Pokemon": 159, + "Traps": 6, + "Items": 55, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 318, + "Pokemon": 159, + "Traps": 6, + "Items": 55, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 319, + "Pokemon": 159, + "Traps": 6, + "Items": 55, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 320, + "Pokemon": 159, + "Traps": 6, + "Items": 55, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 321, + "Pokemon": 159, + "Traps": 6, + "Items": 55, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 322, + "Pokemon": 159, + "Traps": 6, + "Items": 55, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 323, + "Pokemon": 159, + "Traps": 6, + "Items": 55, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 324, + "Pokemon": 159, + "Traps": 6, + "Items": 55, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 325, + "Pokemon": 160, + "Traps": 6, + "Items": 55, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + } + ] +} diff --git a/data/dungeon/SinisterWoods/floor_id.json b/data/dungeon/SinisterWoods/floor_id.json index ca7f97f..06e47dc 100644 --- a/data/dungeon/SinisterWoods/floor_id.json +++ b/data/dungeon/SinisterWoods/floor_id.json @@ -1,122 +1,122 @@ -{ - "name": "SinisterWoodsFloorID", - "tables": [ - { - "MainData": 17, - "Pokemon": 10, - "Traps": 2, - "Items": 11, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 18, - "Pokemon": 11, - "Traps": 2, - "Items": 11, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 19, - "Pokemon": 12, - "Traps": 2, - "Items": 11, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 20, - "Pokemon": 13, - "Traps": 2, - "Items": 12, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 21, - "Pokemon": 14, - "Traps": 2, - "Items": 12, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 22, - "Pokemon": 15, - "Traps": 2, - "Items": 12, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 23, - "Pokemon": 16, - "Traps": 2, - "Items": 12, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 24, - "Pokemon": 17, - "Traps": 2, - "Items": 12, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 25, - "Pokemon": 17, - "Traps": 2, - "Items": 12, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 26, - "Pokemon": 18, - "Traps": 2, - "Items": 12, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 27, - "Pokemon": 19, - "Traps": 2, - "Items": 12, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 28, - "Pokemon": 20, - "Traps": 2, - "Items": 12, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 29, - "Pokemon": 21, - "Traps": 2, - "Items": 12, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - } - ] -} +{ + "name": "SinisterWoodsFloorID", + "tables": [ + { + "MainData": 17, + "Pokemon": 10, + "Traps": 2, + "Items": 11, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 18, + "Pokemon": 11, + "Traps": 2, + "Items": 11, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 19, + "Pokemon": 12, + "Traps": 2, + "Items": 11, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 20, + "Pokemon": 13, + "Traps": 2, + "Items": 12, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 21, + "Pokemon": 14, + "Traps": 2, + "Items": 12, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 22, + "Pokemon": 15, + "Traps": 2, + "Items": 12, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 23, + "Pokemon": 16, + "Traps": 2, + "Items": 12, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 24, + "Pokemon": 17, + "Traps": 2, + "Items": 12, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 25, + "Pokemon": 17, + "Traps": 2, + "Items": 12, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 26, + "Pokemon": 18, + "Traps": 2, + "Items": 12, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 27, + "Pokemon": 19, + "Traps": 2, + "Items": 12, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 28, + "Pokemon": 20, + "Traps": 2, + "Items": 12, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 29, + "Pokemon": 21, + "Traps": 2, + "Items": 12, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + } + ] +} diff --git a/data/dungeon/SinisterWoods/pokemon_found.json b/data/dungeon/SinisterWoods/pokemon_found.json index f9f1d69..c15682d 100644 --- a/data/dungeon/SinisterWoods/pokemon_found.json +++ b/data/dungeon/SinisterWoods/pokemon_found.json @@ -1,446 +1,446 @@ -{ - "tables": [{ - "name": "SinisterWoods_1F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_ODDISH", - "level": 7, - "probability": 1579 - }, - { - "species": "SPECIES_SUDOWOODO", - "level": 7, - "probability": 4210 - }, - { - "species": "SPECIES_SWINUB", - "level": 8, - "probability": 4211 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "SinisterWoods_2F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_ODDISH", - "level": 7, - "probability": 1364 - }, - { - "species": "SPECIES_SUDOWOODO", - "level": 7, - "probability": 3636 - }, - { - "species": "SPECIES_SUNFLORA", - "level": 8, - "probability": 1364 - }, - { - "species": "SPECIES_SWINUB", - "level": 8, - "probability": 3636 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "SinisterWoods_3F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_ODDISH", - "level": 7, - "probability": 1000 - }, - { - "species": "SPECIES_SENTRET", - "level": 6, - "probability": 2667 - }, - { - "species": "SPECIES_SUDOWOODO", - "level": 7, - "probability": 2666 - }, - { - "species": "SPECIES_SUNFLORA", - "level": 8, - "probability": 1000 - }, - { - "species": "SPECIES_SWINUB", - "level": 8, - "probability": 2667 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "SinisterWoods_4F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_ODDISH", - "level": 7, - "probability": 937 - }, - { - "species": "SPECIES_SENTRET", - "level": 6, - "probability": 2500 - }, - { - "species": "SPECIES_SUDOWOODO", - "level": 7, - "probability": 2500 - }, - { - "species": "SPECIES_SUNFLORA", - "level": 8, - "probability": 938 - }, - { - "species": "SPECIES_SILCOON", - "level": 8, - "probability": 1562 - }, - { - "species": "SPECIES_CASCOON", - "level": 8, - "probability": 1563 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "SinisterWoods_5F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_SENTRET", - "level": 6, - "probability": 3810 - }, - { - "species": "SPECIES_SUNFLORA", - "level": 8, - "probability": 1428 - }, - { - "species": "SPECIES_SILCOON", - "level": 8, - "probability": 2381 - }, - { - "species": "SPECIES_CASCOON", - "level": 8, - "probability": 2381 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "SinisterWoods_6F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_SENTRET", - "level": 6, - "probability": 2759 - }, - { - "species": "SPECIES_SUNFLORA", - "level": 8, - "probability": 1034 - }, - { - "species": "SPECIES_SILCOON", - "level": 8, - "probability": 1724 - }, - { - "species": "SPECIES_CASCOON", - "level": 8, - "probability": 1724 - }, - { - "species": "SPECIES_SHROOMISH", - "level": 9, - "probability": 2759 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "SinisterWoods_7F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_LEDYBA", - "level": 7, - "probability": 2400 - }, - { - "species": "SPECIES_SUNFLORA", - "level": 8, - "probability": 1200 - }, - { - "species": "SPECIES_LINOONE", - "level": 8, - "probability": 3200 - }, - { - "species": "SPECIES_SHROOMISH", - "level": 9, - "probability": 3200 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "SinisterWoods_8F_9F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_SCYTHER", - "level": 10, - "probability": 2286 - }, - { - "species": "SPECIES_LEDYBA", - "level": 7, - "probability": 1714 - }, - { - "species": "SPECIES_WOOPER", - "level": 10, - "probability": 1429 - }, - { - "species": "SPECIES_LINOONE", - "level": 8, - "probability": 2285 - }, - { - "species": "SPECIES_SHROOMISH", - "level": 9, - "probability": 2286 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "SinisterWoods_10F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_EXEGGUTOR", - "level": 8, - "probability": 1569 - }, - { - "species": "SPECIES_SCYTHER", - "level": 10, - "probability": 1568 - }, - { - "species": "SPECIES_HOOTHOOT", - "level": 6, - "probability": 1569 - }, - { - "species": "SPECIES_LEDYBA", - "level": 7, - "probability": 1176 - }, - { - "species": "SPECIES_WOOPER", - "level": 10, - "probability": 981 - }, - { - "species": "SPECIES_SHROOMISH", - "level": 9, - "probability": 1568 - }, - { - "species": "SPECIES_SLAKOTH", - "level": 8, - "probability": 1569 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "SinisterWoods_11F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_EXEGGUTOR", - "level": 8, - "probability": 2000 - }, - { - "species": "SPECIES_SCYTHER", - "level": 10, - "probability": 2000 - }, - { - "species": "SPECIES_HOOTHOOT", - "level": 6, - "probability": 2000 - }, - { - "species": "SPECIES_SHROOMISH", - "level": 9, - "probability": 2000 - }, - { - "species": "SPECIES_SLAKOTH", - "level": 8, - "probability": 2000 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "SinisterWoods_12F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_EXEGGUTOR", - "level": 8, - "probability": 2500 - }, - { - "species": "SPECIES_HOOTHOOT", - "level": 6, - "probability": 2500 - }, - { - "species": "SPECIES_SHROOMISH", - "level": 9, - "probability": 2500 - }, - { - "species": "SPECIES_SLAKOTH", - "level": 8, - "probability": 2500 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "SinisterWoods_13F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_EKANS", - "level": 15, - "probability": 3333 - }, - { - "species": "SPECIES_GENGAR", - "level": 15, - "probability": 3334 - }, - { - "species": "SPECIES_MEDICHAM", - "level": 12, - "probability": 3333 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }] -} +{ + "tables": [{ + "name": "SinisterWoods_1F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_ODDISH", + "level": 7, + "probability": 1579 + }, + { + "species": "SPECIES_SUDOWOODO", + "level": 7, + "probability": 4210 + }, + { + "species": "SPECIES_SWINUB", + "level": 8, + "probability": 4211 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "SinisterWoods_2F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_ODDISH", + "level": 7, + "probability": 1364 + }, + { + "species": "SPECIES_SUDOWOODO", + "level": 7, + "probability": 3636 + }, + { + "species": "SPECIES_SUNFLORA", + "level": 8, + "probability": 1364 + }, + { + "species": "SPECIES_SWINUB", + "level": 8, + "probability": 3636 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "SinisterWoods_3F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_ODDISH", + "level": 7, + "probability": 1000 + }, + { + "species": "SPECIES_SENTRET", + "level": 6, + "probability": 2667 + }, + { + "species": "SPECIES_SUDOWOODO", + "level": 7, + "probability": 2666 + }, + { + "species": "SPECIES_SUNFLORA", + "level": 8, + "probability": 1000 + }, + { + "species": "SPECIES_SWINUB", + "level": 8, + "probability": 2667 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "SinisterWoods_4F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_ODDISH", + "level": 7, + "probability": 937 + }, + { + "species": "SPECIES_SENTRET", + "level": 6, + "probability": 2500 + }, + { + "species": "SPECIES_SUDOWOODO", + "level": 7, + "probability": 2500 + }, + { + "species": "SPECIES_SUNFLORA", + "level": 8, + "probability": 938 + }, + { + "species": "SPECIES_SILCOON", + "level": 8, + "probability": 1562 + }, + { + "species": "SPECIES_CASCOON", + "level": 8, + "probability": 1563 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "SinisterWoods_5F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_SENTRET", + "level": 6, + "probability": 3810 + }, + { + "species": "SPECIES_SUNFLORA", + "level": 8, + "probability": 1428 + }, + { + "species": "SPECIES_SILCOON", + "level": 8, + "probability": 2381 + }, + { + "species": "SPECIES_CASCOON", + "level": 8, + "probability": 2381 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "SinisterWoods_6F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_SENTRET", + "level": 6, + "probability": 2759 + }, + { + "species": "SPECIES_SUNFLORA", + "level": 8, + "probability": 1034 + }, + { + "species": "SPECIES_SILCOON", + "level": 8, + "probability": 1724 + }, + { + "species": "SPECIES_CASCOON", + "level": 8, + "probability": 1724 + }, + { + "species": "SPECIES_SHROOMISH", + "level": 9, + "probability": 2759 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "SinisterWoods_7F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_LEDYBA", + "level": 7, + "probability": 2400 + }, + { + "species": "SPECIES_SUNFLORA", + "level": 8, + "probability": 1200 + }, + { + "species": "SPECIES_LINOONE", + "level": 8, + "probability": 3200 + }, + { + "species": "SPECIES_SHROOMISH", + "level": 9, + "probability": 3200 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "SinisterWoods_8F_9F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_SCYTHER", + "level": 10, + "probability": 2286 + }, + { + "species": "SPECIES_LEDYBA", + "level": 7, + "probability": 1714 + }, + { + "species": "SPECIES_WOOPER", + "level": 10, + "probability": 1429 + }, + { + "species": "SPECIES_LINOONE", + "level": 8, + "probability": 2285 + }, + { + "species": "SPECIES_SHROOMISH", + "level": 9, + "probability": 2286 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "SinisterWoods_10F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_EXEGGUTOR", + "level": 8, + "probability": 1569 + }, + { + "species": "SPECIES_SCYTHER", + "level": 10, + "probability": 1568 + }, + { + "species": "SPECIES_HOOTHOOT", + "level": 6, + "probability": 1569 + }, + { + "species": "SPECIES_LEDYBA", + "level": 7, + "probability": 1176 + }, + { + "species": "SPECIES_WOOPER", + "level": 10, + "probability": 981 + }, + { + "species": "SPECIES_SHROOMISH", + "level": 9, + "probability": 1568 + }, + { + "species": "SPECIES_SLAKOTH", + "level": 8, + "probability": 1569 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "SinisterWoods_11F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_EXEGGUTOR", + "level": 8, + "probability": 2000 + }, + { + "species": "SPECIES_SCYTHER", + "level": 10, + "probability": 2000 + }, + { + "species": "SPECIES_HOOTHOOT", + "level": 6, + "probability": 2000 + }, + { + "species": "SPECIES_SHROOMISH", + "level": 9, + "probability": 2000 + }, + { + "species": "SPECIES_SLAKOTH", + "level": 8, + "probability": 2000 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "SinisterWoods_12F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_EXEGGUTOR", + "level": 8, + "probability": 2500 + }, + { + "species": "SPECIES_HOOTHOOT", + "level": 6, + "probability": 2500 + }, + { + "species": "SPECIES_SHROOMISH", + "level": 9, + "probability": 2500 + }, + { + "species": "SPECIES_SLAKOTH", + "level": 8, + "probability": 2500 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "SinisterWoods_13F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_EKANS", + "level": 15, + "probability": 3333 + }, + { + "species": "SPECIES_GENGAR", + "level": 15, + "probability": 3334 + }, + { + "species": "SPECIES_MEDICHAM", + "level": 12, + "probability": 3333 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }] +} diff --git a/data/dungeon/SkyTower/floor_id.json b/data/dungeon/SkyTower/floor_id.json index e1bbcd0..e019e4d 100644 --- a/data/dungeon/SkyTower/floor_id.json +++ b/data/dungeon/SkyTower/floor_id.json @@ -1,230 +1,230 @@ -{ - "name": "SkyTowerFloorID", - "tables": [ - { - "MainData": 153, - "Pokemon": 97, - "Traps": 0, - "Items": 41, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 154, - "Pokemon": 97, - "Traps": 0, - "Items": 41, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 155, - "Pokemon": 97, - "Traps": 0, - "Items": 41, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 156, - "Pokemon": 97, - "Traps": 0, - "Items": 42, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 157, - "Pokemon": 97, - "Traps": 0, - "Items": 42, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 158, - "Pokemon": 98, - "Traps": 0, - "Items": 42, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 159, - "Pokemon": 99, - "Traps": 0, - "Items": 42, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 160, - "Pokemon": 99, - "Traps": 0, - "Items": 42, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 161, - "Pokemon": 100, - "Traps": 0, - "Items": 42, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 162, - "Pokemon": 101, - "Traps": 0, - "Items": 42, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 163, - "Pokemon": 101, - "Traps": 0, - "Items": 42, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 164, - "Pokemon": 102, - "Traps": 0, - "Items": 42, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 165, - "Pokemon": 102, - "Traps": 0, - "Items": 42, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 166, - "Pokemon": 102, - "Traps": 0, - "Items": 42, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 167, - "Pokemon": 103, - "Traps": 0, - "Items": 42, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 168, - "Pokemon": 103, - "Traps": 0, - "Items": 42, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 169, - "Pokemon": 104, - "Traps": 0, - "Items": 42, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 170, - "Pokemon": 105, - "Traps": 0, - "Items": 42, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 171, - "Pokemon": 105, - "Traps": 0, - "Items": 42, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 172, - "Pokemon": 106, - "Traps": 0, - "Items": 42, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 173, - "Pokemon": 107, - "Traps": 0, - "Items": 42, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 174, - "Pokemon": 108, - "Traps": 0, - "Items": 42, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 175, - "Pokemon": 108, - "Traps": 0, - "Items": 42, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 176, - "Pokemon": 109, - "Traps": 0, - "Items": 42, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 177, - "Pokemon": 109, - "Traps": 0, - "Items": 42, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - } - ] -} +{ + "name": "SkyTowerFloorID", + "tables": [ + { + "MainData": 153, + "Pokemon": 97, + "Traps": 0, + "Items": 41, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 154, + "Pokemon": 97, + "Traps": 0, + "Items": 41, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 155, + "Pokemon": 97, + "Traps": 0, + "Items": 41, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 156, + "Pokemon": 97, + "Traps": 0, + "Items": 42, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 157, + "Pokemon": 97, + "Traps": 0, + "Items": 42, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 158, + "Pokemon": 98, + "Traps": 0, + "Items": 42, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 159, + "Pokemon": 99, + "Traps": 0, + "Items": 42, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 160, + "Pokemon": 99, + "Traps": 0, + "Items": 42, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 161, + "Pokemon": 100, + "Traps": 0, + "Items": 42, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 162, + "Pokemon": 101, + "Traps": 0, + "Items": 42, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 163, + "Pokemon": 101, + "Traps": 0, + "Items": 42, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 164, + "Pokemon": 102, + "Traps": 0, + "Items": 42, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 165, + "Pokemon": 102, + "Traps": 0, + "Items": 42, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 166, + "Pokemon": 102, + "Traps": 0, + "Items": 42, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 167, + "Pokemon": 103, + "Traps": 0, + "Items": 42, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 168, + "Pokemon": 103, + "Traps": 0, + "Items": 42, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 169, + "Pokemon": 104, + "Traps": 0, + "Items": 42, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 170, + "Pokemon": 105, + "Traps": 0, + "Items": 42, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 171, + "Pokemon": 105, + "Traps": 0, + "Items": 42, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 172, + "Pokemon": 106, + "Traps": 0, + "Items": 42, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 173, + "Pokemon": 107, + "Traps": 0, + "Items": 42, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 174, + "Pokemon": 108, + "Traps": 0, + "Items": 42, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 175, + "Pokemon": 108, + "Traps": 0, + "Items": 42, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 176, + "Pokemon": 109, + "Traps": 0, + "Items": 42, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 177, + "Pokemon": 109, + "Traps": 0, + "Items": 42, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + } + ] +} diff --git a/data/dungeon/SkyTower/pokemon_found.json b/data/dungeon/SkyTower/pokemon_found.json index e38ad03..5adce68 100644 --- a/data/dungeon/SkyTower/pokemon_found.json +++ b/data/dungeon/SkyTower/pokemon_found.json @@ -1,466 +1,466 @@ -{ - "tables": [{ - "name": "SkyTower_1F_5F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_FORRETRESS", - "level": 23, - "probability": 2581 - }, - { - "species": "SPECIES_MASQUERAIN", - "level": 27, - "probability": 1290 - }, - { - "species": "SPECIES_SHEDINJA", - "level": 5, - "probability": 968 - }, - { - "species": "SPECIES_LUNATONE", - "level": 24, - "probability": 2580 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_SHUPPET", - "level": 28, - "probability": 2581 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "SkyTower_6F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_FORRETRESS", - "level": 23, - "probability": 2857 - }, - { - "species": "SPECIES_MASQUERAIN", - "level": 27, - "probability": 1429 - }, - { - "species": "SPECIES_LUNATONE", - "level": 24, - "probability": 2857 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_SHUPPET", - "level": 28, - "probability": 2857 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "SkyTower_7F_8F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_MASQUERAIN", - "level": 27, - "probability": 2000 - }, - { - "species": "SPECIES_LUNATONE", - "level": 24, - "probability": 4000 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DUSKULL", - "level": 27, - "probability": 4000 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "SkyTower_9F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_KOFFING", - "level": 24, - "probability": 3333 - }, - { - "species": "SPECIES_LUNATONE", - "level": 24, - "probability": 3334 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DUSKULL", - "level": 27, - "probability": 3333 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "SkyTower_10F_11F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_KOFFING", - "level": 24, - "probability": 2581 - }, - { - "species": "SPECIES_LEDIAN", - "level": 24, - "probability": 2258 - }, - { - "species": "SPECIES_LUNATONE", - "level": 24, - "probability": 2580 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DUSKULL", - "level": 27, - "probability": 2581 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "SkyTower_12F_14F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_KOFFING", - "level": 24, - "probability": 2051 - }, - { - "species": "SPECIES_LEDIAN", - "level": 24, - "probability": 1795 - }, - { - "species": "SPECIES_ALTARIA", - "level": 24, - "probability": 2051 - }, - { - "species": "SPECIES_SOLROCK", - "level": 24, - "probability": 2052 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DUSKULL", - "level": 27, - "probability": 2051 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "SkyTower_15F_16F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_KOFFING", - "level": 24, - "probability": 2051 - }, - { - "species": "SPECIES_LEDIAN", - "level": 24, - "probability": 1795 - }, - { - "species": "SPECIES_SCIZOR", - "level": 24, - "probability": 2051 - }, - { - "species": "SPECIES_ALTARIA", - "level": 24, - "probability": 2052 - }, - { - "species": "SPECIES_SOLROCK", - "level": 24, - "probability": 2051 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "SkyTower_17F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_LEDIAN", - "level": 24, - "probability": 1795 - }, - { - "species": "SPECIES_SCIZOR", - "level": 24, - "probability": 2051 - }, - { - "species": "SPECIES_ALTARIA", - "level": 24, - "probability": 2051 - }, - { - "species": "SPECIES_SOLROCK", - "level": 24, - "probability": 2052 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DUSCLOPS", - "level": 24, - "probability": 2051 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "SkyTower_18F_19F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_SCIZOR", - "level": 24, - "probability": 2500 - }, - { - "species": "SPECIES_ALTARIA", - "level": 24, - "probability": 2500 - }, - { - "species": "SPECIES_SOLROCK", - "level": 24, - "probability": 2500 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DUSCLOPS", - "level": 24, - "probability": 2500 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "SkyTower_20F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_VENOMOTH", - "level": 18, - "probability": 2500 - }, - { - "species": "SPECIES_SCIZOR", - "level": 24, - "probability": 2500 - }, - { - "species": "SPECIES_SOLROCK", - "level": 24, - "probability": 2500 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DUSCLOPS", - "level": 24, - "probability": 2500 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "SkyTower_21F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_VENOMOTH", - "level": 18, - "probability": 2222 - }, - { - "species": "SPECIES_AERODACTYL", - "level": 25, - "probability": 2222 - }, - { - "species": "SPECIES_SCIZOR", - "level": 24, - "probability": 2223 - }, - { - "species": "SPECIES_FLYGON", - "level": 27, - "probability": 1111 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DUSCLOPS", - "level": 24, - "probability": 2222 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "SkyTower_22F_23F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_VENOMOTH", - "level": 18, - "probability": 2500 - }, - { - "species": "SPECIES_AERODACTYL", - "level": 25, - "probability": 2500 - }, - { - "species": "SPECIES_FLYGON", - "level": 27, - "probability": 1250 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DUSCLOPS", - "level": 24, - "probability": 2500 - }, - { - "species": "SPECIES_TROPIUS", - "level": 27, - "probability": 1250 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "SkyTower_24F_25F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_VENOMOTH", - "level": 18, - "probability": 3333 - }, - { - "species": "SPECIES_AERODACTYL", - "level": 25, - "probability": 3334 - }, - { - "species": "SPECIES_FLYGON", - "level": 27, - "probability": 1666 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_TROPIUS", - "level": 27, - "probability": 1667 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - } - ] -} +{ + "tables": [{ + "name": "SkyTower_1F_5F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_FORRETRESS", + "level": 23, + "probability": 2581 + }, + { + "species": "SPECIES_MASQUERAIN", + "level": 27, + "probability": 1290 + }, + { + "species": "SPECIES_SHEDINJA", + "level": 5, + "probability": 968 + }, + { + "species": "SPECIES_LUNATONE", + "level": 24, + "probability": 2580 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_SHUPPET", + "level": 28, + "probability": 2581 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "SkyTower_6F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_FORRETRESS", + "level": 23, + "probability": 2857 + }, + { + "species": "SPECIES_MASQUERAIN", + "level": 27, + "probability": 1429 + }, + { + "species": "SPECIES_LUNATONE", + "level": 24, + "probability": 2857 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_SHUPPET", + "level": 28, + "probability": 2857 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "SkyTower_7F_8F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_MASQUERAIN", + "level": 27, + "probability": 2000 + }, + { + "species": "SPECIES_LUNATONE", + "level": 24, + "probability": 4000 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DUSKULL", + "level": 27, + "probability": 4000 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "SkyTower_9F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_KOFFING", + "level": 24, + "probability": 3333 + }, + { + "species": "SPECIES_LUNATONE", + "level": 24, + "probability": 3334 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DUSKULL", + "level": 27, + "probability": 3333 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "SkyTower_10F_11F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_KOFFING", + "level": 24, + "probability": 2581 + }, + { + "species": "SPECIES_LEDIAN", + "level": 24, + "probability": 2258 + }, + { + "species": "SPECIES_LUNATONE", + "level": 24, + "probability": 2580 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DUSKULL", + "level": 27, + "probability": 2581 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "SkyTower_12F_14F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_KOFFING", + "level": 24, + "probability": 2051 + }, + { + "species": "SPECIES_LEDIAN", + "level": 24, + "probability": 1795 + }, + { + "species": "SPECIES_ALTARIA", + "level": 24, + "probability": 2051 + }, + { + "species": "SPECIES_SOLROCK", + "level": 24, + "probability": 2052 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DUSKULL", + "level": 27, + "probability": 2051 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "SkyTower_15F_16F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_KOFFING", + "level": 24, + "probability": 2051 + }, + { + "species": "SPECIES_LEDIAN", + "level": 24, + "probability": 1795 + }, + { + "species": "SPECIES_SCIZOR", + "level": 24, + "probability": 2051 + }, + { + "species": "SPECIES_ALTARIA", + "level": 24, + "probability": 2052 + }, + { + "species": "SPECIES_SOLROCK", + "level": 24, + "probability": 2051 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "SkyTower_17F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_LEDIAN", + "level": 24, + "probability": 1795 + }, + { + "species": "SPECIES_SCIZOR", + "level": 24, + "probability": 2051 + }, + { + "species": "SPECIES_ALTARIA", + "level": 24, + "probability": 2051 + }, + { + "species": "SPECIES_SOLROCK", + "level": 24, + "probability": 2052 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DUSCLOPS", + "level": 24, + "probability": 2051 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "SkyTower_18F_19F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_SCIZOR", + "level": 24, + "probability": 2500 + }, + { + "species": "SPECIES_ALTARIA", + "level": 24, + "probability": 2500 + }, + { + "species": "SPECIES_SOLROCK", + "level": 24, + "probability": 2500 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DUSCLOPS", + "level": 24, + "probability": 2500 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "SkyTower_20F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_VENOMOTH", + "level": 18, + "probability": 2500 + }, + { + "species": "SPECIES_SCIZOR", + "level": 24, + "probability": 2500 + }, + { + "species": "SPECIES_SOLROCK", + "level": 24, + "probability": 2500 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DUSCLOPS", + "level": 24, + "probability": 2500 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "SkyTower_21F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_VENOMOTH", + "level": 18, + "probability": 2222 + }, + { + "species": "SPECIES_AERODACTYL", + "level": 25, + "probability": 2222 + }, + { + "species": "SPECIES_SCIZOR", + "level": 24, + "probability": 2223 + }, + { + "species": "SPECIES_FLYGON", + "level": 27, + "probability": 1111 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DUSCLOPS", + "level": 24, + "probability": 2222 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "SkyTower_22F_23F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_VENOMOTH", + "level": 18, + "probability": 2500 + }, + { + "species": "SPECIES_AERODACTYL", + "level": 25, + "probability": 2500 + }, + { + "species": "SPECIES_FLYGON", + "level": 27, + "probability": 1250 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DUSCLOPS", + "level": 24, + "probability": 2500 + }, + { + "species": "SPECIES_TROPIUS", + "level": 27, + "probability": 1250 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "SkyTower_24F_25F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_VENOMOTH", + "level": 18, + "probability": 3333 + }, + { + "species": "SPECIES_AERODACTYL", + "level": 25, + "probability": 3334 + }, + { + "species": "SPECIES_FLYGON", + "level": 27, + "probability": 1666 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_TROPIUS", + "level": 27, + "probability": 1667 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + } + ] +} diff --git a/data/dungeon/SkyTowerSummit/floor_id.json b/data/dungeon/SkyTowerSummit/floor_id.json index 88f7042..e3b3769 100644 --- a/data/dungeon/SkyTowerSummit/floor_id.json +++ b/data/dungeon/SkyTowerSummit/floor_id.json @@ -1,86 +1,86 @@ -{ - "name": "SkyTowerSummitFloorID", - "tables": [ - { - "MainData": 178, - "Pokemon": 110, - "Traps": 5, - "Items": 43, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 179, - "Pokemon": 110, - "Traps": 5, - "Items": 43, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 180, - "Pokemon": 110, - "Traps": 5, - "Items": 43, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 181, - "Pokemon": 110, - "Traps": 5, - "Items": 44, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 182, - "Pokemon": 110, - "Traps": 5, - "Items": 44, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 183, - "Pokemon": 110, - "Traps": 5, - "Items": 44, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 184, - "Pokemon": 110, - "Traps": 5, - "Items": 44, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 185, - "Pokemon": 110, - "Traps": 5, - "Items": 44, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 186, - "Pokemon": 111, - "Traps": 5, - "Items": 44, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - } - ] -} +{ + "name": "SkyTowerSummitFloorID", + "tables": [ + { + "MainData": 178, + "Pokemon": 110, + "Traps": 5, + "Items": 43, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 179, + "Pokemon": 110, + "Traps": 5, + "Items": 43, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 180, + "Pokemon": 110, + "Traps": 5, + "Items": 43, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 181, + "Pokemon": 110, + "Traps": 5, + "Items": 44, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 182, + "Pokemon": 110, + "Traps": 5, + "Items": 44, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 183, + "Pokemon": 110, + "Traps": 5, + "Items": 44, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 184, + "Pokemon": 110, + "Traps": 5, + "Items": 44, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 185, + "Pokemon": 110, + "Traps": 5, + "Items": 44, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 186, + "Pokemon": 111, + "Traps": 5, + "Items": 44, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + } + ] +} diff --git a/data/dungeon/SkyTowerSummit/pokemon_found.json b/data/dungeon/SkyTowerSummit/pokemon_found.json index 75237dc..8146ec3 100644 --- a/data/dungeon/SkyTowerSummit/pokemon_found.json +++ b/data/dungeon/SkyTowerSummit/pokemon_found.json @@ -1,66 +1,66 @@ -{ - "tables": [{ - "name": "SkyTowerSummit_1F_8F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_AERODACTYL", - "level": 25, - "probability": 1667 - }, - { - "species": "SPECIES_FLYGON", - "level": 27, - "probability": 1666 - }, - { - "species": "SPECIES_CLAYDOL", - "level": 26, - "probability": 1667 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_TROPIUS", - "level": 27, - "probability": 1667 - }, - { - "species": "SPECIES_SALAMENCE", - "level": 29, - "probability": 1666 - }, - { - "species": "SPECIES_METAGROSS", - "level": 30, - "probability": 1667 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "SkyTowerSummit_9F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_RAYQUAZA", - "level": 35, - "probability": 10000 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }] -} +{ + "tables": [{ + "name": "SkyTowerSummit_1F_8F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_AERODACTYL", + "level": 25, + "probability": 1667 + }, + { + "species": "SPECIES_FLYGON", + "level": 27, + "probability": 1666 + }, + { + "species": "SPECIES_CLAYDOL", + "level": 26, + "probability": 1667 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_TROPIUS", + "level": 27, + "probability": 1667 + }, + { + "species": "SPECIES_SALAMENCE", + "level": 29, + "probability": 1666 + }, + { + "species": "SPECIES_METAGROSS", + "level": 30, + "probability": 1667 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "SkyTowerSummit_9F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_RAYQUAZA", + "level": 35, + "probability": 10000 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }] +} diff --git a/data/dungeon/SnowPath/floor_id.json b/data/dungeon/SnowPath/floor_id.json index e7c8b23..6cc72ec 100644 --- a/data/dungeon/SnowPath/floor_id.json +++ b/data/dungeon/SnowPath/floor_id.json @@ -1,41 +1,41 @@ -{ - "name": "SnowPathFloorID", - "tables": [ - { - "MainData": 1125, - "Pokemon": 522, - "Traps": 10, - "Items": 124, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1126, - "Pokemon": 523, - "Traps": 10, - "Items": 124, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1127, - "Pokemon": 524, - "Traps": 10, - "Items": 124, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1128, - "Pokemon": 525, - "Traps": 10, - "Items": 125, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - } - ] -} +{ + "name": "SnowPathFloorID", + "tables": [ + { + "MainData": 1125, + "Pokemon": 522, + "Traps": 10, + "Items": 124, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1126, + "Pokemon": 523, + "Traps": 10, + "Items": 124, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1127, + "Pokemon": 524, + "Traps": 10, + "Items": 124, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1128, + "Pokemon": 525, + "Traps": 10, + "Items": 125, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + } + ] +} diff --git a/data/dungeon/SolarCave/floor_id.json b/data/dungeon/SolarCave/floor_id.json index b742d12..fc8d677 100644 --- a/data/dungeon/SolarCave/floor_id.json +++ b/data/dungeon/SolarCave/floor_id.json @@ -1,185 +1,185 @@ -{ - "name": "SolarCaveFloorID", - "tables": [ - { - "MainData": 900, - "Pokemon": 412, - "Traps": 75, - "Items": 102, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 901, - "Pokemon": 412, - "Traps": 76, - "Items": 102, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 902, - "Pokemon": 412, - "Traps": 77, - "Items": 102, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 903, - "Pokemon": 413, - "Traps": 78, - "Items": 102, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 904, - "Pokemon": 414, - "Traps": 79, - "Items": 102, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 905, - "Pokemon": 415, - "Traps": 80, - "Items": 102, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 906, - "Pokemon": 416, - "Traps": 81, - "Items": 102, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 907, - "Pokemon": 417, - "Traps": 81, - "Items": 102, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 908, - "Pokemon": 418, - "Traps": 81, - "Items": 102, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 909, - "Pokemon": 419, - "Traps": 81, - "Items": 103, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 910, - "Pokemon": 420, - "Traps": 82, - "Items": 103, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 911, - "Pokemon": 421, - "Traps": 82, - "Items": 103, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 912, - "Pokemon": 422, - "Traps": 82, - "Items": 103, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 913, - "Pokemon": 422, - "Traps": 82, - "Items": 103, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 914, - "Pokemon": 423, - "Traps": 82, - "Items": 103, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 915, - "Pokemon": 424, - "Traps": 83, - "Items": 104, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 916, - "Pokemon": 425, - "Traps": 83, - "Items": 104, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 917, - "Pokemon": 426, - "Traps": 83, - "Items": 104, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 918, - "Pokemon": 426, - "Traps": 83, - "Items": 104, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 919, - "Pokemon": 426, - "Traps": 84, - "Items": 104, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - } - ] -} +{ + "name": "SolarCaveFloorID", + "tables": [ + { + "MainData": 900, + "Pokemon": 412, + "Traps": 75, + "Items": 102, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 901, + "Pokemon": 412, + "Traps": 76, + "Items": 102, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 902, + "Pokemon": 412, + "Traps": 77, + "Items": 102, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 903, + "Pokemon": 413, + "Traps": 78, + "Items": 102, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 904, + "Pokemon": 414, + "Traps": 79, + "Items": 102, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 905, + "Pokemon": 415, + "Traps": 80, + "Items": 102, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 906, + "Pokemon": 416, + "Traps": 81, + "Items": 102, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 907, + "Pokemon": 417, + "Traps": 81, + "Items": 102, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 908, + "Pokemon": 418, + "Traps": 81, + "Items": 102, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 909, + "Pokemon": 419, + "Traps": 81, + "Items": 103, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 910, + "Pokemon": 420, + "Traps": 82, + "Items": 103, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 911, + "Pokemon": 421, + "Traps": 82, + "Items": 103, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 912, + "Pokemon": 422, + "Traps": 82, + "Items": 103, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 913, + "Pokemon": 422, + "Traps": 82, + "Items": 103, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 914, + "Pokemon": 423, + "Traps": 82, + "Items": 103, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 915, + "Pokemon": 424, + "Traps": 83, + "Items": 104, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 916, + "Pokemon": 425, + "Traps": 83, + "Items": 104, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 917, + "Pokemon": 426, + "Traps": 83, + "Items": 104, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 918, + "Pokemon": 426, + "Traps": 83, + "Items": 104, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 919, + "Pokemon": 426, + "Traps": 84, + "Items": 104, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + } + ] +} diff --git a/data/dungeon/SouthernCavern/floor_id.json b/data/dungeon/SouthernCavern/floor_id.json index b169550..de99089 100644 --- a/data/dungeon/SouthernCavern/floor_id.json +++ b/data/dungeon/SouthernCavern/floor_id.json @@ -1,455 +1,455 @@ -{ - "name": "SouthernCavernFloorID", - "tables": [ - { - "MainData": 760, - "Pokemon": 345, - "Traps": 65, - "Items": 93, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 761, - "Pokemon": 345, - "Traps": 65, - "Items": 93, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 762, - "Pokemon": 345, - "Traps": 65, - "Items": 93, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 763, - "Pokemon": 345, - "Traps": 65, - "Items": 93, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 764, - "Pokemon": 346, - "Traps": 65, - "Items": 93, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 765, - "Pokemon": 346, - "Traps": 65, - "Items": 93, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 766, - "Pokemon": 347, - "Traps": 65, - "Items": 93, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 767, - "Pokemon": 348, - "Traps": 65, - "Items": 93, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 768, - "Pokemon": 348, - "Traps": 65, - "Items": 93, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 769, - "Pokemon": 349, - "Traps": 66, - "Items": 93, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 770, - "Pokemon": 350, - "Traps": 66, - "Items": 93, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 771, - "Pokemon": 351, - "Traps": 66, - "Items": 93, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 772, - "Pokemon": 351, - "Traps": 66, - "Items": 93, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 773, - "Pokemon": 351, - "Traps": 66, - "Items": 93, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 774, - "Pokemon": 352, - "Traps": 66, - "Items": 93, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 775, - "Pokemon": 353, - "Traps": 66, - "Items": 93, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 776, - "Pokemon": 353, - "Traps": 66, - "Items": 93, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 777, - "Pokemon": 353, - "Traps": 66, - "Items": 93, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 778, - "Pokemon": 353, - "Traps": 66, - "Items": 93, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 779, - "Pokemon": 354, - "Traps": 66, - "Items": 93, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 780, - "Pokemon": 355, - "Traps": 66, - "Items": 93, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 781, - "Pokemon": 355, - "Traps": 66, - "Items": 93, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 782, - "Pokemon": 356, - "Traps": 66, - "Items": 93, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 783, - "Pokemon": 356, - "Traps": 66, - "Items": 93, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 784, - "Pokemon": 357, - "Traps": 66, - "Items": 93, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 785, - "Pokemon": 358, - "Traps": 66, - "Items": 93, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 786, - "Pokemon": 359, - "Traps": 66, - "Items": 93, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 787, - "Pokemon": 359, - "Traps": 66, - "Items": 93, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 788, - "Pokemon": 359, - "Traps": 66, - "Items": 93, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 789, - "Pokemon": 359, - "Traps": 67, - "Items": 93, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 790, - "Pokemon": 360, - "Traps": 68, - "Items": 93, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 791, - "Pokemon": 361, - "Traps": 68, - "Items": 93, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 792, - "Pokemon": 361, - "Traps": 68, - "Items": 93, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 793, - "Pokemon": 361, - "Traps": 68, - "Items": 93, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 794, - "Pokemon": 361, - "Traps": 68, - "Items": 93, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 795, - "Pokemon": 361, - "Traps": 68, - "Items": 93, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 796, - "Pokemon": 362, - "Traps": 68, - "Items": 93, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 797, - "Pokemon": 362, - "Traps": 68, - "Items": 93, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 798, - "Pokemon": 362, - "Traps": 68, - "Items": 93, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 799, - "Pokemon": 363, - "Traps": 69, - "Items": 93, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 800, - "Pokemon": 364, - "Traps": 69, - "Items": 93, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 801, - "Pokemon": 364, - "Traps": 69, - "Items": 93, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 802, - "Pokemon": 364, - "Traps": 69, - "Items": 93, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 803, - "Pokemon": 364, - "Traps": 69, - "Items": 93, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 804, - "Pokemon": 364, - "Traps": 69, - "Items": 93, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 805, - "Pokemon": 365, - "Traps": 69, - "Items": 93, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 806, - "Pokemon": 365, - "Traps": 69, - "Items": 93, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 807, - "Pokemon": 365, - "Traps": 69, - "Items": 93, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 808, - "Pokemon": 365, - "Traps": 69, - "Items": 95, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 809, - "Pokemon": 365, - "Traps": 70, - "Items": 95, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 57 - } - ] -} +{ + "name": "SouthernCavernFloorID", + "tables": [ + { + "MainData": 760, + "Pokemon": 345, + "Traps": 65, + "Items": 93, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 761, + "Pokemon": 345, + "Traps": 65, + "Items": 93, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 762, + "Pokemon": 345, + "Traps": 65, + "Items": 93, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 763, + "Pokemon": 345, + "Traps": 65, + "Items": 93, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 764, + "Pokemon": 346, + "Traps": 65, + "Items": 93, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 765, + "Pokemon": 346, + "Traps": 65, + "Items": 93, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 766, + "Pokemon": 347, + "Traps": 65, + "Items": 93, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 767, + "Pokemon": 348, + "Traps": 65, + "Items": 93, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 768, + "Pokemon": 348, + "Traps": 65, + "Items": 93, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 769, + "Pokemon": 349, + "Traps": 66, + "Items": 93, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 770, + "Pokemon": 350, + "Traps": 66, + "Items": 93, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 771, + "Pokemon": 351, + "Traps": 66, + "Items": 93, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 772, + "Pokemon": 351, + "Traps": 66, + "Items": 93, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 773, + "Pokemon": 351, + "Traps": 66, + "Items": 93, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 774, + "Pokemon": 352, + "Traps": 66, + "Items": 93, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 775, + "Pokemon": 353, + "Traps": 66, + "Items": 93, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 776, + "Pokemon": 353, + "Traps": 66, + "Items": 93, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 777, + "Pokemon": 353, + "Traps": 66, + "Items": 93, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 778, + "Pokemon": 353, + "Traps": 66, + "Items": 93, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 779, + "Pokemon": 354, + "Traps": 66, + "Items": 93, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 780, + "Pokemon": 355, + "Traps": 66, + "Items": 93, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 781, + "Pokemon": 355, + "Traps": 66, + "Items": 93, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 782, + "Pokemon": 356, + "Traps": 66, + "Items": 93, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 783, + "Pokemon": 356, + "Traps": 66, + "Items": 93, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 784, + "Pokemon": 357, + "Traps": 66, + "Items": 93, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 785, + "Pokemon": 358, + "Traps": 66, + "Items": 93, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 786, + "Pokemon": 359, + "Traps": 66, + "Items": 93, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 787, + "Pokemon": 359, + "Traps": 66, + "Items": 93, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 788, + "Pokemon": 359, + "Traps": 66, + "Items": 93, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 789, + "Pokemon": 359, + "Traps": 67, + "Items": 93, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 790, + "Pokemon": 360, + "Traps": 68, + "Items": 93, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 791, + "Pokemon": 361, + "Traps": 68, + "Items": 93, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 792, + "Pokemon": 361, + "Traps": 68, + "Items": 93, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 793, + "Pokemon": 361, + "Traps": 68, + "Items": 93, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 794, + "Pokemon": 361, + "Traps": 68, + "Items": 93, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 795, + "Pokemon": 361, + "Traps": 68, + "Items": 93, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 796, + "Pokemon": 362, + "Traps": 68, + "Items": 93, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 797, + "Pokemon": 362, + "Traps": 68, + "Items": 93, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 798, + "Pokemon": 362, + "Traps": 68, + "Items": 93, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 799, + "Pokemon": 363, + "Traps": 69, + "Items": 93, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 800, + "Pokemon": 364, + "Traps": 69, + "Items": 93, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 801, + "Pokemon": 364, + "Traps": 69, + "Items": 93, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 802, + "Pokemon": 364, + "Traps": 69, + "Items": 93, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 803, + "Pokemon": 364, + "Traps": 69, + "Items": 93, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 804, + "Pokemon": 364, + "Traps": 69, + "Items": 93, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 805, + "Pokemon": 365, + "Traps": 69, + "Items": 93, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 806, + "Pokemon": 365, + "Traps": 69, + "Items": 93, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 807, + "Pokemon": 365, + "Traps": 69, + "Items": 93, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 808, + "Pokemon": 365, + "Traps": 69, + "Items": 95, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + }, + { + "MainData": 809, + "Pokemon": 365, + "Traps": 70, + "Items": 95, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 57 + } + ] +} diff --git a/data/dungeon/StormySea/floor_id.json b/data/dungeon/StormySea/floor_id.json index c740654..0828d7b 100644 --- a/data/dungeon/StormySea/floor_id.json +++ b/data/dungeon/StormySea/floor_id.json @@ -1,365 +1,365 @@ -{ - "name": "StormySeaFloorID", - "tables": [ - { - "MainData": 187, - "Pokemon": 112, - "Traps": 4, - "Items": 45, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 188, - "Pokemon": 112, - "Traps": 4, - "Items": 45, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 189, - "Pokemon": 112, - "Traps": 4, - "Items": 45, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 190, - "Pokemon": 112, - "Traps": 4, - "Items": 45, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 191, - "Pokemon": 112, - "Traps": 4, - "Items": 45, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 192, - "Pokemon": 113, - "Traps": 4, - "Items": 45, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 193, - "Pokemon": 113, - "Traps": 4, - "Items": 45, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 194, - "Pokemon": 113, - "Traps": 4, - "Items": 45, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 195, - "Pokemon": 114, - "Traps": 4, - "Items": 45, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 196, - "Pokemon": 115, - "Traps": 4, - "Items": 47, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 197, - "Pokemon": 116, - "Traps": 4, - "Items": 47, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 198, - "Pokemon": 116, - "Traps": 4, - "Items": 47, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 199, - "Pokemon": 116, - "Traps": 4, - "Items": 47, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 200, - "Pokemon": 116, - "Traps": 4, - "Items": 47, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 201, - "Pokemon": 117, - "Traps": 4, - "Items": 47, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 202, - "Pokemon": 117, - "Traps": 4, - "Items": 47, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 203, - "Pokemon": 117, - "Traps": 4, - "Items": 47, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 204, - "Pokemon": 118, - "Traps": 4, - "Items": 47, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 205, - "Pokemon": 118, - "Traps": 4, - "Items": 47, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 206, - "Pokemon": 119, - "Traps": 4, - "Items": 47, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 207, - "Pokemon": 119, - "Traps": 4, - "Items": 48, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 208, - "Pokemon": 119, - "Traps": 4, - "Items": 48, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 209, - "Pokemon": 119, - "Traps": 4, - "Items": 48, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 210, - "Pokemon": 119, - "Traps": 4, - "Items": 48, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 211, - "Pokemon": 120, - "Traps": 4, - "Items": 48, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 212, - "Pokemon": 120, - "Traps": 4, - "Items": 48, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 213, - "Pokemon": 121, - "Traps": 4, - "Items": 48, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 214, - "Pokemon": 122, - "Traps": 4, - "Items": 48, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 215, - "Pokemon": 122, - "Traps": 4, - "Items": 48, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 216, - "Pokemon": 123, - "Traps": 4, - "Items": 48, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 217, - "Pokemon": 124, - "Traps": 4, - "Items": 49, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 218, - "Pokemon": 124, - "Traps": 4, - "Items": 49, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 219, - "Pokemon": 124, - "Traps": 4, - "Items": 49, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 220, - "Pokemon": 125, - "Traps": 4, - "Items": 49, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 221, - "Pokemon": 126, - "Traps": 4, - "Items": 49, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 222, - "Pokemon": 126, - "Traps": 4, - "Items": 49, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 223, - "Pokemon": 126, - "Traps": 4, - "Items": 49, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 224, - "Pokemon": 126, - "Traps": 4, - "Items": 49, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 225, - "Pokemon": 126, - "Traps": 4, - "Items": 49, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 226, - "Pokemon": 127, - "Traps": 4, - "Items": 49, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - } - ] -} +{ + "name": "StormySeaFloorID", + "tables": [ + { + "MainData": 187, + "Pokemon": 112, + "Traps": 4, + "Items": 45, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 188, + "Pokemon": 112, + "Traps": 4, + "Items": 45, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 189, + "Pokemon": 112, + "Traps": 4, + "Items": 45, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 190, + "Pokemon": 112, + "Traps": 4, + "Items": 45, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 191, + "Pokemon": 112, + "Traps": 4, + "Items": 45, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 192, + "Pokemon": 113, + "Traps": 4, + "Items": 45, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 193, + "Pokemon": 113, + "Traps": 4, + "Items": 45, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 194, + "Pokemon": 113, + "Traps": 4, + "Items": 45, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 195, + "Pokemon": 114, + "Traps": 4, + "Items": 45, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 196, + "Pokemon": 115, + "Traps": 4, + "Items": 47, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 197, + "Pokemon": 116, + "Traps": 4, + "Items": 47, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 198, + "Pokemon": 116, + "Traps": 4, + "Items": 47, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 199, + "Pokemon": 116, + "Traps": 4, + "Items": 47, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 200, + "Pokemon": 116, + "Traps": 4, + "Items": 47, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 201, + "Pokemon": 117, + "Traps": 4, + "Items": 47, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 202, + "Pokemon": 117, + "Traps": 4, + "Items": 47, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 203, + "Pokemon": 117, + "Traps": 4, + "Items": 47, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 204, + "Pokemon": 118, + "Traps": 4, + "Items": 47, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 205, + "Pokemon": 118, + "Traps": 4, + "Items": 47, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 206, + "Pokemon": 119, + "Traps": 4, + "Items": 47, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 207, + "Pokemon": 119, + "Traps": 4, + "Items": 48, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 208, + "Pokemon": 119, + "Traps": 4, + "Items": 48, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 209, + "Pokemon": 119, + "Traps": 4, + "Items": 48, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 210, + "Pokemon": 119, + "Traps": 4, + "Items": 48, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 211, + "Pokemon": 120, + "Traps": 4, + "Items": 48, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 212, + "Pokemon": 120, + "Traps": 4, + "Items": 48, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 213, + "Pokemon": 121, + "Traps": 4, + "Items": 48, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 214, + "Pokemon": 122, + "Traps": 4, + "Items": 48, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 215, + "Pokemon": 122, + "Traps": 4, + "Items": 48, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 216, + "Pokemon": 123, + "Traps": 4, + "Items": 48, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 217, + "Pokemon": 124, + "Traps": 4, + "Items": 49, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 218, + "Pokemon": 124, + "Traps": 4, + "Items": 49, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 219, + "Pokemon": 124, + "Traps": 4, + "Items": 49, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 220, + "Pokemon": 125, + "Traps": 4, + "Items": 49, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 221, + "Pokemon": 126, + "Traps": 4, + "Items": 49, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 222, + "Pokemon": 126, + "Traps": 4, + "Items": 49, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 223, + "Pokemon": 126, + "Traps": 4, + "Items": 49, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 224, + "Pokemon": 126, + "Traps": 4, + "Items": 49, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 225, + "Pokemon": 126, + "Traps": 4, + "Items": 49, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 226, + "Pokemon": 127, + "Traps": 4, + "Items": 49, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 3 + } + ] +} diff --git a/data/dungeon/ThunderwaveCave/floor_id.json b/data/dungeon/ThunderwaveCave/floor_id.json index a90b7cb..1a5898b 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 676857b..e22ea7b 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 + } + ] + }] +} diff --git a/data/dungeon/TinyWoods/floor_id.json b/data/dungeon/TinyWoods/floor_id.json index 4471594..5326904 100644 --- a/data/dungeon/TinyWoods/floor_id.json +++ b/data/dungeon/TinyWoods/floor_id.json @@ -1,32 +1,32 @@ -{ - "name": "TinyWoodsFloorID", - "tables": [ - { - "MainData": 0, - "Pokemon": 0, - "Traps": 0, - "Items": 0, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1, - "Pokemon": 0, - "Traps": 0, - "Items": 4, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 2, - "Pokemon": 1, - "Traps": 0, - "Items": 5, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - } - ] -} +{ + "name": "TinyWoodsFloorID", + "tables": [ + { + "MainData": 0, + "Pokemon": 0, + "Traps": 0, + "Items": 0, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1, + "Pokemon": 0, + "Traps": 0, + "Items": 4, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 2, + "Pokemon": 1, + "Traps": 0, + "Items": 5, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + } + ] +} diff --git a/data/dungeon/TinyWoods/pokemon_found.json b/data/dungeon/TinyWoods/pokemon_found.json index 4f28076..79b8844 100644 --- a/data/dungeon/TinyWoods/pokemon_found.json +++ b/data/dungeon/TinyWoods/pokemon_found.json @@ -1,64 +1,64 @@ -{ - "tables": [{ - "name": "TinyWoods1F_2F_Pokemon", - "pokemon": [{ - "species": "SPECIES_PIDGEY", - "level": 1, - "probability": 3333 - }, - { - "species": "SPECIES_SUNKERN", - "level": 1, - "probability": 3334 - }, - { - "species": "SPECIES_WURMPLE", - "level": 1, - "probability": 3333 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "TinyWoods3F_Pokemon", - "pokemon": [{ - "species": "SPECIES_PIDGEY", - "level": 1, - "probability": 2857 - }, - { - "species": "SPECIES_EXEGGCUTE", - "level": 1, - "probability": 1429 - }, - { - "species": "SPECIES_SUNKERN", - "level": 1, - "probability": 2857 - }, - { - "species": "SPECIES_WURMPLE", - "level": 1, - "probability": 2857 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }] -} +{ + "tables": [{ + "name": "TinyWoods1F_2F_Pokemon", + "pokemon": [{ + "species": "SPECIES_PIDGEY", + "level": 1, + "probability": 3333 + }, + { + "species": "SPECIES_SUNKERN", + "level": 1, + "probability": 3334 + }, + { + "species": "SPECIES_WURMPLE", + "level": 1, + "probability": 3333 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "TinyWoods3F_Pokemon", + "pokemon": [{ + "species": "SPECIES_PIDGEY", + "level": 1, + "probability": 2857 + }, + { + "species": "SPECIES_EXEGGCUTE", + "level": 1, + "probability": 1429 + }, + { + "species": "SPECIES_SUNKERN", + "level": 1, + "probability": 2857 + }, + { + "species": "SPECIES_WURMPLE", + "level": 1, + "probability": 2857 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }] +} diff --git a/data/dungeon/UnownRelic/floor_id.json b/data/dungeon/UnownRelic/floor_id.json index caa3d81..4e57902 100644 --- a/data/dungeon/UnownRelic/floor_id.json +++ b/data/dungeon/UnownRelic/floor_id.json @@ -1,104 +1,104 @@ -{ - "name": "UnownRelicFloorID", - "tables": [ - { - "MainData": 1340, - "Pokemon": 600, - "Traps": 7, - "Items": 154, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 155 - }, - { - "MainData": 1341, - "Pokemon": 601, - "Traps": 7, - "Items": 154, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 155 - }, - { - "MainData": 1342, - "Pokemon": 602, - "Traps": 7, - "Items": 154, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 155 - }, - { - "MainData": 1343, - "Pokemon": 603, - "Traps": 7, - "Items": 156, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 155 - }, - { - "MainData": 1344, - "Pokemon": 604, - "Traps": 7, - "Items": 156, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 155 - }, - { - "MainData": 1345, - "Pokemon": 605, - "Traps": 7, - "Items": 156, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 155 - }, - { - "MainData": 1346, - "Pokemon": 606, - "Traps": 7, - "Items": 156, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 155 - }, - { - "MainData": 1347, - "Pokemon": 607, - "Traps": 7, - "Items": 156, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 155 - }, - { - "MainData": 1348, - "Pokemon": 608, - "Traps": 7, - "Items": 156, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 155 - }, - { - "MainData": 1349, - "Pokemon": 609, - "Traps": 9, - "Items": 156, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 155 - }, - { - "MainData": 1350, - "Pokemon": 610, - "Traps": 9, - "Items": 156, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 155 - } - ] -} +{ + "name": "UnownRelicFloorID", + "tables": [ + { + "MainData": 1340, + "Pokemon": 600, + "Traps": 7, + "Items": 154, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 155 + }, + { + "MainData": 1341, + "Pokemon": 601, + "Traps": 7, + "Items": 154, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 155 + }, + { + "MainData": 1342, + "Pokemon": 602, + "Traps": 7, + "Items": 154, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 155 + }, + { + "MainData": 1343, + "Pokemon": 603, + "Traps": 7, + "Items": 156, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 155 + }, + { + "MainData": 1344, + "Pokemon": 604, + "Traps": 7, + "Items": 156, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 155 + }, + { + "MainData": 1345, + "Pokemon": 605, + "Traps": 7, + "Items": 156, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 155 + }, + { + "MainData": 1346, + "Pokemon": 606, + "Traps": 7, + "Items": 156, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 155 + }, + { + "MainData": 1347, + "Pokemon": 607, + "Traps": 7, + "Items": 156, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 155 + }, + { + "MainData": 1348, + "Pokemon": 608, + "Traps": 7, + "Items": 156, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 155 + }, + { + "MainData": 1349, + "Pokemon": 609, + "Traps": 9, + "Items": 156, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 155 + }, + { + "MainData": 1350, + "Pokemon": 610, + "Traps": 9, + "Items": 156, + "KecleonShop": 1, + "MonsterRoomItems": 46, + "BuriedItems": 155 + } + ] +} diff --git a/data/dungeon/UproarForest/floor_id.json b/data/dungeon/UproarForest/floor_id.json index d09025d..f9c5723 100644 --- a/data/dungeon/UproarForest/floor_id.json +++ b/data/dungeon/UproarForest/floor_id.json @@ -1,95 +1,95 @@ -{ - "name": "UproarForestFloorID", - "tables": [ - { - "MainData": 1026, - "Pokemon": 475, - "Traps": 10, - "Items": 115, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 1027, - "Pokemon": 475, - "Traps": 10, - "Items": 115, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 1028, - "Pokemon": 475, - "Traps": 10, - "Items": 115, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 1029, - "Pokemon": 476, - "Traps": 10, - "Items": 116, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 1030, - "Pokemon": 477, - "Traps": 10, - "Items": 116, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 1031, - "Pokemon": 478, - "Traps": 10, - "Items": 116, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 1032, - "Pokemon": 479, - "Traps": 10, - "Items": 116, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 1033, - "Pokemon": 480, - "Traps": 10, - "Items": 116, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 1034, - "Pokemon": 480, - "Traps": 10, - "Items": 117, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 1035, - "Pokemon": 480, - "Traps": 10, - "Items": 118, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 66 - } - ] -} +{ + "name": "UproarForestFloorID", + "tables": [ + { + "MainData": 1026, + "Pokemon": 475, + "Traps": 10, + "Items": 115, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1027, + "Pokemon": 475, + "Traps": 10, + "Items": 115, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1028, + "Pokemon": 475, + "Traps": 10, + "Items": 115, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1029, + "Pokemon": 476, + "Traps": 10, + "Items": 116, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1030, + "Pokemon": 477, + "Traps": 10, + "Items": 116, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1031, + "Pokemon": 478, + "Traps": 10, + "Items": 116, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1032, + "Pokemon": 479, + "Traps": 10, + "Items": 116, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1033, + "Pokemon": 480, + "Traps": 10, + "Items": 116, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1034, + "Pokemon": 480, + "Traps": 10, + "Items": 117, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1035, + "Pokemon": 480, + "Traps": 10, + "Items": 118, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 66 + } + ] +} diff --git a/data/dungeon/WaterfallPond/floor_id.json b/data/dungeon/WaterfallPond/floor_id.json index 7c039c8..f8994f8 100644 --- a/data/dungeon/WaterfallPond/floor_id.json +++ b/data/dungeon/WaterfallPond/floor_id.json @@ -1,176 +1,176 @@ -{ - "name": "WaterfallPondFloorID", - "tables": [ - { - "MainData": 1321, - "Pokemon": 585, - "Traps": 93, - "Items": 151, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1322, - "Pokemon": 585, - "Traps": 93, - "Items": 151, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1323, - "Pokemon": 586, - "Traps": 93, - "Items": 151, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1324, - "Pokemon": 587, - "Traps": 93, - "Items": 152, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1325, - "Pokemon": 587, - "Traps": 93, - "Items": 152, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1326, - "Pokemon": 588, - "Traps": 93, - "Items": 152, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1327, - "Pokemon": 589, - "Traps": 93, - "Items": 152, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1328, - "Pokemon": 590, - "Traps": 93, - "Items": 152, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1329, - "Pokemon": 591, - "Traps": 93, - "Items": 152, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1330, - "Pokemon": 591, - "Traps": 93, - "Items": 152, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1331, - "Pokemon": 592, - "Traps": 93, - "Items": 152, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1332, - "Pokemon": 593, - "Traps": 93, - "Items": 152, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1333, - "Pokemon": 594, - "Traps": 93, - "Items": 152, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1334, - "Pokemon": 595, - "Traps": 93, - "Items": 152, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1335, - "Pokemon": 596, - "Traps": 93, - "Items": 152, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1336, - "Pokemon": 597, - "Traps": 93, - "Items": 152, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1337, - "Pokemon": 598, - "Traps": 93, - "Items": 152, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1338, - "Pokemon": 598, - "Traps": 93, - "Items": 153, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1339, - "Pokemon": 599, - "Traps": 93, - "Items": 153, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - } - ] -} +{ + "name": "WaterfallPondFloorID", + "tables": [ + { + "MainData": 1321, + "Pokemon": 585, + "Traps": 93, + "Items": 151, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1322, + "Pokemon": 585, + "Traps": 93, + "Items": 151, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1323, + "Pokemon": 586, + "Traps": 93, + "Items": 151, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1324, + "Pokemon": 587, + "Traps": 93, + "Items": 152, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1325, + "Pokemon": 587, + "Traps": 93, + "Items": 152, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1326, + "Pokemon": 588, + "Traps": 93, + "Items": 152, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1327, + "Pokemon": 589, + "Traps": 93, + "Items": 152, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1328, + "Pokemon": 590, + "Traps": 93, + "Items": 152, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1329, + "Pokemon": 591, + "Traps": 93, + "Items": 152, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1330, + "Pokemon": 591, + "Traps": 93, + "Items": 152, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1331, + "Pokemon": 592, + "Traps": 93, + "Items": 152, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1332, + "Pokemon": 593, + "Traps": 93, + "Items": 152, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1333, + "Pokemon": 594, + "Traps": 93, + "Items": 152, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1334, + "Pokemon": 595, + "Traps": 93, + "Items": 152, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1335, + "Pokemon": 596, + "Traps": 93, + "Items": 152, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1336, + "Pokemon": 597, + "Traps": 93, + "Items": 152, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1337, + "Pokemon": 598, + "Traps": 93, + "Items": 152, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1338, + "Pokemon": 598, + "Traps": 93, + "Items": 153, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1339, + "Pokemon": 599, + "Traps": 93, + "Items": 153, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + } + ] +} diff --git a/data/dungeon/WesternCave/floor_id.json b/data/dungeon/WesternCave/floor_id.json index dbf7683..84ed4c5 100644 --- a/data/dungeon/WesternCave/floor_id.json +++ b/data/dungeon/WesternCave/floor_id.json @@ -1,896 +1,896 @@ -{ - "name": "WesternCaveFloorID", - "tables": [ - { - "MainData": 350, - "Pokemon": 163, - "Traps": 11, - "Items": 60, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 351, - "Pokemon": 163, - "Traps": 11, - "Items": 60, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 352, - "Pokemon": 164, - "Traps": 11, - "Items": 60, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 353, - "Pokemon": 165, - "Traps": 11, - "Items": 60, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 354, - "Pokemon": 165, - "Traps": 11, - "Items": 60, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 355, - "Pokemon": 166, - "Traps": 11, - "Items": 60, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 356, - "Pokemon": 167, - "Traps": 11, - "Items": 60, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 357, - "Pokemon": 168, - "Traps": 11, - "Items": 60, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 358, - "Pokemon": 168, - "Traps": 11, - "Items": 60, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 359, - "Pokemon": 169, - "Traps": 11, - "Items": 63, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 360, - "Pokemon": 170, - "Traps": 11, - "Items": 63, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 361, - "Pokemon": 171, - "Traps": 11, - "Items": 63, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 362, - "Pokemon": 172, - "Traps": 11, - "Items": 63, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 363, - "Pokemon": 173, - "Traps": 11, - "Items": 63, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 364, - "Pokemon": 174, - "Traps": 11, - "Items": 63, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 365, - "Pokemon": 174, - "Traps": 11, - "Items": 63, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 366, - "Pokemon": 175, - "Traps": 11, - "Items": 63, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 367, - "Pokemon": 175, - "Traps": 11, - "Items": 63, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 368, - "Pokemon": 176, - "Traps": 11, - "Items": 63, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 369, - "Pokemon": 177, - "Traps": 11, - "Items": 63, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 370, - "Pokemon": 178, - "Traps": 11, - "Items": 63, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 371, - "Pokemon": 178, - "Traps": 11, - "Items": 63, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 372, - "Pokemon": 178, - "Traps": 11, - "Items": 63, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 373, - "Pokemon": 178, - "Traps": 11, - "Items": 63, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 374, - "Pokemon": 178, - "Traps": 11, - "Items": 63, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 375, - "Pokemon": 178, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 376, - "Pokemon": 179, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 377, - "Pokemon": 180, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 378, - "Pokemon": 181, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 379, - "Pokemon": 182, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 380, - "Pokemon": 183, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 381, - "Pokemon": 183, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 382, - "Pokemon": 183, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 383, - "Pokemon": 183, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 384, - "Pokemon": 183, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 385, - "Pokemon": 184, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 386, - "Pokemon": 185, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 387, - "Pokemon": 186, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 388, - "Pokemon": 187, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 389, - "Pokemon": 188, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 390, - "Pokemon": 189, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 391, - "Pokemon": 189, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 392, - "Pokemon": 189, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 393, - "Pokemon": 189, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 394, - "Pokemon": 190, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 395, - "Pokemon": 190, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 396, - "Pokemon": 190, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 397, - "Pokemon": 190, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 398, - "Pokemon": 191, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 399, - "Pokemon": 192, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 400, - "Pokemon": 192, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 401, - "Pokemon": 192, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 402, - "Pokemon": 192, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 403, - "Pokemon": 193, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 404, - "Pokemon": 193, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 405, - "Pokemon": 193, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 406, - "Pokemon": 193, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 407, - "Pokemon": 193, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 408, - "Pokemon": 194, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 409, - "Pokemon": 195, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 410, - "Pokemon": 196, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 411, - "Pokemon": 197, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 412, - "Pokemon": 197, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 413, - "Pokemon": 197, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 414, - "Pokemon": 197, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 415, - "Pokemon": 197, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 416, - "Pokemon": 197, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 417, - "Pokemon": 197, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 418, - "Pokemon": 198, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 419, - "Pokemon": 199, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 420, - "Pokemon": 199, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 421, - "Pokemon": 199, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 422, - "Pokemon": 199, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 423, - "Pokemon": 199, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 424, - "Pokemon": 199, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 425, - "Pokemon": 199, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 426, - "Pokemon": 199, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 427, - "Pokemon": 199, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 428, - "Pokemon": 200, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 429, - "Pokemon": 201, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 430, - "Pokemon": 201, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 431, - "Pokemon": 201, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 432, - "Pokemon": 201, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 433, - "Pokemon": 201, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 434, - "Pokemon": 201, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 435, - "Pokemon": 201, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 436, - "Pokemon": 202, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 437, - "Pokemon": 202, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 438, - "Pokemon": 203, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 439, - "Pokemon": 203, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 440, - "Pokemon": 203, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 441, - "Pokemon": 204, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 442, - "Pokemon": 204, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 443, - "Pokemon": 204, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 444, - "Pokemon": 204, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 445, - "Pokemon": 204, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 446, - "Pokemon": 204, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 447, - "Pokemon": 204, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - }, - { - "MainData": 448, - "Pokemon": 205, - "Traps": 11, - "Items": 64, - "KecleonShop": 61, - "MonsterRoomItems": 46, - "BuriedItems": 62 - } - ] -} +{ + "name": "WesternCaveFloorID", + "tables": [ + { + "MainData": 350, + "Pokemon": 163, + "Traps": 11, + "Items": 60, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 351, + "Pokemon": 163, + "Traps": 11, + "Items": 60, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 352, + "Pokemon": 164, + "Traps": 11, + "Items": 60, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 353, + "Pokemon": 165, + "Traps": 11, + "Items": 60, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 354, + "Pokemon": 165, + "Traps": 11, + "Items": 60, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 355, + "Pokemon": 166, + "Traps": 11, + "Items": 60, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 356, + "Pokemon": 167, + "Traps": 11, + "Items": 60, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 357, + "Pokemon": 168, + "Traps": 11, + "Items": 60, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 358, + "Pokemon": 168, + "Traps": 11, + "Items": 60, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 359, + "Pokemon": 169, + "Traps": 11, + "Items": 63, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 360, + "Pokemon": 170, + "Traps": 11, + "Items": 63, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 361, + "Pokemon": 171, + "Traps": 11, + "Items": 63, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 362, + "Pokemon": 172, + "Traps": 11, + "Items": 63, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 363, + "Pokemon": 173, + "Traps": 11, + "Items": 63, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 364, + "Pokemon": 174, + "Traps": 11, + "Items": 63, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 365, + "Pokemon": 174, + "Traps": 11, + "Items": 63, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 366, + "Pokemon": 175, + "Traps": 11, + "Items": 63, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 367, + "Pokemon": 175, + "Traps": 11, + "Items": 63, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 368, + "Pokemon": 176, + "Traps": 11, + "Items": 63, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 369, + "Pokemon": 177, + "Traps": 11, + "Items": 63, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 370, + "Pokemon": 178, + "Traps": 11, + "Items": 63, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 371, + "Pokemon": 178, + "Traps": 11, + "Items": 63, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 372, + "Pokemon": 178, + "Traps": 11, + "Items": 63, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 373, + "Pokemon": 178, + "Traps": 11, + "Items": 63, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 374, + "Pokemon": 178, + "Traps": 11, + "Items": 63, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 375, + "Pokemon": 178, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 376, + "Pokemon": 179, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 377, + "Pokemon": 180, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 378, + "Pokemon": 181, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 379, + "Pokemon": 182, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 380, + "Pokemon": 183, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 381, + "Pokemon": 183, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 382, + "Pokemon": 183, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 383, + "Pokemon": 183, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 384, + "Pokemon": 183, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 385, + "Pokemon": 184, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 386, + "Pokemon": 185, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 387, + "Pokemon": 186, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 388, + "Pokemon": 187, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 389, + "Pokemon": 188, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 390, + "Pokemon": 189, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 391, + "Pokemon": 189, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 392, + "Pokemon": 189, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 393, + "Pokemon": 189, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 394, + "Pokemon": 190, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 395, + "Pokemon": 190, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 396, + "Pokemon": 190, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 397, + "Pokemon": 190, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 398, + "Pokemon": 191, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 399, + "Pokemon": 192, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 400, + "Pokemon": 192, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 401, + "Pokemon": 192, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 402, + "Pokemon": 192, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 403, + "Pokemon": 193, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 404, + "Pokemon": 193, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 405, + "Pokemon": 193, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 406, + "Pokemon": 193, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 407, + "Pokemon": 193, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 408, + "Pokemon": 194, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 409, + "Pokemon": 195, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 410, + "Pokemon": 196, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 411, + "Pokemon": 197, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 412, + "Pokemon": 197, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 413, + "Pokemon": 197, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 414, + "Pokemon": 197, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 415, + "Pokemon": 197, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 416, + "Pokemon": 197, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 417, + "Pokemon": 197, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 418, + "Pokemon": 198, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 419, + "Pokemon": 199, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 420, + "Pokemon": 199, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 421, + "Pokemon": 199, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 422, + "Pokemon": 199, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 423, + "Pokemon": 199, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 424, + "Pokemon": 199, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 425, + "Pokemon": 199, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 426, + "Pokemon": 199, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 427, + "Pokemon": 199, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 428, + "Pokemon": 200, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 429, + "Pokemon": 201, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 430, + "Pokemon": 201, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 431, + "Pokemon": 201, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 432, + "Pokemon": 201, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 433, + "Pokemon": 201, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 434, + "Pokemon": 201, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 435, + "Pokemon": 201, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 436, + "Pokemon": 202, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 437, + "Pokemon": 202, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 438, + "Pokemon": 203, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 439, + "Pokemon": 203, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 440, + "Pokemon": 203, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 441, + "Pokemon": 204, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 442, + "Pokemon": 204, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 443, + "Pokemon": 204, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 444, + "Pokemon": 204, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 445, + "Pokemon": 204, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 446, + "Pokemon": 204, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 447, + "Pokemon": 204, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + }, + { + "MainData": 448, + "Pokemon": 205, + "Traps": 11, + "Items": 64, + "KecleonShop": 61, + "MonsterRoomItems": 46, + "BuriedItems": 62 + } + ] +} diff --git a/data/dungeon/WishCave/floor_id.json b/data/dungeon/WishCave/floor_id.json index 9a2ef71..c1898ee 100644 --- a/data/dungeon/WishCave/floor_id.json +++ b/data/dungeon/WishCave/floor_id.json @@ -1,896 +1,896 @@ -{ - "name": "WishCaveFloorID", - "tables": [ - { - "MainData": 480, - "Pokemon": 215, - "Traps": 30, - "Items": 74, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 481, - "Pokemon": 216, - "Traps": 30, - "Items": 74, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 482, - "Pokemon": 216, - "Traps": 30, - "Items": 74, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 483, - "Pokemon": 217, - "Traps": 30, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 484, - "Pokemon": 218, - "Traps": 31, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 485, - "Pokemon": 218, - "Traps": 31, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 486, - "Pokemon": 219, - "Traps": 31, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 487, - "Pokemon": 220, - "Traps": 31, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 488, - "Pokemon": 220, - "Traps": 31, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 489, - "Pokemon": 220, - "Traps": 32, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 490, - "Pokemon": 221, - "Traps": 33, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 491, - "Pokemon": 222, - "Traps": 33, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 492, - "Pokemon": 223, - "Traps": 32, - "Items": 76, - "KecleonShop": 77, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 493, - "Pokemon": 224, - "Traps": 32, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 494, - "Pokemon": 225, - "Traps": 32, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 495, - "Pokemon": 225, - "Traps": 32, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 496, - "Pokemon": 226, - "Traps": 32, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 497, - "Pokemon": 227, - "Traps": 32, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 498, - "Pokemon": 227, - "Traps": 32, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 499, - "Pokemon": 228, - "Traps": 34, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 500, - "Pokemon": 229, - "Traps": 35, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 501, - "Pokemon": 229, - "Traps": 35, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 502, - "Pokemon": 229, - "Traps": 35, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 503, - "Pokemon": 229, - "Traps": 35, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 504, - "Pokemon": 229, - "Traps": 35, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 505, - "Pokemon": 230, - "Traps": 35, - "Items": 76, - "KecleonShop": 77, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 506, - "Pokemon": 230, - "Traps": 35, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 507, - "Pokemon": 230, - "Traps": 35, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 508, - "Pokemon": 231, - "Traps": 35, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 509, - "Pokemon": 231, - "Traps": 36, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 510, - "Pokemon": 232, - "Traps": 36, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 511, - "Pokemon": 232, - "Traps": 36, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 512, - "Pokemon": 233, - "Traps": 36, - "Items": 76, - "KecleonShop": 77, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 513, - "Pokemon": 234, - "Traps": 36, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 514, - "Pokemon": 234, - "Traps": 36, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 515, - "Pokemon": 235, - "Traps": 36, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 516, - "Pokemon": 235, - "Traps": 36, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 517, - "Pokemon": 236, - "Traps": 36, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 518, - "Pokemon": 237, - "Traps": 36, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 519, - "Pokemon": 237, - "Traps": 37, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 520, - "Pokemon": 238, - "Traps": 37, - "Items": 76, - "KecleonShop": 77, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 521, - "Pokemon": 239, - "Traps": 37, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 522, - "Pokemon": 240, - "Traps": 37, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 523, - "Pokemon": 241, - "Traps": 37, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 524, - "Pokemon": 242, - "Traps": 37, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 525, - "Pokemon": 243, - "Traps": 37, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 526, - "Pokemon": 244, - "Traps": 37, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 527, - "Pokemon": 244, - "Traps": 37, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 528, - "Pokemon": 244, - "Traps": 37, - "Items": 76, - "KecleonShop": 77, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 529, - "Pokemon": 245, - "Traps": 38, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 530, - "Pokemon": 246, - "Traps": 39, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 531, - "Pokemon": 246, - "Traps": 39, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 532, - "Pokemon": 247, - "Traps": 39, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 533, - "Pokemon": 248, - "Traps": 39, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 534, - "Pokemon": 248, - "Traps": 39, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 535, - "Pokemon": 249, - "Traps": 39, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 536, - "Pokemon": 250, - "Traps": 39, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 537, - "Pokemon": 251, - "Traps": 39, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 538, - "Pokemon": 252, - "Traps": 39, - "Items": 76, - "KecleonShop": 77, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 539, - "Pokemon": 253, - "Traps": 40, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 540, - "Pokemon": 254, - "Traps": 40, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 541, - "Pokemon": 255, - "Traps": 40, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 542, - "Pokemon": 255, - "Traps": 40, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 543, - "Pokemon": 256, - "Traps": 40, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 544, - "Pokemon": 257, - "Traps": 40, - "Items": 76, - "KecleonShop": 77, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 545, - "Pokemon": 257, - "Traps": 40, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 546, - "Pokemon": 257, - "Traps": 40, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 547, - "Pokemon": 257, - "Traps": 40, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 548, - "Pokemon": 257, - "Traps": 40, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 549, - "Pokemon": 258, - "Traps": 41, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 550, - "Pokemon": 259, - "Traps": 42, - "Items": 76, - "KecleonShop": 77, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 551, - "Pokemon": 260, - "Traps": 42, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 552, - "Pokemon": 260, - "Traps": 43, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 553, - "Pokemon": 261, - "Traps": 44, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 554, - "Pokemon": 261, - "Traps": 42, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 555, - "Pokemon": 262, - "Traps": 42, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 556, - "Pokemon": 263, - "Traps": 42, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 557, - "Pokemon": 264, - "Traps": 42, - "Items": 76, - "KecleonShop": 77, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 558, - "Pokemon": 265, - "Traps": 45, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 559, - "Pokemon": 266, - "Traps": 46, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 560, - "Pokemon": 267, - "Traps": 47, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 561, - "Pokemon": 267, - "Traps": 47, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 562, - "Pokemon": 268, - "Traps": 47, - "Items": 76, - "KecleonShop": 77, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 563, - "Pokemon": 268, - "Traps": 47, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 564, - "Pokemon": 269, - "Traps": 47, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 565, - "Pokemon": 270, - "Traps": 47, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 566, - "Pokemon": 270, - "Traps": 47, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 567, - "Pokemon": 270, - "Traps": 47, - "Items": 76, - "KecleonShop": 78, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 568, - "Pokemon": 271, - "Traps": 47, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 569, - "Pokemon": 272, - "Traps": 47, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 570, - "Pokemon": 272, - "Traps": 47, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 571, - "Pokemon": 272, - "Traps": 47, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 572, - "Pokemon": 272, - "Traps": 47, - "Items": 76, - "KecleonShop": 78, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 573, - "Pokemon": 273, - "Traps": 47, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 574, - "Pokemon": 273, - "Traps": 47, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 575, - "Pokemon": 274, - "Traps": 47, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 576, - "Pokemon": 275, - "Traps": 47, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 577, - "Pokemon": 276, - "Traps": 47, - "Items": 76, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 578, - "Pokemon": 277, - "Traps": 47, - "Items": 79, - "KecleonShop": 75, - "MonsterRoomItems": 46, - "BuriedItems": 3 - } - ] -} +{ + "name": "WishCaveFloorID", + "tables": [ + { + "MainData": 480, + "Pokemon": 215, + "Traps": 30, + "Items": 74, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 481, + "Pokemon": 216, + "Traps": 30, + "Items": 74, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 482, + "Pokemon": 216, + "Traps": 30, + "Items": 74, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 483, + "Pokemon": 217, + "Traps": 30, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 484, + "Pokemon": 218, + "Traps": 31, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 485, + "Pokemon": 218, + "Traps": 31, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 486, + "Pokemon": 219, + "Traps": 31, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 487, + "Pokemon": 220, + "Traps": 31, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 488, + "Pokemon": 220, + "Traps": 31, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 489, + "Pokemon": 220, + "Traps": 32, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 490, + "Pokemon": 221, + "Traps": 33, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 491, + "Pokemon": 222, + "Traps": 33, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 492, + "Pokemon": 223, + "Traps": 32, + "Items": 76, + "KecleonShop": 77, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 493, + "Pokemon": 224, + "Traps": 32, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 494, + "Pokemon": 225, + "Traps": 32, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 495, + "Pokemon": 225, + "Traps": 32, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 496, + "Pokemon": 226, + "Traps": 32, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 497, + "Pokemon": 227, + "Traps": 32, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 498, + "Pokemon": 227, + "Traps": 32, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 499, + "Pokemon": 228, + "Traps": 34, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 500, + "Pokemon": 229, + "Traps": 35, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 501, + "Pokemon": 229, + "Traps": 35, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 502, + "Pokemon": 229, + "Traps": 35, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 503, + "Pokemon": 229, + "Traps": 35, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 504, + "Pokemon": 229, + "Traps": 35, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 505, + "Pokemon": 230, + "Traps": 35, + "Items": 76, + "KecleonShop": 77, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 506, + "Pokemon": 230, + "Traps": 35, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 507, + "Pokemon": 230, + "Traps": 35, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 508, + "Pokemon": 231, + "Traps": 35, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 509, + "Pokemon": 231, + "Traps": 36, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 510, + "Pokemon": 232, + "Traps": 36, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 511, + "Pokemon": 232, + "Traps": 36, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 512, + "Pokemon": 233, + "Traps": 36, + "Items": 76, + "KecleonShop": 77, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 513, + "Pokemon": 234, + "Traps": 36, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 514, + "Pokemon": 234, + "Traps": 36, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 515, + "Pokemon": 235, + "Traps": 36, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 516, + "Pokemon": 235, + "Traps": 36, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 517, + "Pokemon": 236, + "Traps": 36, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 518, + "Pokemon": 237, + "Traps": 36, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 519, + "Pokemon": 237, + "Traps": 37, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 520, + "Pokemon": 238, + "Traps": 37, + "Items": 76, + "KecleonShop": 77, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 521, + "Pokemon": 239, + "Traps": 37, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 522, + "Pokemon": 240, + "Traps": 37, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 523, + "Pokemon": 241, + "Traps": 37, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 524, + "Pokemon": 242, + "Traps": 37, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 525, + "Pokemon": 243, + "Traps": 37, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 526, + "Pokemon": 244, + "Traps": 37, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 527, + "Pokemon": 244, + "Traps": 37, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 528, + "Pokemon": 244, + "Traps": 37, + "Items": 76, + "KecleonShop": 77, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 529, + "Pokemon": 245, + "Traps": 38, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 530, + "Pokemon": 246, + "Traps": 39, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 531, + "Pokemon": 246, + "Traps": 39, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 532, + "Pokemon": 247, + "Traps": 39, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 533, + "Pokemon": 248, + "Traps": 39, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 534, + "Pokemon": 248, + "Traps": 39, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 535, + "Pokemon": 249, + "Traps": 39, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 536, + "Pokemon": 250, + "Traps": 39, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 537, + "Pokemon": 251, + "Traps": 39, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 538, + "Pokemon": 252, + "Traps": 39, + "Items": 76, + "KecleonShop": 77, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 539, + "Pokemon": 253, + "Traps": 40, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 540, + "Pokemon": 254, + "Traps": 40, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 541, + "Pokemon": 255, + "Traps": 40, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 542, + "Pokemon": 255, + "Traps": 40, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 543, + "Pokemon": 256, + "Traps": 40, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 544, + "Pokemon": 257, + "Traps": 40, + "Items": 76, + "KecleonShop": 77, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 545, + "Pokemon": 257, + "Traps": 40, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 546, + "Pokemon": 257, + "Traps": 40, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 547, + "Pokemon": 257, + "Traps": 40, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 548, + "Pokemon": 257, + "Traps": 40, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 549, + "Pokemon": 258, + "Traps": 41, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 550, + "Pokemon": 259, + "Traps": 42, + "Items": 76, + "KecleonShop": 77, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 551, + "Pokemon": 260, + "Traps": 42, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 552, + "Pokemon": 260, + "Traps": 43, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 553, + "Pokemon": 261, + "Traps": 44, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 554, + "Pokemon": 261, + "Traps": 42, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 555, + "Pokemon": 262, + "Traps": 42, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 556, + "Pokemon": 263, + "Traps": 42, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 557, + "Pokemon": 264, + "Traps": 42, + "Items": 76, + "KecleonShop": 77, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 558, + "Pokemon": 265, + "Traps": 45, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 559, + "Pokemon": 266, + "Traps": 46, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 560, + "Pokemon": 267, + "Traps": 47, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 561, + "Pokemon": 267, + "Traps": 47, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 562, + "Pokemon": 268, + "Traps": 47, + "Items": 76, + "KecleonShop": 77, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 563, + "Pokemon": 268, + "Traps": 47, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 564, + "Pokemon": 269, + "Traps": 47, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 565, + "Pokemon": 270, + "Traps": 47, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 566, + "Pokemon": 270, + "Traps": 47, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 567, + "Pokemon": 270, + "Traps": 47, + "Items": 76, + "KecleonShop": 78, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 568, + "Pokemon": 271, + "Traps": 47, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 569, + "Pokemon": 272, + "Traps": 47, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 570, + "Pokemon": 272, + "Traps": 47, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 571, + "Pokemon": 272, + "Traps": 47, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 572, + "Pokemon": 272, + "Traps": 47, + "Items": 76, + "KecleonShop": 78, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 573, + "Pokemon": 273, + "Traps": 47, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 574, + "Pokemon": 273, + "Traps": 47, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 575, + "Pokemon": 274, + "Traps": 47, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 576, + "Pokemon": 275, + "Traps": 47, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 577, + "Pokemon": 276, + "Traps": 47, + "Items": 76, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + }, + { + "MainData": 578, + "Pokemon": 277, + "Traps": 47, + "Items": 79, + "KecleonShop": 75, + "MonsterRoomItems": 46, + "BuriedItems": 3 + } + ] +} diff --git a/data/dungeon/WondrousSea/floor_id.json b/data/dungeon/WondrousSea/floor_id.json index 6c47397..93274a2 100644 --- a/data/dungeon/WondrousSea/floor_id.json +++ b/data/dungeon/WondrousSea/floor_id.json @@ -1,113 +1,113 @@ -{ - "name": "WondrousSeaFloorID", - "tables": [ - { - "MainData": 965, - "Pokemon": 448, - "Traps": 63, - "Items": 87, - "KecleonShop": 19, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 966, - "Pokemon": 448, - "Traps": 63, - "Items": 87, - "KecleonShop": 19, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 967, - "Pokemon": 448, - "Traps": 63, - "Items": 87, - "KecleonShop": 19, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 968, - "Pokemon": 448, - "Traps": 63, - "Items": 88, - "KecleonShop": 19, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 969, - "Pokemon": 448, - "Traps": 63, - "Items": 88, - "KecleonShop": 19, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 970, - "Pokemon": 448, - "Traps": 63, - "Items": 88, - "KecleonShop": 19, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 971, - "Pokemon": 448, - "Traps": 63, - "Items": 88, - "KecleonShop": 19, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 972, - "Pokemon": 448, - "Traps": 63, - "Items": 88, - "KecleonShop": 19, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 973, - "Pokemon": 448, - "Traps": 63, - "Items": 88, - "KecleonShop": 19, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 974, - "Pokemon": 448, - "Traps": 63, - "Items": 88, - "KecleonShop": 19, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 975, - "Pokemon": 448, - "Traps": 63, - "Items": 88, - "KecleonShop": 19, - "MonsterRoomItems": 2, - "BuriedItems": 66 - }, - { - "MainData": 976, - "Pokemon": 448, - "Traps": 85, - "Items": 88, - "KecleonShop": 19, - "MonsterRoomItems": 2, - "BuriedItems": 66 - } - ] -} +{ + "name": "WondrousSeaFloorID", + "tables": [ + { + "MainData": 965, + "Pokemon": 448, + "Traps": 63, + "Items": 87, + "KecleonShop": 19, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 966, + "Pokemon": 448, + "Traps": 63, + "Items": 87, + "KecleonShop": 19, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 967, + "Pokemon": 448, + "Traps": 63, + "Items": 87, + "KecleonShop": 19, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 968, + "Pokemon": 448, + "Traps": 63, + "Items": 88, + "KecleonShop": 19, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 969, + "Pokemon": 448, + "Traps": 63, + "Items": 88, + "KecleonShop": 19, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 970, + "Pokemon": 448, + "Traps": 63, + "Items": 88, + "KecleonShop": 19, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 971, + "Pokemon": 448, + "Traps": 63, + "Items": 88, + "KecleonShop": 19, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 972, + "Pokemon": 448, + "Traps": 63, + "Items": 88, + "KecleonShop": 19, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 973, + "Pokemon": 448, + "Traps": 63, + "Items": 88, + "KecleonShop": 19, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 974, + "Pokemon": 448, + "Traps": 63, + "Items": 88, + "KecleonShop": 19, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 975, + "Pokemon": 448, + "Traps": 63, + "Items": 88, + "KecleonShop": 19, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 976, + "Pokemon": 448, + "Traps": 85, + "Items": 88, + "KecleonShop": 19, + "MonsterRoomItems": 2, + "BuriedItems": 66 + } + ] +} diff --git a/data/dungeon/WyvernHill/floor_id.json b/data/dungeon/WyvernHill/floor_id.json index 33e728a..b64db48 100644 --- a/data/dungeon/WyvernHill/floor_id.json +++ b/data/dungeon/WyvernHill/floor_id.json @@ -1,275 +1,275 @@ -{ - "name": "WyvernHillFloorID", - "tables": [ - { - "MainData": 810, - "Pokemon": 366, - "Traps": 7, - "Items": 96, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 811, - "Pokemon": 366, - "Traps": 7, - "Items": 96, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 812, - "Pokemon": 366, - "Traps": 7, - "Items": 96, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 813, - "Pokemon": 367, - "Traps": 7, - "Items": 96, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 814, - "Pokemon": 368, - "Traps": 7, - "Items": 96, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 815, - "Pokemon": 369, - "Traps": 7, - "Items": 96, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 816, - "Pokemon": 369, - "Traps": 7, - "Items": 96, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 817, - "Pokemon": 369, - "Traps": 7, - "Items": 96, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 818, - "Pokemon": 370, - "Traps": 7, - "Items": 96, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 819, - "Pokemon": 371, - "Traps": 9, - "Items": 96, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 820, - "Pokemon": 371, - "Traps": 9, - "Items": 96, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 821, - "Pokemon": 372, - "Traps": 9, - "Items": 96, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 822, - "Pokemon": 373, - "Traps": 9, - "Items": 96, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 823, - "Pokemon": 373, - "Traps": 9, - "Items": 96, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 824, - "Pokemon": 373, - "Traps": 9, - "Items": 96, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 825, - "Pokemon": 374, - "Traps": 9, - "Items": 96, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 826, - "Pokemon": 375, - "Traps": 9, - "Items": 96, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 827, - "Pokemon": 375, - "Traps": 9, - "Items": 96, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 828, - "Pokemon": 375, - "Traps": 9, - "Items": 96, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 829, - "Pokemon": 375, - "Traps": 9, - "Items": 96, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 830, - "Pokemon": 376, - "Traps": 9, - "Items": 96, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 831, - "Pokemon": 377, - "Traps": 9, - "Items": 96, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 832, - "Pokemon": 377, - "Traps": 9, - "Items": 96, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 833, - "Pokemon": 378, - "Traps": 9, - "Items": 96, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 834, - "Pokemon": 379, - "Traps": 9, - "Items": 96, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 835, - "Pokemon": 379, - "Traps": 9, - "Items": 96, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 836, - "Pokemon": 379, - "Traps": 9, - "Items": 96, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 837, - "Pokemon": 379, - "Traps": 9, - "Items": 96, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 838, - "Pokemon": 379, - "Traps": 9, - "Items": 97, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - }, - { - "MainData": 839, - "Pokemon": 380, - "Traps": 71, - "Items": 97, - "KecleonShop": 94, - "MonsterRoomItems": 46, - "BuriedItems": 66 - } - ] -} +{ + "name": "WyvernHillFloorID", + "tables": [ + { + "MainData": 810, + "Pokemon": 366, + "Traps": 7, + "Items": 96, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 811, + "Pokemon": 366, + "Traps": 7, + "Items": 96, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 812, + "Pokemon": 366, + "Traps": 7, + "Items": 96, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 813, + "Pokemon": 367, + "Traps": 7, + "Items": 96, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 814, + "Pokemon": 368, + "Traps": 7, + "Items": 96, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 815, + "Pokemon": 369, + "Traps": 7, + "Items": 96, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 816, + "Pokemon": 369, + "Traps": 7, + "Items": 96, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 817, + "Pokemon": 369, + "Traps": 7, + "Items": 96, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 818, + "Pokemon": 370, + "Traps": 7, + "Items": 96, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 819, + "Pokemon": 371, + "Traps": 9, + "Items": 96, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 820, + "Pokemon": 371, + "Traps": 9, + "Items": 96, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 821, + "Pokemon": 372, + "Traps": 9, + "Items": 96, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 822, + "Pokemon": 373, + "Traps": 9, + "Items": 96, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 823, + "Pokemon": 373, + "Traps": 9, + "Items": 96, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 824, + "Pokemon": 373, + "Traps": 9, + "Items": 96, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 825, + "Pokemon": 374, + "Traps": 9, + "Items": 96, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 826, + "Pokemon": 375, + "Traps": 9, + "Items": 96, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 827, + "Pokemon": 375, + "Traps": 9, + "Items": 96, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 828, + "Pokemon": 375, + "Traps": 9, + "Items": 96, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 829, + "Pokemon": 375, + "Traps": 9, + "Items": 96, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 830, + "Pokemon": 376, + "Traps": 9, + "Items": 96, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 831, + "Pokemon": 377, + "Traps": 9, + "Items": 96, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 832, + "Pokemon": 377, + "Traps": 9, + "Items": 96, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 833, + "Pokemon": 378, + "Traps": 9, + "Items": 96, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 834, + "Pokemon": 379, + "Traps": 9, + "Items": 96, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 835, + "Pokemon": 379, + "Traps": 9, + "Items": 96, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 836, + "Pokemon": 379, + "Traps": 9, + "Items": 96, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 837, + "Pokemon": 379, + "Traps": 9, + "Items": 96, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 838, + "Pokemon": 379, + "Traps": 9, + "Items": 97, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + }, + { + "MainData": 839, + "Pokemon": 380, + "Traps": 71, + "Items": 97, + "KecleonShop": 94, + "MonsterRoomItems": 46, + "BuriedItems": 66 + } + ] +} diff --git a/include/friend_area_action_menu.h b/include/friend_area_action_menu.h index 7c23336..aa82d6b 100644 --- a/include/friend_area_action_menu.h +++ b/include/friend_area_action_menu.h @@ -16,7 +16,7 @@ struct unkStruct_203B2BC s16 unk8; u16 unkA; u32 unkC; - struct ItemStruct_203B460_ALT unk10; + struct ItemSlot_ALT unk10; u8 unk14; u8 fill15[3]; struct unkSubStruct_203B2BC *unk18; diff --git a/include/friend_rescue.h b/include/friend_rescue.h index 01fee94..f7bbe50 100644 --- a/include/friend_rescue.h +++ b/include/friend_rescue.h @@ -21,7 +21,7 @@ struct WonderMailStruct_203B33C u32 unk35C; u8 padding5[0x5C]; struct UnkTextStruct2 unk3BC[4]; - struct ItemStruct_203B460 unk41C; + struct ItemSlot unk41C; u32 unk420; // Is this supposed to be a File like 203B2C4? u8 fill424[0x524 - 0x424]; s32 unk524; diff --git a/include/gUnknown_203B460.h b/include/gUnknown_203B460.h deleted file mode 100644 index 880fef8..0000000 --- a/include/gUnknown_203B460.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef GUARD_GUNKNOWN_203B460_H -#define GUARD_GUNKNOWN_203B460_H - -struct subStruct_203B460 -{ - u8 unk0; - u8 unk1; -}; - -struct unkStruct_203B460 -{ - struct ItemStruct_203B460 fill0[20]; - u16 unk50[0xF0]; - struct subStruct_203B460 unk230[8]; - struct subStruct_203B460 unk250[4]; // TODO: idk if this is identical struct or not.. Ghidra says sizes are same - /* 0x260 */ s32 teamMoney; - /* 0x264 */ u32 teamSavings; -}; - -#endif diff --git a/include/item.h b/include/item.h index ad60657..bb358b5 100644 --- a/include/item.h +++ b/include/item.h @@ -21,14 +21,14 @@ struct Item /* 0x1F */ u8 fill3; }; -struct ItemStruct_203B460 +struct ItemSlot { - u8 unk0; + u8 unk0; // some sort of flags, bit 0 seems to indicate an empty slot u8 numItems; u8 itemIndex; }; -struct ItemStruct_203B460_ALT +struct ItemSlot_ALT { u8 itemIndex; u8 numItems; @@ -69,22 +69,272 @@ enum ItemCategory ITEM_CATEGORY_ORBS }; +// see https://bulbapedia.bulbagarden.net/wiki/List_of_items_by_index_number_(Rescue_Team) +enum ItemID { + ITEM_ID_NOTHING, + ITEM_ID_STICK, + ITEM_ID_IRON_THORN, + ITEM_ID_SILVER_SPIKE, + ITEM_ID_GOLD_FANG, + ITEM_ID_CACNEA_SPIKE, + ITEM_ID_CORSOLA_TWIG, + ITEM_ID_GRAVELEROCK, + ITEM_ID_GEO_PEBBLE, + ITEM_ID_MOBILE_SCARF, + ITEM_ID_HEAL_RIBBON, + ITEM_ID_TWIST_BAND, + ITEM_ID_SCOPE_LENS, + ITEM_ID_PATSY_BAND, + ITEM_ID_NOSTICK_CAP, + ITEM_ID_PIERCE_BAND, + ITEM_ID_JOY_RIBBON, + ITEM_ID_X_RAY_SPECS, + ITEM_ID_PERSIM_BAND, + ITEM_ID_POWER_BAND, + ITEM_ID_PECHA_SCARF, + ITEM_ID_INSOMNISCOPE, + ITEM_ID_WARP_SCARF, + ITEM_ID_TIGHT_BELT, + ITEM_ID_SNEAK_SCARF, + ITEM_ID_GOLD_RIBBON, + ITEM_ID_GOGGLE_SPECS, + ITEM_ID_DIET_RIBBON, + ITEM_ID_TRAP_SCARF, + ITEM_ID_RACKET_BAND, + ITEM_ID_DEF_SCARF, + ITEM_ID_STAMINA_BAND, + ITEM_ID_PLAIN_RIBBON, + ITEM_ID_SPECIAL_BAND, + ITEM_ID_ZINC_BAND, + ITEM_ID_DETECT_BAND, + ITEM_ID_ALERT_SPECS, + ITEM_ID_DODGE_SCARF, + ITEM_ID_BOUNCE_BAND, + ITEM_ID_CURVE_BAND, + ITEM_ID_WHIFF_SPECS, + ITEM_ID_NO_AIM_SCOPE, + ITEM_ID_LOCKON_SPECS, + ITEM_ID_MUNCH_BELT, + ITEM_ID_PASS_SCARF, + ITEM_ID_WEATHER_BAND, + ITEM_ID_FRIEND_BOW, + ITEM_ID_BEAUTY_SCARF, + ITEM_ID_SUN_RIBBON, + ITEM_ID_LUNAR_RIBBON, + ITEM_ID_RING_D, + ITEM_ID_RING_E, + ITEM_ID_RING_F, + ITEM_ID_HEAL_SEED, + ITEM_ID_WISH_STONE, + ITEM_ID_ORAN_BERRY, + ITEM_ID_SITRUS_BERRY, + ITEM_ID_EYEDROP_SEED, + ITEM_ID_REVIVER_SEED, + ITEM_ID_BLINKER_SEED, + ITEM_ID_DOOM_SEED, + ITEM_ID_ALLURE_SEED, + ITEM_ID_LIFE_SEED, + ITEM_ID_RAWST_BERRY, + ITEM_ID_HUNGER_SEED, + ITEM_ID_QUICK_SEED, + ITEM_ID_PECHA_BERRY, + ITEM_ID_CHERI_BERRY, + ITEM_ID_TOTTER_SEED, + ITEM_ID_SLEEP_SEED, + ITEM_ID_PLAIN_SEED, + ITEM_ID_WARP_SEED, + ITEM_ID_BLAST_SEED, + ITEM_ID_GINSENG, + ITEM_ID_JOY_SEED, + ITEM_ID_CHESTO_BERRY, + ITEM_ID_STUN_SEED, + ITEM_ID_MAX_ELIXIR, + ITEM_ID_PROTEIN, + ITEM_ID_CALCIUM, + ITEM_ID_IRON, + ITEM_ID_ZINC, + ITEM_ID_APPLE, + ITEM_ID_BIG_APPLE, + ITEM_ID_GRIMY_FOOD, + ITEM_ID_HUGE_APPLE, + ITEM_ID_WHITE_GUMMI, + ITEM_ID_RED_GUMMI, + ITEM_ID_BLUE_GUMMI, + ITEM_ID_GRASS_GUMMI, + ITEM_ID_YELLOW_GUMMI, + ITEM_ID_CLEAR_GUMMI, + ITEM_ID_ORANGE_GUMMI, + ITEM_ID_PINK_GUMMI, + ITEM_ID_BROWN_GUMMI, + ITEM_ID_SKY_GUMMI, + ITEM_ID_GOLD_GUMMI, + ITEM_ID_GREEN_GUMMI, + ITEM_ID_GRAY_GUMMI, + ITEM_ID_PURPLE_GUMMI, + ITEM_ID_ROYAL_GUMMI, + ITEM_ID_BLACK_GUMMI, + ITEM_ID_SILVER_GUMMI, + ITEM_ID_BANANA, + ITEM_ID_CHESTNUT, + ITEM_ID_POKE, // 105 (0x69) + ITEM_ID_UPGRADE, + ITEM_ID_KINGS_ROCK, + ITEM_ID_THUNDERSTONE, + ITEM_ID_DEEPSEASCALE, + ITEM_ID_DEEPSEATOOTH, + ITEM_ID_SUN_STONE, + ITEM_ID_MOON_STONE, + ITEM_ID_FIRE_STONE, + ITEM_ID_WATER_STONE, + ITEM_ID_METAL_COAT, + ITEM_ID_LEAF_STONE, + ITEM_ID_DRAGON_SCALE, + ITEM_ID_LINK_CABLE, + ITEM_ID_ICE_PART, + ITEM_ID_STEEL_PART, + ITEM_ID_ROCK_PART, + ITEM_ID_MUSIC_BOX, + ITEM_ID_KEY, + ITEM_ID_USED_TM, + ITEM_ID_FOCUS_PUNCH, + ITEM_ID_DRAGON_CLAW, + ITEM_ID_WATER_PULSE, + ITEM_ID_CALM_MIND, + ITEM_ID_ROAR, + ITEM_ID_TOXIC, + ITEM_ID_HAIL_ORB, + ITEM_ID_BULK_UP, + ITEM_ID_BULLET_SEED, + ITEM_ID_HIDDEN_POWER, + ITEM_ID_SUNNY_ORB, + ITEM_ID_TAUNT, + ITEM_ID_ICE_BEAM, + ITEM_ID_BLIZZARD, + ITEM_ID_HYPER_BEAM, + ITEM_ID_LIGHT_SCREEN, + ITEM_ID_PROTECT, + ITEM_ID_RAINY_ORB, + ITEM_ID_GIGA_DRAIN, + ITEM_ID_SAFEGUARD, + ITEM_ID_FRUSTRATION, + ITEM_ID_SOLARBEAM, + ITEM_ID_IRON_TAIL, + ITEM_ID_THUNDERBOLT, + ITEM_ID_THUNDER, + ITEM_ID_EARTHQUAKE, + ITEM_ID_RETURN, + ITEM_ID_DIG, + ITEM_ID_PSYCHIC, + ITEM_ID_SHADOW_BALL, + ITEM_ID_BRICK_BREAK, + ITEM_ID_EVASION_ORB, + ITEM_ID_REFLECT, + ITEM_ID_SHOCK_WAVE, + ITEM_ID_FLAMETHROWER, + ITEM_ID_SLUDGE_BOMB, + ITEM_ID_SANDY_ORB, + ITEM_ID_FIRE_BLAST, + ITEM_ID_ROCKY_ORB, + ITEM_ID_AERIAL_ACE, + ITEM_ID_TORMENT, + ITEM_ID_FACADE, + ITEM_ID_SECRET_POWER, + ITEM_ID_REST, + ITEM_ID_ATTRACT, + ITEM_ID_THIEF, + ITEM_ID_STEEL_WING, + ITEM_ID_SKILL_SWAP, + ITEM_ID_SNATCH_ORB, + ITEM_ID_OVERHEAT, + ITEM_ID_WIDE_SLASH, + ITEM_ID_EXCAVATE, + ITEM_ID_SPIN_SLASH, + ITEM_ID_SEE_TRAP_ORB, + ITEM_ID_MUG_ORB, + ITEM_ID_REBOUND_ORB, + ITEM_ID_LOB_ORB, + ITEM_ID_SWITCHER_ORB, + ITEM_ID_BLOWBACK_ORB, + ITEM_ID_WARP_ORB, + ITEM_ID_TRANSFER_ORB, + ITEM_ID_SLOW_ORB, + ITEM_ID_QUICK_ORB, + ITEM_ID_LUMINOUS_ORB, + ITEM_ID_PETRIFY_ORB, + ITEM_ID_STAYAWAY_ORB, + ITEM_ID_POUNCE_ORB, + ITEM_ID_TRAWL_ORB, + ITEM_ID_CLEANSE_ORB, + ITEM_ID_OBSERVER_ORB, + ITEM_ID_DECOY_ORB, + ITEM_ID_SLUMBER_ORB, + ITEM_ID_TOTTER_ORB, + ITEM_ID_TWO_EDGE_ORB, + ITEM_ID_SILENCE_ORB, + ITEM_ID_ESCAPE_ORB, + ITEM_ID_SCANNER_ORB, + ITEM_ID_RADAR_ORB, + ITEM_ID_DROUGHT_ORB, + ITEM_ID_TRAPBUST_ORB, + ITEM_ID_ROLLCALL_ORB, + ITEM_ID_INVISIFY_ORB, + ITEM_ID_ONE_SHOT_ORB, + ITEM_ID_IDENTIFY_ORB, + ITEM_ID_VACUUM_CUT, + ITEM_ID_REVIVER_ORB, + ITEM_ID_SHOCKER_ORB, + ITEM_ID_SIZEBUST_ORB, + ITEM_ID_ONE_ROOM_ORB, + ITEM_ID_FILL_IN_ORB, + ITEM_ID_TRAPPER_ORB, + ITEM_ID_POSSESS_ORB, + ITEM_ID_ITEMIZER_ORB, + ITEM_ID_HURL_ORB, + ITEM_ID_MOBILE_ORB, + ITEM_ID_TOSS_ORB, + ITEM_ID_STAIRS_ORB, + ITEM_ID_LONGTOSS_ORB, + ITEM_ID_PIERCE_ORB, + ITEM_ID_CUT, + ITEM_ID_FLY, + ITEM_ID_SURF, + ITEM_ID_STRENGTH, + ITEM_ID_FLASH, + ITEM_ID_ROCK_SMASH, + ITEM_ID_WATERFALL, + ITEM_ID_DIVE, + ITEM_ID_LINK_BOX, + ITEM_ID_SWITCH_BOX, + ITEM_ID_WEAVILE_FIG, + ITEM_ID_MIME_JR_FIG, + ITEM_ID_BEATUP_ORB, + ITEM_ID_G_MACHINE_6, + ITEM_ID_G_MACHINE_7, + ITEM_ID_G_MACHINE_8, +}; + void LoadItemParameters(void); -struct unkStruct_203B460 *GetMoneyItemsInfo(void); +struct TeamInventory *GetMoneyItemsInfo(void); void InitializeMoneyItems(void); u8 GetItemType(u8 index); s32 GetItemBuyPrice(u8 itemIndex); s32 GetItemSellPrice(u8 itemIndex); -u8 GetItemOrder(u8 itemIndex); +s32 GetItemOrder(u8 itemIndex); u8 GetItemPalette(u8 itemIndex); u8 GetItemCategory(u8 itemIndex); u32 GetItemUnkThrow(u8 itemIndex, u32 r1); u8 *GetItemDescription(u8 itemIndex); u32 GetItemUnkFood(u8 itemIndex, u32 r1); -s32 sub_8090A34(void); -bool8 sub_8090A60(u8 itemIndex); -void sub_8090A8C(struct ItemStruct_203B460 *param_1,u8 itemIndex,u8 param_3); -void sub_8090B08(struct ItemStruct_203B460_ALT *param_1,u8 itemIndex); -void sub_8090B64(struct ItemStruct_203B460 *param_1, struct ItemStruct_203B460_ALT *param_2); +s32 GetNumberOfFilledInventorySlots(void); +bool8 IsThrowableItem(u8 itemIndex); +void sub_8090A8C(struct ItemSlot *param_1,u8 itemIndex,u8 param_3); +void sub_8090B08(struct ItemSlot_ALT *param_1,u8 itemIndex); +void sub_8090B64(struct ItemSlot *param_1, struct ItemSlot_ALT *param_2); +void sub_8090DC4(void* param_1,u8 itemIndex,u32 param_3); +bool8 AddItemToInventory(const struct ItemSlot* slot); +void ConvertMoneyItemToMoney(); +void AddToTeamMoney(s32 amount); +u32 GetMoneyValue(struct ItemSlot* slot); +u16 GetItemMove(u8 index); #endif diff --git a/include/kangaskhan_storage.h b/include/kangaskhan_storage.h index 15e42bd..fcc9157 100644 --- a/include/kangaskhan_storage.h +++ b/include/kangaskhan_storage.h @@ -11,7 +11,7 @@ struct unkStruct_203B208 u32 unk0; u32 currState; u32 unk8; - struct ItemStruct_203B460 unkC; + struct ItemSlot unkC; u32 unk10; u8 itemIndex; // another itemIndex? u8 fill15[0x3]; diff --git a/include/kecleon_items.h b/include/kecleon_items.h index 122fe3f..1dba655 100644 --- a/include/kecleon_items.h +++ b/include/kecleon_items.h @@ -1,7 +1,7 @@ #ifndef GUARD_KECLEON_ITEMS_H #define GUARD_KECLEON_ITEMS_H -#include "gUnknown_203B460.h" +#include "team_inventory.h" #include "text.h" #include "menu.h" @@ -16,7 +16,7 @@ struct unkStruct_203B210 s32 itemSellPrice; u32 unk14; u32 unk18; - struct ItemStruct_203B460 unk1C; + struct ItemSlot unk1C; u8 unk20; u8 unk21; u8 unk22; diff --git a/include/pokemon.h b/include/pokemon.h index fad47e0..38f4bc8 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -28,7 +28,7 @@ struct PokemonStruct u8 unk20[4]; u8 unk24; u8 fill25[3]; - u8 unk28; + u8 itemIndexHeld; u8 unk29; u8 fill2A[2]; u8 unk2C[4]; diff --git a/include/save.h b/include/save.h index ba2577c..69109b8 100644 --- a/include/save.h +++ b/include/save.h @@ -45,7 +45,7 @@ struct UnkStruct_sub_8011DAC { struct UnkStruct_203B184 { - /* 0x0 */ struct unkStruct_203B460 *MoneyItems; + /* 0x0 */ struct TeamInventory *MoneyItems; /* 0x4 */ struct unkStruct_203B45C *recruitedPokemon; /* 0x8 */ u8 *unk8; /* 0xC */ u8 *unkC; diff --git a/include/subStruct_203B240.h b/include/subStruct_203B240.h new file mode 100644 index 0000000..040eb66 --- /dev/null +++ b/include/subStruct_203B240.h @@ -0,0 +1,10 @@ +#ifndef GUARD_SUBSTRUCT_203B240_H +#define GUARD_SUBSTRUCT_203B240_H + +struct subStruct_203B240 +{ + char * unk0; + char * unk4; +}; + +#endif \ No newline at end of file diff --git a/include/sub_8095228.h b/include/sub_8095228.h index bb947c6..e7d214b 100644 --- a/include/sub_8095228.h +++ b/include/sub_8095228.h @@ -9,7 +9,7 @@ struct unkStruct_8095228 u8 padding[0x10 - 0x5]; u32 unk10; u8 padding2[0x20 - 0x14]; - struct ItemStruct_203B460 unk20; + struct ItemSlot unk20; u8 padding3[0x28 - 0x24]; u32 unk28; s8 unk2C; diff --git a/include/team_inventory.h b/include/team_inventory.h new file mode 100644 index 0000000..16cf0e1 --- /dev/null +++ b/include/team_inventory.h @@ -0,0 +1,20 @@ +#ifndef GUARD_TEAM_INVENTORY_H +#define GUARD_TEAM_INVENTORY_H + +struct subStruct_203B460 +{ + u8 unk0; + u8 unk1; +}; + +struct TeamInventory +{ + struct ItemSlot teamItems[20]; + u16 unk50[0xF0]; + struct subStruct_203B460 unk230[8]; // this is probably actually the same struct as ItemSlot_ALT (see sub_80919FC) + struct subStruct_203B460 unk250[4]; // TODO: idk if this is identical struct or not.. Ghidra says sizes are same + /* 0x260 */ s32 teamMoney; + /* 0x264 */ u32 teamSavings; +}; + +#endif diff --git a/include/trade_items_menu.h b/include/trade_items_menu.h index 52cb733..8b3b0a9 100644 --- a/include/trade_items_menu.h +++ b/include/trade_items_menu.h @@ -44,7 +44,7 @@ struct TradeItemsMenu /* 0x254 */ struct TradeSubStruct sentItem; - /* 0x25C */ struct ItemStruct_203B460 itemToSend; + /* 0x25C */ struct ItemSlot itemToSend; u8 fill25F[0x3A0 - 0x260]; }; diff --git a/include/wonder_mail.h b/include/wonder_mail.h index 8973561..df622d3 100644 --- a/include/wonder_mail.h +++ b/include/wonder_mail.h @@ -78,7 +78,7 @@ struct WonderMailStruct_203B2C4 u8 filler310[0x35C - 0x310]; struct UnkTextStruct2 unk35C[4]; struct UnkTextStruct2 unk3BC[4]; - struct ItemStruct_203B460 unk41C; + struct ItemSlot unk41C; /* 0x420 */ struct OpenedFile *faceFile; /* 0x424 */ u8 *faceData; u16 unk428; diff --git a/ld_script.txt b/ld_script.txt index b8e8e75..6f1e488 100755 --- a/ld_script.txt +++ b/ld_script.txt @@ -200,6 +200,8 @@ SECTIONS { asm/code_8090208.o(.text); src/items.o(.text); asm/items.o(.text); + src/items_1.o(.text); + asm/items_1.o(.text); src/rescue_team_info.o(.text); src/text_util.o(.text); src/friend_area.o(.text); diff --git a/src/adventure_log.c b/src/adventure_log.c index 41419f6..cb20682 100644 --- a/src/adventure_log.c +++ b/src/adventure_log.c @@ -248,7 +248,7 @@ void DisplayAdventureLog(void) default: break; } - sub_8014FF0(8, sub_8013800(gAdventureLog, counter), GetAdventureLogLine(uVar6), gAdventureLog->unk34, 0); + xxx_format_and_draw(8, sub_8013800(gAdventureLog, counter), GetAdventureLogLine(uVar6), gAdventureLog->unk34, 0); } else { @@ -389,7 +389,7 @@ void DisplayAdventureLog(void) "\tstr r0, [sp]\n" "\tmovs r0, 0x8\n" "\tadds r1, r5, 0\n" - "\tbl sub_8014FF0\n" + "\tbl xxx_format_and_draw\n" "\tb _08032234\n" "\t.align 2, 0\n" "_08032214: .4byte gUnknown_202DE30\n" diff --git a/src/code_801AFA4.c b/src/code_801AFA4.c index 4ad68a8..c9d71dd 100644 --- a/src/code_801AFA4.c +++ b/src/code_801AFA4.c @@ -2,11 +2,10 @@ #include "memory.h" #include "text.h" #include "item.h" -#include "gUnknown_203B460.h" +#include "team_inventory.h" -extern struct unkStruct_203B460 *gUnknown_203B460; +extern struct TeamInventory *gTeamInventory_203B460; -extern u16 GetItemMove(u8); extern void sub_8092C84(u8 *, u16); extern void sub_8099690(u32); extern u32 sub_801B2F4(void); @@ -25,7 +24,7 @@ extern u32 gUnknown_80DBA0C; extern u8 gUnknown_202E1C8[0x50]; -extern bool8 sub_80915A0(u8); +extern bool8 IsHMItem(u8); extern void DisplayGulpinDialogueSprite(u32, u32, u32 *); extern void sub_801B178(void); extern void sub_8094060(u32 *, u32 *); @@ -60,7 +59,7 @@ u32 sub_801AFA4(u32 r0) { gUnknown_203B22C = MemoryAlloc(0xA4, 8); gUnknown_203B22C->unk4 = r0; - gUnknown_203B22C->unk8 = gUnknown_203B460->fill0[r0].itemIndex; + gUnknown_203B22C->unk8 = gTeamInventory_203B460->teamItems[r0].itemIndex; gUnknown_203B22C->unkA = GetItemMove(gUnknown_203B22C->unk8); sub_8092C84(gUnknown_202E1C8, gUnknown_203B22C->unkA); sub_8099690(0); @@ -130,10 +129,10 @@ void sub_801B080(void) break; case 2: sub_8094060(&gUnknown_203B22C->unkC, &gUnknown_203B22C->unk5C->unk2C); - if(!sub_80915A0(gUnknown_203B22C->unk8)) + if(!IsHMItem(gUnknown_203B22C->unk8)) { - gUnknown_203B460->fill0[gUnknown_203B22C->unk4].numItems = gUnknown_203B22C->unk8 - 0x7D; - gUnknown_203B460->fill0[gUnknown_203B22C->unk4].itemIndex = 0x7C; + gTeamInventory_203B460->teamItems[gUnknown_203B22C->unk4].numItems = gUnknown_203B22C->unk8 - 0x7D; + gTeamInventory_203B460->teamItems[gUnknown_203B22C->unk4].itemIndex = ITEM_ID_USED_TM; } PlaySound(0x9C << 1); // #+CM$m8#R learned diff --git a/src/code_801B3C0.c b/src/code_801B3C0.c index da993d5..502ce60 100644 --- a/src/code_801B3C0.c +++ b/src/code_801B3C0.c @@ -3,7 +3,7 @@ #include "input.h" #include "memory.h" #include "item.h" -#include "gUnknown_203B460.h" +#include "team_inventory.h" struct subStruct_203B240 { @@ -16,7 +16,7 @@ struct unkStruct_203B230 { // size: 0x94 s32 state; - struct ItemStruct_203B460 unk4; + struct ItemSlot unk4; s32 unk8; s32 unkC; struct subStruct_203B240 *unk10[2]; @@ -36,11 +36,11 @@ extern u8 gUnknown_80DBA4C[]; extern void sub_8008C54(u32); extern void sub_80073E0(u32); extern void sub_80073B8(u32); -extern void sub_8014FF0(u32, u32, u8 *, u32, u32); +extern void xxx_format_and_draw(u32, u32, u8 *, u32, u32); extern void PlayMenuSoundEffect(u32); extern void sub_8013F84(void); extern u32 sub_8012A64(u32 *, u32); -extern s32 sub_80913E0(struct ItemStruct_203B460 *, u32, struct subStruct_203B240 **); +extern s32 sub_80913E0(struct ItemSlot *, u32, struct subStruct_203B240 **); extern void sub_801317C(u32 *); extern void sub_80140B4(struct UnkTextStruct2 *); @@ -52,7 +52,7 @@ void sub_801B590(); void sub_801B480(); -u32 sub_801B3C0(struct ItemStruct_203B460 *param_1) +u32 sub_801B3C0(struct ItemSlot *param_1) { ResetSprites(1); gUnknown_203B230 = MemoryAlloc(sizeof(struct unkStruct_203B230),8); @@ -115,8 +115,8 @@ void sub_801B480(void) sub_80073B8(gUnknown_203B230->unk24); preload = gUnknown_203B230->unk10[gUnknown_203B230->unk8]; strcpy(gAvailablePokemonNames, preload->pokeName); - sub_8014FF0(16, 0, gUnknown_80DBA4C, gUnknown_203B230->unk24, 0); // $m0 - sub_8014FF0(4, 16, gUnknown_203B230->unk10[gUnknown_203B230->unk8]->unk4, gUnknown_203B230->unk24, 0); + xxx_format_and_draw(16, 0, gUnknown_80DBA4C, gUnknown_203B230->unk24, 0); // $m0 + xxx_format_and_draw(4, 16, gUnknown_203B230->unk10[gUnknown_203B230->unk8]->unk4, gUnknown_203B230->unk24, 0); sub_80073E0(gUnknown_203B230->unk24); break; case 2: diff --git a/src/code_801C620.c b/src/code_801C620.c index 8272340..7ae8c6a 100644 --- a/src/code_801C620.c +++ b/src/code_801C620.c @@ -2,12 +2,7 @@ #include "input.h" #include "memory.h" #include "text.h" - -struct subStruct_203B240 -{ - char * unk0; - char * unk4; -}; +#include "subStruct_203B240.h" struct unkStruct_203B240 { @@ -39,7 +34,7 @@ extern void sub_801317C(u32 *); extern void sub_80140B4(struct UnkTextStruct2 *); -extern void sub_8014FF0(u32, u32, char *, u32, u32); +extern void xxx_format_and_draw(u32, u32, char *, u32, u32); extern void sub_8008C54(u32); extern void sub_80073B8(u32); extern void xxx_call_draw_string(u32, u32, char *, u32, u32); @@ -116,7 +111,7 @@ void sub_801C6E4(void) sub_80073B8(gUnknown_203B240->unk24); skillName = GetIQSkillName(gUnknown_203B240->unk4); strcpy(gUnknown_202DE58,skillName); - sub_8014FF0(16,0,gUnknown_80DBE2C,0,0); // $i0 + xxx_format_and_draw(16,0,gUnknown_80DBE2C,0,0); // $i0 xxx_call_draw_string(8,16,GetIQSkillDescription(gUnknown_203B240->unk4),gUnknown_203B240->unk24,0); sub_80073E0(gUnknown_203B240->unk24); gUnknown_203B240->unkC = sub_8097DF0(GetIQSkillDescription(gUnknown_203B240->unk4),gUnknown_203B240->unk10); @@ -127,8 +122,8 @@ void sub_801C6E4(void) sub_80073B8(gUnknown_203B240->unk24); preload = gUnknown_203B240->unk10[gUnknown_203B240->unk8]; strcpy(gAvailablePokemonNames,preload->unk0); - sub_8014FF0(16,0,gUnknown_80DBE30,gUnknown_203B240->unk24,0); // $m0 - sub_8014FF0(4,16,gUnknown_203B240->unk10[gUnknown_203B240->unk8]->unk4, gUnknown_203B240->unk24,0); + xxx_format_and_draw(16,0,gUnknown_80DBE30,gUnknown_203B240->unk24,0); // $m0 + xxx_format_and_draw(4,16,gUnknown_203B240->unk10[gUnknown_203B240->unk8]->unk4, gUnknown_203B240->unk24,0); sub_80073E0(gUnknown_203B240->unk24); break; case 2: diff --git a/src/code_801D760.c b/src/code_801D760.c index e499d47..f48e717 100644 --- a/src/code_801D760.c +++ b/src/code_801D760.c @@ -3,7 +3,7 @@ #include "constants/friend_area.h" #include "file_system.h" #include "item.h" -#include "gUnknown_203B460.h" +#include "team_inventory.h" #include "memory.h" #include "input.h" #include "text.h" @@ -95,7 +95,7 @@ struct unk_203B250 struct unk_203B250 *gUnknown_203B250; -extern struct unkStruct_203B460 *gUnknown_203B460; +extern struct TeamInventory *gTeamInventory_203B460; void sub_801D680(void) { @@ -332,7 +332,7 @@ void sub_801D894(void) rank = GetRescueTeamRank(); ExpandPlaceholdersBuffer(buffer, r5, GetTeamRankString(rank), GetTeamRankPts()); xxx_call_draw_string(32, 4, buffer, 2, 0); - ExpandPlaceholdersBuffer(buffer, &gUnknown_80DBF4C, gUnknown_203B460->teamMoney); + ExpandPlaceholdersBuffer(buffer, &gUnknown_80DBF4C, gTeamInventory_203B460->teamMoney); xxx_call_draw_string(32, 18, buffer, 2, 0); sub_80073E0(2); } diff --git a/src/code_8057824.c b/src/code_8057824.c index 27a546f..248709f 100644 --- a/src/code_8057824.c +++ b/src/code_8057824.c @@ -30,8 +30,8 @@ extern void sub_806F370(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C extern u32 gUnknown_80FD018; -extern s16 sub_8057600(u32, u32); -extern u32 sub_8092B00(u32); +extern s16 sub_8057600(void*, u32); +extern u32 sub_8092B00(void*); bool32 sub_8057824(struct unkDungeon_8041D5C *param_1, struct unkDungeon_8041D5C *param_2) { @@ -100,7 +100,7 @@ bool32 sub_8057954(struct unkDungeon_8041D5C *param_1, struct unkDungeon_8041D5C return TRUE; } -bool32 sub_8057974(struct unkDungeon_8041D5C *param_1, struct unkDungeon_8041D5C *param_2, u32 param_3, u32 param_4) +bool32 sub_8057974(struct unkDungeon_8041D5C *param_1, struct unkDungeon_8041D5C *param_2, void* param_3, u32 param_4) { s32 newHP; u8 local_24; diff --git a/src/code_80958E8.c b/src/code_80958E8.c index 457da51..c8fae63 100644 --- a/src/code_80958E8.c +++ b/src/code_80958E8.c @@ -35,7 +35,7 @@ extern bool8 sub_809017C(u8 *); extern s16 sub_808E770(s16); extern bool8 sub_8092040(u8); extern u8 sub_803C1D0(u8 *, u8); -extern bool8 sub_8091524(u8); +extern bool8 IsNotMoneyOrUsedTMItem(u8); extern u8 sub_8091E60(u8 ,u8 ); extern u32 GetMaxItemCount(u8); extern u8 sub_803C0DC(s16); @@ -146,9 +146,9 @@ bool8 ValidateWonderMail(struct WonderMail *data) if(sub_8092040(data->targetItem)) return FALSE; - if(sub_8090A60(data->targetItem)) + if(IsThrowableItem(data->targetItem)) return FALSE; - if(!sub_8091524(data->targetItem)) + if(!IsNotMoneyOrUsedTMItem(data->targetItem)) return FALSE; // Item finding diff --git a/src/debug_menu_mid.c b/src/debug_menu_mid.c index 3ed684c..b479cca 100644 --- a/src/debug_menu_mid.c +++ b/src/debug_menu_mid.c @@ -1,7 +1,7 @@ #include "global.h" #include "input.h" #include "item.h" -#include "gUnknown_203B460.h" +#include "team_inventory.h" #include "memory.h" #include "menu.h" #include "text.h" @@ -49,8 +49,8 @@ struct unkStruct_203B3F4 extern struct unkStruct_203B3F4 *gUnknown_203B3F4; -extern struct unkStruct_203B460 *gUnknown_203B460; -extern void sub_801B3C0(struct ItemStruct_203B460 *); +extern struct TeamInventory *gTeamInventory_203B460; +extern void sub_801B3C0(struct ItemSlot *); extern void sub_8013AA0(u32 *); extern struct UnkTextStruct2 gUnknown_80E7E34; @@ -73,7 +73,7 @@ extern void sub_8012EA4(u32 *, u32); extern void sub_80073E0(u32); extern void sub_8013C68(u32 *); extern void xxx_call_draw_string(s32, u32, const char *, u32, u32); -extern bool8 sub_8091524(u8); +extern bool8 IsNotMoneyOrUsedTMItem(u8); extern u32 sub_801CA08(u32); extern u8 sub_801CB24(); extern void sub_801CBB8(); @@ -181,7 +181,7 @@ void sub_803A51C(void) void sub_803A5A0(void) { - struct ItemStruct_203B460 auStack8; + struct ItemSlot auStack8; switch(gUnknown_203B3F0->state) { case 0: @@ -199,7 +199,7 @@ void sub_803A5A0(void) gUnknown_203B3F0->unkAC = 3; gUnknown_203B3F0->unkA4 = 0; gUnknown_203B3F0->unkA8 = 0x3e7; - gUnknown_203B3F0->unkA0 = gUnknown_203B460->unk50[gUnknown_203B3F0->itemIndex]; + gUnknown_203B3F0->unkA0 = gTeamInventory_203B460->unk50[gUnknown_203B3F0->itemIndex]; gUnknown_203B3F0->unkB0 = 1; gUnknown_203B3F0->unkB4 = &gUnknown_203B3F0->unkD8[1]; gUnknown_203B3F0->unkB8 = 0x2C; @@ -235,7 +235,7 @@ void sub_803A6F0(void) gUnknown_203B3F0->menus[0].text = &gDebug_NumberText; gUnknown_203B3F0->menus[0].menuAction = 2; gUnknown_203B3F0->unk8 = 2; - if (!sub_8091524(gUnknown_203B3F0->itemIndex)) { + if (!IsNotMoneyOrUsedTMItem(gUnknown_203B3F0->itemIndex)) { gUnknown_203B3F0->menus[0].menuAction = -1; gUnknown_203B3F0->unk8 = 3; } @@ -300,7 +300,7 @@ void sub_803A810(void) switch(sub_8013BBC(&gUnknown_203B3F0->unk9C)) { case 3: - gUnknown_203B460->unk50[gUnknown_203B3F0->itemIndex] = gUnknown_203B3F0->unk9C; + gTeamInventory_203B460->unk50[gUnknown_203B3F0->itemIndex] = gUnknown_203B3F0->unk9C; // Fallthrough needed to match case 2: sub_803A504(1); diff --git a/src/felicity_bank_1.c b/src/felicity_bank_1.c index fc769cb..ac7a1db 100644 --- a/src/felicity_bank_1.c +++ b/src/felicity_bank_1.c @@ -1,9 +1,9 @@ #include "global.h" #include "item.h" -#include "gUnknown_203B460.h" +#include "team_inventory.h" #include "felicity_bank.h" -extern struct unkStruct_203B460 *gUnknown_203B460; +extern struct TeamInventory *gTeamInventory_203B460; extern struct unkStruct_203B204 *gUnknown_203B204; extern u8 gUnknown_80DB738; @@ -61,8 +61,8 @@ void Felicity_DepositMoney(void) break; case 3: gUnknown_203B204->chosenAmount = gUnknown_203B204->unk64; - gUnknown_203B460->teamSavings += gUnknown_203B204->chosenAmount; - gUnknown_203B460->teamMoney -= gUnknown_203B204->chosenAmount; + gTeamInventory_203B460->teamSavings += gUnknown_203B204->chosenAmount; + gTeamInventory_203B460->teamMoney -= gUnknown_203B204->chosenAmount; PlaySound(0x14c); UpdateFelicityBankState(9); break; @@ -83,8 +83,8 @@ void Felicity_WithdrawMoney(void) break; case 3: gUnknown_203B204->chosenAmount = gUnknown_203B204->unk64; - gUnknown_203B460->teamMoney += gUnknown_203B204->chosenAmount; - gUnknown_203B460->teamSavings -= gUnknown_203B204->chosenAmount; + gTeamInventory_203B460->teamMoney += gUnknown_203B204->chosenAmount; + gTeamInventory_203B460->teamSavings -= gUnknown_203B204->chosenAmount; PlaySound(0x14c); UpdateFelicityBankState(0xc); break; @@ -134,9 +134,9 @@ void CreateFelicityMoneySavingsHeader(u32 param_1) sub_8008C54(param_1); sub_80073B8(param_1); xxx_call_draw_string(16, 4, gFelicityMoney, param_1, 0); - sub_8012BC4(96, 4, gUnknown_203B460->teamMoney, 5, 5, param_1); + sub_8012BC4(96, 4, gTeamInventory_203B460->teamMoney, 5, 5, param_1); xxx_call_draw_string(112, 4, gFelicitySavings, param_1, 0); - sub_8012BC4(200,4,gUnknown_203B460->teamSavings,7,5,param_1); + sub_8012BC4(200,4,gTeamInventory_203B460->teamSavings,7,5,param_1); sub_80073E0(param_1); } @@ -145,6 +145,6 @@ void DrawTeamMoneyBox(u32 param_1) sub_8008C54(param_1); sub_80073B8(param_1); xxx_call_draw_string(6, 0, &gUnknown_80DB738,param_1, 0); // Money - sub_8012BC4(42, 12, gUnknown_203B460->teamMoney, 5, 5, param_1); + sub_8012BC4(42, 12, gTeamInventory_203B460->teamMoney, 5, 5, param_1); sub_80073E0(param_1); } diff --git a/src/friend_area_action_menu.c b/src/friend_area_action_menu.c index 71e424b..24c0dfa 100644 --- a/src/friend_area_action_menu.c +++ b/src/friend_area_action_menu.c @@ -4,7 +4,7 @@ #include "input.h" #include "menu.h" #include "item.h" -#include "gUnknown_203B460.h" +#include "team_inventory.h" #include "friend_area_action_menu.h" extern struct unkStruct_203B2BC *gUnknown_203B2BC; @@ -33,7 +33,7 @@ extern void sub_801A5D8(u32, u32, u32, u32); extern void sub_801A8D0(u32); extern void sub_801A9E0(); extern void sub_801F1B0(u32, u32); -extern void sub_801B3C0(struct ItemStruct_203B460 *); +extern void sub_801B3C0(struct ItemSlot *); extern void sub_809401C(u32 *, u32 *); extern void sub_801EE10(u32, s16, u32 *, u32, u32, u32); @@ -167,7 +167,7 @@ void sub_802719C(void) void sub_8027274(void) { - struct ItemStruct_203B460 auStack12; + struct ItemSlot auStack12; switch(gUnknown_203B2BC->state) { case 0: diff --git a/src/friend_area_action_menu_1.c b/src/friend_area_action_menu_1.c index 86f7430..bff9997 100644 --- a/src/friend_area_action_menu_1.c +++ b/src/friend_area_action_menu_1.c @@ -3,11 +3,11 @@ #include "input.h" #include "menu.h" #include "item.h" -#include "gUnknown_203B460.h" +#include "team_inventory.h" #include "friend_area_action_menu.h" extern struct unkStruct_203B2BC *gUnknown_203B2BC; -extern struct unkStruct_203B460 *gUnknown_203B460; +extern struct TeamInventory *gTeamInventory_203B460; u32 sub_801B410(); void sub_801B450(); @@ -18,13 +18,13 @@ extern void sub_8027184(u32); extern u8 sub_8012FD8(u32 *r0); extern void sub_8013114(u32 *, s32 *); extern void PlaySound(u32); -extern void sub_80911F8(u32); -extern void sub_80910B4(); +extern void ShiftItemsDownFrom(u32); +extern void FillInventoryGaps(); extern void nullsub_104(); extern void sub_8091274(u8 *); extern void sub_801A928(); extern void sub_8099690(u32); -extern void sub_808D800(s16, struct ItemStruct_203B460_ALT *); +extern void sub_808D800(s16, struct ItemSlot_ALT *); extern u32 sub_801A8AC(); extern u32 sub_801A6E8(u32); @@ -57,14 +57,14 @@ void sub_8027B28(void) { case 3: gUnknown_203B2BC->unkC = sub_801A8AC(); - gUnknown_203B2BC->unk10.itemIndex = gUnknown_203B460->fill0[gUnknown_203B2BC->unkC].itemIndex; - gUnknown_203B2BC->unk10.numItems = gUnknown_203B460->fill0[gUnknown_203B2BC->unkC].numItems; + gUnknown_203B2BC->unk10.itemIndex = gTeamInventory_203B460->teamItems[gUnknown_203B2BC->unkC].itemIndex; + gUnknown_203B2BC->unk10.numItems = gTeamInventory_203B460->teamItems[gUnknown_203B2BC->unkC].numItems; sub_8027184(0xc); break; case 4: gUnknown_203B2BC->unkC = sub_801A8AC(); - gUnknown_203B2BC->unk10.itemIndex = gUnknown_203B460->fill0[gUnknown_203B2BC->unkC].itemIndex; - gUnknown_203B2BC->unk10.numItems = gUnknown_203B460->fill0[gUnknown_203B2BC->unkC].numItems; + gUnknown_203B2BC->unk10.itemIndex = gTeamInventory_203B460->teamItems[gUnknown_203B2BC->unkC].itemIndex; + gUnknown_203B2BC->unk10.numItems = gTeamInventory_203B460->teamItems[gUnknown_203B2BC->unkC].numItems; sub_8099690(0); sub_8027184(0xd); break; @@ -91,8 +91,8 @@ void sub_8027BD8(void) { case 10: PlaySound(0x14d); - sub_80911F8(gUnknown_203B2BC->unkC); - sub_80910B4(); + ShiftItemsDownFrom(gUnknown_203B2BC->unkC); + FillInventoryGaps(); if (gUnknown_203B2BC->unk14 != 0) { sub_8091274(&gUnknown_203B2BC->unk14); } diff --git a/src/friend_rescue.c b/src/friend_rescue.c index 15919d1..a93c317 100644 --- a/src/friend_rescue.c +++ b/src/friend_rescue.c @@ -1,7 +1,7 @@ #include "global.h" #include "text.h" #include "item.h" -#include "gUnknown_203B460.h" +#include "team_inventory.h" #include "friend_rescue.h" #include "pokemon.h" #include "memory.h" diff --git a/src/friend_rescue_1.c b/src/friend_rescue_1.c index ea33bb8..d66bc8c 100644 --- a/src/friend_rescue_1.c +++ b/src/friend_rescue_1.c @@ -4,11 +4,11 @@ #include "save.h" #include "memory.h" #include "input.h" -#include "gUnknown_203B460.h" +#include "team_inventory.h" #include "friend_rescue.h" #include "sub_8095228.h" -extern struct unkStruct_203B460 *gUnknown_203B460; +extern struct TeamInventory *gTeamInventory_203B460; extern void sub_80338C4(u32); extern s32 sub_80144A4(s32 *); @@ -176,7 +176,7 @@ void sub_8034F88(void) temp2 = sub_8095228(gUnknown_203B33C->unk218); if(gUnknown_203B33C->unk41C.itemIndex != 0) temp2->unk20 = gUnknown_203B33C->unk41C; - gUnknown_203B460->unk50[gUnknown_203B33C->unk41C.itemIndex]--; + gTeamInventory_203B460->unk50[gUnknown_203B33C->unk41C.itemIndex]--; sub_80338C4(0x75); break; case 7: diff --git a/src/items.c b/src/items.c index 1ddd5b4..f7bd24e 100644 --- a/src/items.c +++ b/src/items.c @@ -1,11 +1,11 @@ #include "global.h" #include "file_system.h" #include "item.h" -#include "gUnknown_203B460.h" +#include "team_inventory.h" #include "random.h" -extern struct unkStruct_203B460 *gUnknown_203B460; -extern struct unkStruct_203B460 gUnknown_20389A8; +extern struct TeamInventory *gTeamInventory_203B460; +extern struct TeamInventory gUnknown_20389A8; extern struct FileArchive gSystemFileArchive; extern const char gUnknown_8109764; @@ -15,60 +15,59 @@ EWRAM_DATA struct Item *gItemParametersData; extern void sub_8091840(u8); extern u8 GetItemType(u8); extern u32 GetItemUnkThrow(u8, u32); -extern s32 sub_80915D4(struct ItemStruct_203B460 *); -extern bool8 sub_80914E4(u8); -extern void sub_8090F58(u32, u8 *, struct ItemStruct_203B460 *, u32); +extern bool8 CanSellItem(u8); +extern void sub_8090F58(void*, u8 *, struct ItemSlot *, u32); void LoadItemParameters(void) { - gUnknown_203B460 = &gUnknown_20389A8; + gTeamInventory_203B460 = &gUnknown_20389A8; gItemParametersFile = OpenFileAndGetFileDataPtr(&gUnknown_8109764,&gSystemFileArchive); gItemParametersData = (struct Item *) gItemParametersFile->data; } -struct unkStruct_203B460 *GetMoneyItemsInfo(void) +struct TeamInventory *GetMoneyItemsInfo(void) { return &gUnknown_20389A8; } void InitializeMoneyItems(void) { - s32 iVar1; + s32 i; - for(iVar1 = 0; iVar1 < 0x14; iVar1++) + for(i = 0; i < 20; i++) { - gUnknown_203B460->fill0[iVar1].unk0 = 0; + gTeamInventory_203B460->teamItems[i].unk0 = 0; } - for(iVar1 = 0; iVar1 < 0xF0; iVar1++) + for(i = 0; i < 0xF0; i++) { - gUnknown_203B460->unk50[iVar1] = 0; + gTeamInventory_203B460->unk50[i] = 0; } - for(iVar1 = 0; iVar1 < 8; iVar1++) + for(i = 0; i < 8; i++) { - sub_8091840(iVar1); + sub_8091840(i); } - gUnknown_203B460->teamMoney = 0; - gUnknown_203B460->teamSavings = 0; + gTeamInventory_203B460->teamMoney = 0; + gTeamInventory_203B460->teamSavings = 0; } -s32 sub_8090A34(void) +s32 GetNumberOfFilledInventorySlots(void) { - s32 iVar2; - s32 iVar3; + s32 i; + s32 count; - iVar3 = 0; - for(iVar2 = 0; iVar2 < 0x14; iVar2++) + count = 0; + for(i = 0; i < 20; i++) { - if ((gUnknown_203B460->fill0[iVar2].unk0 & 1) != 0) { - iVar3++; + if ((gTeamInventory_203B460->teamItems[i].unk0 & 1) != 0) { + count++; } } - return iVar3; + return count; } -bool8 sub_8090A60(u8 itemIndex) +bool8 IsThrowableItem(u8 itemIndex) { if ((GetItemType(itemIndex) != ITEM_TYPE_THROWABLE) && (GetItemType(itemIndex) != ITEM_TYPE_ROCK)) { return FALSE; @@ -78,15 +77,15 @@ bool8 sub_8090A60(u8 itemIndex) } } -void sub_8090A8C(struct ItemStruct_203B460 *param_1,u8 itemIndex,u8 param_3) +void sub_8090A8C(struct ItemSlot *param_1,u8 itemIndex,u8 param_3) { u32 uVar3; u32 uVar4; - if (itemIndex != 0) { + if (itemIndex != ITEM_ID_NOTHING) { param_1->unk0 = 1; param_1->itemIndex = itemIndex; - if (sub_8090A60(itemIndex)) { + if (IsThrowableItem(itemIndex)) { uVar3 = GetItemUnkThrow(itemIndex,0); uVar4 = GetItemUnkThrow(itemIndex,1); param_1->numItems = RandomRange(uVar3,uVar4); @@ -105,19 +104,19 @@ void sub_8090A8C(struct ItemStruct_203B460 *param_1,u8 itemIndex,u8 param_3) } else { param_1->unk0 = 0; - param_1->itemIndex = 0; + param_1->itemIndex = ITEM_ID_NOTHING; param_1->numItems = 0; } } -void sub_8090B08(struct ItemStruct_203B460_ALT *param_1,u8 itemIndex) +void sub_8090B08(struct ItemSlot_ALT *param_1,u8 itemIndex) { u32 uVar2; u32 uVar3; - if (itemIndex != 0) { + if (itemIndex != ITEM_ID_NOTHING) { param_1->itemIndex = itemIndex; - if (sub_8090A60(itemIndex)) { + if (IsThrowableItem(itemIndex)) { uVar2 = GetItemUnkThrow(itemIndex,0); uVar3 = GetItemUnkThrow(itemIndex,1); param_1->numItems = RandomRange(uVar2,uVar3); @@ -136,22 +135,22 @@ void sub_8090B08(struct ItemStruct_203B460_ALT *param_1,u8 itemIndex) } } -void sub_8090B64(struct ItemStruct_203B460 *param_1, struct ItemStruct_203B460_ALT *param_2) +void sub_8090B64(struct ItemSlot *param_1, struct ItemSlot_ALT *param_2) { u8 r6; - if(param_2->itemIndex != 0) + if(param_2->itemIndex != ITEM_ID_NOTHING) { param_1->unk0 = 1; param_1->itemIndex = param_2->itemIndex; - r6 = sub_8090A60(param_1->itemIndex); + r6 = IsThrowableItem(param_1->itemIndex); if(r6 != 0 || GetItemType(param_1->itemIndex) == ITEM_TYPE_MONEY) { param_1->numItems = param_2->numItems; } else { - if(param_1->itemIndex == 0x7C) + if(param_1->itemIndex == ITEM_ID_USED_TM) { param_1->numItems = param_2->numItems; } @@ -163,20 +162,20 @@ void sub_8090B64(struct ItemStruct_203B460 *param_1, struct ItemStruct_203B460_A } else { - param_1->itemIndex = 0; + param_1->itemIndex = ITEM_ID_NOTHING; param_1->numItems = 0; param_1->unk0 = 0; } } -void sub_8090BB0(struct ItemStruct_203B460_ALT *param_1,struct ItemStruct_203B460 *param_2) +void sub_8090BB0(struct ItemSlot_ALT *param_1,struct ItemSlot *param_2) { if ((param_2->unk0 & 1) != 0) { param_1->itemIndex = param_2->itemIndex; param_1->numItems = param_2->numItems; } else { - param_1->itemIndex = 0; + param_1->itemIndex = ITEM_ID_NOTHING; } } @@ -185,13 +184,13 @@ u8 GetItemType(u8 index) return gItemParametersData[index].type; } -s32 sub_8090BE4(struct ItemStruct_203B460 *param_1) +s32 GetStackBuyValue(struct ItemSlot *param_1) { - if (param_1->itemIndex == 105) { - return sub_80915D4(param_1); + if (param_1->itemIndex == ITEM_ID_POKE) { + return GetMoneyValue(param_1); } else { - if (sub_8090A60(param_1->itemIndex)) { + if (IsThrowableItem(param_1->itemIndex)) { return gItemParametersData[param_1->itemIndex].buyPrice * param_1->numItems; } else { @@ -200,13 +199,13 @@ s32 sub_8090BE4(struct ItemStruct_203B460 *param_1) } } -s32 sub_8090C30(struct ItemStruct_203B460 *param_1) +s32 GetStackSellValue(struct ItemSlot *param_1) { - if (param_1->itemIndex == 105) { - return sub_80915D4(param_1); + if (param_1->itemIndex == ITEM_ID_POKE) { + return GetMoneyValue(param_1); } else { - if (sub_8090A60(param_1->itemIndex)) { + if (IsThrowableItem(param_1->itemIndex)) { return gItemParametersData[param_1->itemIndex].sellPrice * param_1->numItems; } else { @@ -215,13 +214,13 @@ s32 sub_8090C30(struct ItemStruct_203B460 *param_1) } } -s32 sub_8090C7C(struct ItemStruct_203B460 *param_1) +s32 GetStackBuyPrice(struct ItemSlot *param_1) { - if (!sub_80914E4(param_1->itemIndex)) { + if (!CanSellItem(param_1->itemIndex)) { return 0; } else { - if (sub_8090A60(param_1->itemIndex)) { + if (IsThrowableItem(param_1->itemIndex)) { return gItemParametersData[param_1->itemIndex].buyPrice * param_1->numItems; } else { @@ -230,13 +229,13 @@ s32 sub_8090C7C(struct ItemStruct_203B460 *param_1) } } -s32 sub_8090CCC(struct ItemStruct_203B460 *param_1) +s32 GetStackSellPrice(struct ItemSlot *param_1) { - if (!sub_80914E4(param_1->itemIndex)) { + if (!CanSellItem(param_1->itemIndex)) { return 0; } else { - if (sub_8090A60(param_1->itemIndex)) { + if (IsThrowableItem(param_1->itemIndex)) { return gItemParametersData[param_1->itemIndex].sellPrice * param_1->numItems; } else { @@ -255,7 +254,7 @@ s32 GetItemSellPrice(u8 itemIndex) return gItemParametersData[itemIndex].sellPrice; } -u8 GetItemOrder(u8 itemIndex) +s32 GetItemOrder(u8 itemIndex) { return gItemParametersData[itemIndex].order; } @@ -285,14 +284,13 @@ u32 GetItemUnkFood(u8 itemIndex, u32 r1) return gItemParametersData[itemIndex].unkFood1[r1]; } -void sub_8090DC4(u32 param_1,u8 itemIndex,u32 param_3) +void sub_8090DC4(void* param_1,u8 itemIndex,u32 param_3) { char acStack104 [80]; - struct ItemStruct_203B460 unkItem; + struct ItemSlot unkItem; strncpy(acStack104,gItemParametersData[itemIndex].namePointer,0x50); sub_8090A8C(&unkItem,itemIndex,0); unkItem.numItems = 1; sub_8090F58(param_1,acStack104,&unkItem,param_3); -} - +} \ No newline at end of file diff --git a/src/items_1.c b/src/items_1.c new file mode 100644 index 0000000..219feb5 --- /dev/null +++ b/src/items_1.c @@ -0,0 +1,413 @@ +#include "global.h" +#include "item.h" +#include "team_inventory.h" +#include "pokemon.h" +#include "subStruct_203B240.h" + +#include + +extern struct TeamInventory *gTeamInventory_203B460; +extern EWRAM_DATA struct Item *gItemParametersData; + +extern void sub_80073B8(u32); +extern u32 sub_8097DF0(char *, struct subStruct_203B240 **); +extern void sub_8092A88(void*, u16); // first arg is some struct +extern void sub_80078A4(u32, u32, u32, u32, u32); +extern u32 sub_8092B00(void*); +extern u8* GetUnformattedTypeString(s16); +extern u32 sub_8092BF4(void*); +extern void sub_80073E0(u32); +extern void xxx_format_and_draw(u32, u32, u8 *, u32, u32); + +extern u8 gUnknown_202DE58[0x58]; +extern u32 gUnknown_202DE30; +extern u8* gPtrTypeText; // ptr to "Type\0" +extern u8* gPtrPPD0Text; // ptr to "PP $d0 \0" +extern u32 gUnknown_810A3F0[100]; +extern struct unkStruct_203B45C *gRecruitedPokemonRef; + +void FillInventoryGaps() +{ + // fill inventory gaps + s32 slot_checking = 0; + s32 last_filled = 0; + + do { + // effectively just a while loop + if ((slot_checking < 20) && !(slot_checking[gTeamInventory_203B460->teamItems].unk0 & 1)) { + // find next empty slot + do { + slot_checking++; + } while ((slot_checking < 20) && !(slot_checking[gTeamInventory_203B460->teamItems].unk0 & 1)); + } + + if (slot_checking == 20) { + break; + } + + if (slot_checking > last_filled) { + // shift it down + gTeamInventory_203B460->teamItems[last_filled] = gTeamInventory_203B460->teamItems[slot_checking]; + } + slot_checking++; + last_filled++; + } while (1); + + // clear out the rest of the slots + for (; last_filled < 20; last_filled++) { + struct ItemSlot *slot; +#ifdef NONMATCHING + slot = &gTeamInventory_203B460->teamItems[last_filled]; +#else + size_t offs = last_filled << 2; + size_t _slot = offs; + _slot += (size_t)gTeamInventory_203B460->teamItems; + slot = (struct ItemSlot*)_slot; // &gTeamInventory_203B460->teamItems[end]; +#endif + slot->itemIndex = 0; + slot->numItems = 0; + slot->unk0 = 0; + } +} + +s32 FindItemInInventory(u8 itemIndex) { + s32 i; + for (i = 0; i < 20; i++) { + if ((gTeamInventory_203B460->teamItems[i].unk0 & 1) && (gTeamInventory_203B460->teamItems[i].itemIndex == itemIndex)) { + return i; + } + } + return -1; +} + +s32 GetItemCountInInventory(u8 _itemIndex) +{ +#ifdef NONMATCHING + s32 count = 0; + s32 i; + for (i = 0; i < 20; i++) { + if ((gTeamInventory_203B460->teamItems[i].unk0 & 1) && (gTeamInventory_203B460->teamItems[i].itemIndex == _itemIndex)) { + count++; + } + } + return count; +#else + // have to do hacky stuff to fix initialization order of r6 and r2 + u32 itemIndex = _itemIndex; + s32 count = 0; + struct ItemSlot *slot = gTeamInventory_203B460->teamItems; + s32 one = 1; + s32 i = 19; + + do { + register u32 unk0 asm("r1") = slot->unk0; + u32 bottom_bit = one; + bottom_bit &= unk0; + if (bottom_bit && (slot->itemIndex == itemIndex)) { + count++; + } + slot++; + } while(--i >= 0); + return count; +#endif +} + +s32 GetItemPossessionCount(u8 itemIndex) +{ +#ifdef NONMATCHING + s32 item_count = GetItemCountInInventory(itemIndex); + s32 i = 0; + + struct unkStruct_203B45C *_gRecruitedPokemonRef = gRecruitedPokemonRef; + for (i = 0; i < NUM_SPECIES; i++) { + struct PokemonStruct* pokemon = &_gRecruitedPokemonRef->pokemon[i]; + if ((pokemon->unk0 & 1) + && ((pokemon->unk0 >> 1) & 1) + && (pokemon->itemIndexHeld != ITEM_ID_NOTHING) + && (pokemon->itemIndexHeld == itemIndex)) { + item_count++; + } + } + return item_count; +#else + // hacky stuff again to fix order of operands in & at bottom bit + s32 item_count = GetItemCountInInventory(itemIndex); + s32 i = 0; + + struct unkStruct_203B45C *_gRecruitedPokemonRef = gRecruitedPokemonRef; + register s32 one_mask asm("r6") = 1; + for (i = 0; i < NUM_SPECIES; i++) { + struct PokemonStruct* pokemon = &_gRecruitedPokemonRef->pokemon[i]; + register int bottom_bit asm("r0") = one_mask; + bottom_bit &= pokemon->unk0; + + if (bottom_bit + && ((pokemon->unk0 >> 1) & one_mask) + && (pokemon->itemIndexHeld != ITEM_ID_NOTHING) + && (pokemon->itemIndexHeld == itemIndex)) { + item_count++; + } + } + return item_count; +#endif +} + +void ShiftItemsDownFrom(s32 start) +{ + s32 i, j; + for (i = start, j = start + 1; i < 19; i++, j++) { + gTeamInventory_203B460->teamItems[i] = gTeamInventory_203B460->teamItems[j]; + } + gTeamInventory_203B460->teamItems[19].itemIndex = 0; + gTeamInventory_203B460->teamItems[19].unk0 = 0; +} + +void ClearItemSlotAt(u32 index) +{ + gTeamInventory_203B460->teamItems[index].itemIndex = ITEM_ID_NOTHING; + gTeamInventory_203B460->teamItems[index].unk0 = 0; +} + +bool8 sub_809124C(u8 itemIndex, u8 param_3) +{ + struct ItemSlot temp; + sub_8090A8C(&temp, itemIndex, param_3); + return AddItemToInventory(&temp); +} + +bool8 sub_8091274(struct ItemSlot_ALT* slot) +{ + struct ItemSlot temp; + + sub_8090B64(&temp, slot); + return AddItemToInventory(&temp); +} + +bool8 AddItemToInventory(const struct ItemSlot* slot) +{ + s32 i; + + // try to add item to inventory, return 1 if failed + for (i = 0; i < 20; i++) { + UNUSED struct ItemSlot* current = &gTeamInventory_203B460->teamItems[i]; + if (!(i[gTeamInventory_203B460->teamItems].unk0 & 1)) { + gTeamInventory_203B460->teamItems[i] = *slot; + return 0; + } + } + return 1; +} + + +void ConvertMoneyItemToMoney() +{ + s32 i = 0; + + do { + UNUSED struct TeamInventory * _gTeamInventory_203B460 = gTeamInventory_203B460; + UNUSED size_t offs = offsetof(struct TeamInventory, teamItems[i]); + + struct ItemSlot* current_slot = &gTeamInventory_203B460->teamItems[i]; + if ((current_slot->unk0 & 1) && (current_slot->itemIndex == ITEM_ID_POKE)) { + u32 result; + + result = GetMoneyValue(current_slot); + AddToTeamMoney(result); + current_slot->itemIndex = 0; + current_slot->numItems = 0; + current_slot->unk0 = 0; + } + } while (++i < 20); + FillInventoryGaps(); + + i = 0; + do { + s32 lowest_index = -1; + UNUSED size_t offs = offsetof(struct TeamInventory, teamItems[i]); + + bool8 item_occupied = i[gTeamInventory_203B460->teamItems].unk0 & 1; + s32 next = i + 1; + + if (item_occupied) { + s32 lowest_order = GetItemOrder(gTeamInventory_203B460->teamItems[i].itemIndex); + s32 j; + + // find next lowest + for (j = next; j < 20; j++) { + UNUSED size_t offs = offsetof(struct TeamInventory, teamItems[j]); + if ((j[gTeamInventory_203B460->teamItems].unk0 & 1) && (lowest_order > GetItemOrder(gTeamInventory_203B460->teamItems[j].itemIndex))) { + lowest_index = j; + lowest_order = GetItemOrder(gTeamInventory_203B460->teamItems[j].itemIndex); + } + } + + if (lowest_index >= 0) { + // swap the slots + struct ItemSlot current = gTeamInventory_203B460->teamItems[i]; + gTeamInventory_203B460->teamItems[i] = gTeamInventory_203B460->teamItems[lowest_index]; + gTeamInventory_203B460->teamItems[lowest_index] = current; + } + } + } while (++i < 20); + FillInventoryGaps(); +} + +void AddToTeamMoney(s32 amount) +{ + s32 clamped_money; + gTeamInventory_203B460->teamMoney += amount; + + // clamp money + clamped_money = 99999; + if (gTeamInventory_203B460->teamMoney <= 99999) { + if (gTeamInventory_203B460->teamMoney >= 0) { + return; + } + clamped_money = 0; + } + gTeamInventory_203B460->teamMoney = clamped_money; +} + +u16 GetItemMove(u8 index) +{ + return gItemParametersData[index & 0xff].move; +} + +u32 sub_80913E0(struct ItemSlot* slot, u32 a2, struct subStruct_203B240 ** a3) +{ + u8 buffer88[88]; // some struct + + GetItemDescription(slot->itemIndex); + sub_8090DC4(buffer88, slot->itemIndex, 0); + if (slot->itemIndex == ITEM_ID_USED_TM) { + // empty HM + sub_8090DC4(&gUnknown_202DE58, (u8)(slot->numItems + 125), 0); + } + sub_80073B8(a2); + xxx_format_and_draw(16, 0, buffer88, a2, 0); + + xxx_format_and_draw(8, 24, GetItemDescription(slot->itemIndex), a2, 0); + if (GetItemType(slot->itemIndex) == ITEM_TYPE_TM) { + u8* buffer8 = buffer88 + 0x50; // field in struct + u16 move = GetItemMove(slot->itemIndex); + u8 moves_data; + u8* typestring; + u32 result; + + sub_8092A88(buffer8, move); + sub_80078A4(a2, 4, 82, 200, 7); + xxx_format_and_draw(4, 84, gPtrTypeText, a2, 0); + moves_data = sub_8092B00(buffer8); + typestring = GetUnformattedTypeString(moves_data); + xxx_format_and_draw(64, 84, typestring, a2, 0); + result = sub_8092BF4(buffer8); + gUnknown_202DE30 = result; + xxx_format_and_draw(128, 84, gPtrPPD0Text, a2, 0); + } + + sub_80073E0(a2); + return sub_8097DF0(GetItemDescription(slot->itemIndex), a3); +} + +bool8 CanSellItem(u32 id) +{ + u8 id_; + id = (u8)id; + id_ = id; + + if((id != ITEM_ID_NOTHING) + && (id != ITEM_ID_POKE) + && (id != ITEM_ID_ROCK_PART) + && (id != ITEM_ID_ICE_PART) + && (id != ITEM_ID_STEEL_PART) + && (id != ITEM_ID_MUSIC_BOX) + && (GetItemSellPrice(id_)) + && (GetItemBuyPrice(id_))) { + return 1; + } + return 0; +} + +bool8 IsNotMoneyOrUsedTMItem(u8 id) +{ + if (id == ITEM_ID_NOTHING) { + return 0; + } + else if (id == ITEM_ID_POKE) { + return 0; + } + else if (id == ITEM_ID_USED_TM) { + return 0; + } + return 1; +} + +bool8 IsNotSpecialItem(u8 id) +{ + if (id == ITEM_ID_NOTHING) { + return 0; + } + else if (id == ITEM_ID_POKE) { + return 0; + } + else if (id == ITEM_ID_ROCK_PART) { + return 0; + } + else if (id == ITEM_ID_ICE_PART) { + return 0; + } + else if (id == ITEM_ID_STEEL_PART) { + return 0; + } + else if (id == ITEM_ID_MUSIC_BOX) { + return 0; + } + return 1; +} + +bool8 IsEdibleItem(u8 id) +{ + if (!((GetItemType(id) == ITEM_TYPE_BERRY_SEED) || (GetItemType(id) == ITEM_TYPE_APPLE_GUMMI))) { + return 0; + } + return 1; +} + +bool8 IsHMItem(u8 id) +{ + if (id == ITEM_ID_CUT) { + return 1; + } + else if (id == ITEM_ID_FLY) { + return 1; + } + else if (id == ITEM_ID_SURF) { + return 1; + } + else if (id == ITEM_ID_STRENGTH) { + return 1; + } + else if (id == ITEM_ID_FLASH) { + return 1; + } + else if (id == ITEM_ID_ROCK_SMASH) { + return 1; + } + else if (id == ITEM_ID_WATERFALL) { + return 1; + } + else if (id == ITEM_ID_DIVE) { + return 1; + } + return 0; +} + +u32 GetMoneyValue(struct ItemSlot* slot) +{ + return gUnknown_810A3F0[slot->numItems]; +} + +u32 GetMoneyValue2(struct ItemSlot* slot) +{ + return gUnknown_810A3F0[slot->numItems]; +} \ No newline at end of file diff --git a/src/kangaskhan_storage_2.c b/src/kangaskhan_storage_2.c index 02059d1..9155ef3 100644 --- a/src/kangaskhan_storage_2.c +++ b/src/kangaskhan_storage_2.c @@ -3,18 +3,18 @@ #include "memory.h" #include "text.h" #include "item.h" -#include "gUnknown_203B460.h" +#include "team_inventory.h" #include "input.h" #include "kangaskhan_storage.h" extern struct unkStruct_203B208 *gUnknown_203B208; -extern struct unkStruct_203B460 *gUnknown_203B460; +extern struct TeamInventory *gTeamInventory_203B460; struct unkStruct_203B20C { u32 state; u8 unk4[4]; - struct ItemStruct_203B460 unk8; + struct ItemSlot unk8; u8 fillC[0x14 - 0xC]; u32 unk14; u32 unk18; @@ -60,7 +60,7 @@ extern u8 sub_8012FD8(u32 *r0); extern void sub_8013114(u32 *, s32 *); extern void sub_801CBB8(); -extern bool8 sub_8091524(u8); +extern bool8 IsNotMoneyOrUsedTMItem(u8); extern bool8 sub_801ADA0(u32); extern void sub_8099690(u32); extern u32 sub_8013BBC(u32 *); @@ -90,7 +90,7 @@ extern void sub_801CCD8(); extern void sub_80184D4(); extern void sub_8018280(); extern void sub_8013AA0(u32 *); -extern void sub_801B3C0(struct ItemStruct_203B460 *); +extern void sub_801B3C0(struct ItemSlot *); extern void sub_801A5D8(u32, u32, u32, u32); extern void sub_801C8C4(u32, u32, u32, u32); extern void sub_8012D60(u32 *, u32 *, u32, u16 *, u32, u32); @@ -117,13 +117,13 @@ void sub_8017AF8(void) else { gUnknown_203B208->unk10 = sub_801A8AC(); - gUnknown_203B208->unkC = gUnknown_203B460->fill0[gUnknown_203B208->unk10]; + gUnknown_203B208->unkC = gTeamInventory_203B460->teamItems[gUnknown_203B208->unk10]; UpdateKangaskhanStorageState(0xF); } break; case 4: gUnknown_203B208->unk10 = sub_801A8AC(); - gUnknown_203B208->unkC = gUnknown_203B460->fill0[gUnknown_203B208->unk10]; + gUnknown_203B208->unkC = gTeamInventory_203B460->teamItems[gUnknown_203B208->unk10]; UpdateKangaskhanStorageState(0x10); break; case 2: @@ -201,7 +201,7 @@ void sub_8017C7C(void) { case 2: sub_8099690(0); - if(!sub_8091524(gUnknown_203B208->unkC.itemIndex)) + if(!IsNotMoneyOrUsedTMItem(gUnknown_203B208->unkC.itemIndex)) UpdateKangaskhanStorageState(9); else if(!sub_801ADA0(gUnknown_203B208->unk10)) @@ -232,14 +232,14 @@ void sub_8017D24(void) switch(menuAction) { case 3: - if (sub_8090A34() > 0x13) + if (GetNumberOfFilledInventorySlots() > 0x13) { sub_801CBB8(); UpdateKangaskhanStorageState(6); } else { - if(sub_8090A60(gUnknown_203B208->unkC.itemIndex)) + if(IsThrowableItem(gUnknown_203B208->unkC.itemIndex)) UpdateKangaskhanStorageState(0x18); else UpdateKangaskhanStorageState(0x1B); @@ -444,10 +444,10 @@ void sub_8018100(void) case 12: gUnknown_203B20C->unkD0 = 2; gUnknown_203B20C->unkC8 = 1; - if(gUnknown_203B460->unk50[gUnknown_203B20C->unk8.itemIndex] > 99) + if(gTeamInventory_203B460->unk50[gUnknown_203B20C->unk8.itemIndex] > 99) gUnknown_203B20C->unkCC = 99; else - gUnknown_203B20C->unkCC = gUnknown_203B460->unk50[gUnknown_203B20C->unk8.itemIndex]; + gUnknown_203B20C->unkCC = gTeamInventory_203B460->unk50[gUnknown_203B20C->unk8.itemIndex]; gUnknown_203B20C->unkC4 = gUnknown_203B20C->unkCC; gUnknown_203B20C->unkD4 = 1; gUnknown_203B20C->unkD8 = &gUnknown_203B20C->unkF0[1]; diff --git a/src/kecleon_items_1.c b/src/kecleon_items_1.c index faa8c6b..b9a1a3c 100644 --- a/src/kecleon_items_1.c +++ b/src/kecleon_items_1.c @@ -4,13 +4,13 @@ #include "input.h" #include "item.h" #include "kecleon_items.h" -#include "gUnknown_203B460.h" +#include "team_inventory.h" extern struct unkStruct_203B210 *gUnknown_203B210; -extern struct unkStruct_203B460 *gUnknown_203B460; +extern struct TeamInventory *gTeamInventory_203B460; -extern u32 sub_8090CCC(struct ItemStruct_203B460 *); -extern bool8 sub_80914E4(u8); +extern u32 GetStackSellPrice(struct ItemSlot *); +extern bool8 CanSellItem(u8); extern u32 sub_8091814(void); extern u32 sub_8091A48(void); extern s32 sub_80144A4(s32 *); @@ -36,14 +36,14 @@ void sub_8019B08(void) break; case 3: gUnknown_203B210->unk24 = sub_801A8AC(); - gUnknown_203B210->unk1C = gUnknown_203B460->fill0[gUnknown_203B210->unk24]; - gUnknown_203B210->itemSellPrice = sub_8090CCC(&gUnknown_203B210->unk1C); + gUnknown_203B210->unk1C = gTeamInventory_203B460->teamItems[gUnknown_203B210->unk24]; + gUnknown_203B210->itemSellPrice = GetStackSellPrice(&gUnknown_203B210->unk1C); UpdateKecleonStoreState(0x1c); break; case 4: gUnknown_203B210->unk24 = sub_801A8AC(); - gUnknown_203B210->unk1C = gUnknown_203B460->fill0[gUnknown_203B210->unk24]; - gUnknown_203B210->itemSellPrice = sub_8090CCC(&gUnknown_203B210->unk1C); + gUnknown_203B210->unk1C = gTeamInventory_203B460->teamItems[gUnknown_203B210->unk24]; + gUnknown_203B210->itemSellPrice = GetStackSellPrice(&gUnknown_203B210->unk1C); sub_8099690(0); UpdateKecleonStoreState(0x1d); break; @@ -74,10 +74,10 @@ void sub_8019BBC(void) } switch(menuAction){ case 2: - if (gUnknown_203B460->teamMoney == 0) { + if (gTeamInventory_203B460->teamMoney == 0) { UpdateKecleonStoreState(0x6); } - else if (gUnknown_203B210->itemSellPrice > gUnknown_203B460->teamMoney) { + else if (gUnknown_203B210->itemSellPrice > gTeamInventory_203B460->teamMoney) { UpdateKecleonStoreState(0xC); } else { @@ -105,10 +105,10 @@ void sub_8019C78(void) switch(menuAction){ case 3: sub_8099690(0); - if (!sub_80914E4(gUnknown_203B210->unk1C.itemIndex)) { + if (!CanSellItem(gUnknown_203B210->unk1C.itemIndex)) { UpdateKecleonStoreState(0xd); } - else if (gUnknown_203B210->itemSellPrice + gUnknown_203B460->teamMoney > 99999) { + else if (gUnknown_203B210->itemSellPrice + gTeamInventory_203B460->teamMoney > 99999) { UpdateKecleonStoreState(0xe); } else { @@ -176,15 +176,15 @@ u32 sub_8019D8C(void) void sub_8019DAC(void) { s32 iVar3; - struct ItemStruct_203B460 *pbVar4; + struct ItemSlot *pbVar4; s32 iVar5; gUnknown_203B210->unk14 = 0; gUnknown_203B210->unk18 = 0; for(iVar5 = 0; iVar5 < 0x14; iVar5++){ - pbVar4 = &gUnknown_203B460->fill0[iVar5]; - if (((pbVar4->unk0 & 1) != 0) && (sub_80914E4(pbVar4->itemIndex))) { - iVar3 = sub_8090CCC(pbVar4); + pbVar4 = &gTeamInventory_203B460->teamItems[iVar5]; + if (((pbVar4->unk0 & 1) != 0) && (CanSellItem(pbVar4->itemIndex))) { + iVar3 = GetStackSellPrice(pbVar4); gUnknown_203B210->unk18 += iVar3; gUnknown_203B210->unk14++; } diff --git a/src/other_menus.c b/src/other_menus.c index 99c8df9..d5134b2 100644 --- a/src/other_menus.c +++ b/src/other_menus.c @@ -2,7 +2,7 @@ #include "input.h" #include "main_menu.h" #include "item.h" -#include "gUnknown_203B460.h" +#include "team_inventory.h" #include "menu.h" #include "memory.h" #include "text.h" @@ -62,7 +62,7 @@ struct unkStruct_8035D94 extern struct unkStruct_8035D94 *sub_8035D94(); -extern struct unkStruct_203B460 *gUnknown_203B460; +extern struct TeamInventory *gTeamInventory_203B460; extern void sub_8037400(void); extern void ResetSprites(u32); @@ -378,7 +378,7 @@ void sub_80371B8(void) if ((((gUnknown_203B35C->unk4 != 0) &&(gUnknown_203B35C->unk0 == 0)) && (pbVar2 = sub_8035D94(), pbVar2->unk0 != 0)) && (pbVar2->unk4 != 0)) { // We received something.. - gUnknown_203B460->unk50[pbVar2->unk0] += pbVar2->unk4; + gTeamInventory_203B460->unk50[pbVar2->unk0] += pbVar2->unk4; } } } diff --git a/src/save.c b/src/save.c index f679cbd..9ad7670 100644 --- a/src/save.c +++ b/src/save.c @@ -70,7 +70,7 @@ extern s32 gUnknown_202DE28; extern u32 gUnknown_203B17C; extern char *gUnknown_203B180; extern struct unkStruct_203B45C *gRecruitedPokemonRef; -extern struct unkStruct_203B460 *gUnknown_203B460; +extern struct TeamInventory *gTeamInventory_203B460; extern struct RescueTeamData *gRescueTeamInfoRef; extern bool8 *gFriendAreas; extern u32 gUnknown_203B46C; @@ -624,7 +624,7 @@ void sub_8012334(struct UnkStruct_203B184 *r0) gUnknown_203B184 = r0; if(r0 != NULL) { - gUnknown_203B460 = r0->MoneyItems; + gTeamInventory_203B460 = r0->MoneyItems; gRecruitedPokemonRef = r0->recruitedPokemon; gUnknown_203B480 = r0->unk8; gUnknown_203B484 = r0->unkC; @@ -639,7 +639,7 @@ void sub_8012334(struct UnkStruct_203B184 *r0) gPlayTimeRef = r0->playTime; return; } - gUnknown_203B460 = GetMoneyItemsInfo(); + gTeamInventory_203B460 = GetMoneyItemsInfo(); gRecruitedPokemonRef = GetRecruitedPokemon(); gUnknown_203B480 = sub_80950F8(); gUnknown_203B484 = sub_8095100(); diff --git a/src/trade_items_menu.c b/src/trade_items_menu.c index 57dd99f..a2053dd 100644 --- a/src/trade_items_menu.c +++ b/src/trade_items_menu.c @@ -1,14 +1,14 @@ #include "global.h" #include "input.h" #include "item.h" +#include "team_inventory.h" #include "trade_items_menu.h" -#include "gUnknown_203B460.h" #include "memory.h" #include "save.h" extern struct TradeItemsMenu *gTradeItemsMenu; -extern struct unkStruct_203B460 *gUnknown_203B460; +extern struct TeamInventory *gTeamInventory_203B460; extern u32 gUnknown_202DE30; extern u32 gUnknown_202DE58; extern struct UnkTextStruct2 gUnknown_80E6174; @@ -44,7 +44,7 @@ extern s32 sub_80144A4(s32 *); extern u32 sub_801CA08(u32); extern void sub_801CBB8(); extern u8 sub_801CB24(); -extern void sub_801B3C0(struct ItemStruct_203B460 *); +extern void sub_801B3C0(struct ItemSlot *); extern u8 sub_8012FD8(u32 *); extern void sub_8013114(u32 *, s32 *); extern void sub_8035CC0(struct UnkTextStruct2 *, u32); @@ -63,7 +63,7 @@ extern void sub_80073E0(u32); extern void xxx_call_draw_string(u32, u32, u32 *, u32, u32); extern u8 sub_801CF14(u32); extern u32 sub_801D008(); -extern void sub_8090DC4(u32 *, u8, u32); +extern void sub_8090DC4(void*, u8, u32); extern void sub_801C8C4(u32, u32, s32 *, u32); void sub_8036F30(); @@ -351,9 +351,9 @@ void TradeItem_SendItemConfirm(void) case 5: sub_801CBB8(); // Used temp var to get correct statements - load = gUnknown_203B460->unk50[gTradeItemsMenu->itemToSend.itemIndex]; + load = gTeamInventory_203B460->unk50[gTradeItemsMenu->itemToSend.itemIndex]; load -= gTradeItemsMenu->numItemsToSend; - gUnknown_203B460->unk50[gTradeItemsMenu->itemToSend.itemIndex] = load; + gTeamInventory_203B460->unk50[gTradeItemsMenu->itemToSend.itemIndex] = load; SetTradeItemMenu(TRADE_ITEMS_PREPARE_TRADE_SAVING); PrepareSavePakWrite(SPECIES_NONE); break; @@ -450,9 +450,9 @@ void TradeItem_AddItem(void) { // Use temp var to get correct statements u16 load; - load = gUnknown_203B460->unk50[gTradeItemsMenu->sentItem.itemIndex]; + load = gTeamInventory_203B460->unk50[gTradeItemsMenu->sentItem.itemIndex]; load += gTradeItemsMenu->sentItem.numItems; - gUnknown_203B460->unk50[gTradeItemsMenu->sentItem.itemIndex] = load; + gTeamInventory_203B460->unk50[gTradeItemsMenu->sentItem.itemIndex] = load; } void sub_80369FC(void) @@ -1082,7 +1082,7 @@ void sub_8036F30(void) void sub_8036F74(void) { sub_8006518(gTradeItemsMenu->unk184); - sub_8036ECC(2, gUnknown_203B460->unk50[gTradeItemsMenu->itemToSend.itemIndex]); + sub_8036ECC(2, gTeamInventory_203B460->unk50[gTradeItemsMenu->itemToSend.itemIndex]); sub_801CCD8(); sub_8035CF4(&gTradeItemsMenu->unk44, 3, 0); sub_8036F30(); diff --git a/src/wonder_mail.c b/src/wonder_mail.c index af16acb..5ddebfe 100644 --- a/src/wonder_mail.c +++ b/src/wonder_mail.c @@ -7,11 +7,11 @@ #include "memory.h" #include "text.h" #include "sub_8095228.h" -#include "gUnknown_203B460.h" +#include "team_inventory.h" extern struct WonderMailStruct_203B2C0 *gUnknown_203B2C0; extern struct WonderMailStruct_203B2C4 *gUnknown_203B2C4; -extern struct unkStruct_203B460 *gUnknown_203B460; +extern struct TeamInventory *gTeamInventory_203B460; extern u32 sub_80144A4(s32 *r0); extern void sub_8011C28(u32); @@ -29,7 +29,7 @@ extern u8 sub_80A2824(u32); #include "data/wonder_mail_1.h" -const struct ItemStruct_203B460 gUnknown_80DED44 = +const struct ItemSlot gUnknown_80DED44 = { 1, 0, 0 }; @@ -170,7 +170,7 @@ extern void sub_803092C(); extern void sub_8035CF4(u32 *, u32, u32); extern u32 sub_801CA08(u32); extern void sub_801CBB8(); -extern void sub_801B3C0(struct ItemStruct_203B460 *); +extern void sub_801B3C0(struct ItemSlot *); extern u8 sub_801CB24(); extern void sub_801B450(); extern u32 sub_801B410(); @@ -1548,7 +1548,7 @@ void sub_8029F98(void) if (sub_80144A4(&auStack20) != 0) { return; } - MemoryFill8((u8 *)&gUnknown_203B2C4->unk41C, 0, sizeof(struct ItemStruct_203B460)); + MemoryFill8((u8 *)&gUnknown_203B2C4->unk41C, 0, sizeof(struct ItemSlot)); gUnknown_203B2C4->unk41C.itemIndex = 0; gUnknown_203B2C4->unk41C.numItems = 1; gUnknown_203B2C4->unk41C.unk0 = 0; @@ -2007,7 +2007,7 @@ void sub_802A798(void) { return_var->unk20 = gUnknown_203B2C4->unk41C; } - gUnknown_203B460->unk50[gUnknown_203B2C4->unk41C.itemIndex]--; + gTeamInventory_203B460->unk50[gUnknown_203B2C4->unk41C.itemIndex]--; sub_802B2BC(0x29); break; case 8: diff --git a/sym_ewram2.txt b/sym_ewram2.txt index 21d1550..455c065 100644 --- a/sym_ewram2.txt +++ b/sym_ewram2.txt @@ -587,7 +587,7 @@ gUnknown_203B458 = .; /* 203B458 */ gRecruitedPokemonRef = .; /* 203B45C */ . += 0x4; -gUnknown_203B460 = .; /* 203B460 */ +gTeamInventory_203B460 = .; /* 203B460 */ . += 0x4; gRescueTeamInfoRef = .; /* 203B464 */ diff --git a/tools/aif2pcm/.gitignore b/tools/aif2pcm/.gitignore index 3153179..e6f739c 100644 --- a/tools/aif2pcm/.gitignore +++ b/tools/aif2pcm/.gitignore @@ -1,2 +1,2 @@ -aif2pcm - +aif2pcm + diff --git a/tools/aif2pcm/LICENSE b/tools/aif2pcm/LICENSE index 966b92b..ce51485 100644 --- a/tools/aif2pcm/LICENSE +++ b/tools/aif2pcm/LICENSE @@ -1,20 +1,20 @@ -Copyright (c) 2016 huderlem -Copyright (c) 2005, 2006 by Marco Trillo - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. +Copyright (c) 2016 huderlem +Copyright (c) 2005, 2006 by Marco Trillo + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/tools/bin2c/.gitignore b/tools/bin2c/.gitignore index 366f3d3..4ab7f6f 100644 --- a/tools/bin2c/.gitignore +++ b/tools/bin2c/.gitignore @@ -1 +1 @@ -bin2c +bin2c diff --git a/tools/bin2c/LICENSE b/tools/bin2c/LICENSE index 534d153..3ef9505 100644 --- a/tools/bin2c/LICENSE +++ b/tools/bin2c/LICENSE @@ -1,19 +1,19 @@ -Copyright (c) 2016 YamaArashi - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. +Copyright (c) 2016 YamaArashi + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/tools/br_ips/.gitignore b/tools/br_ips/.gitignore index f3fb144..8ed5798 100644 --- a/tools/br_ips/.gitignore +++ b/tools/br_ips/.gitignore @@ -1,2 +1,2 @@ -br_ips -ips_patch +br_ips +ips_patch diff --git a/tools/dungeonjson/.gitignore b/tools/dungeonjson/.gitignore index 3a9416d..2980942 100644 --- a/tools/dungeonjson/.gitignore +++ b/tools/dungeonjson/.gitignore @@ -1 +1 @@ -dungeonjson +dungeonjson diff --git a/tools/dungeonjson/dungeonjson.cpp b/tools/dungeonjson/dungeonjson.cpp index c1a4c81..1db7986 100644 --- a/tools/dungeonjson/dungeonjson.cpp +++ b/tools/dungeonjson/dungeonjson.cpp @@ -1,650 +1,650 @@ -// dungeonjson.cpp - -#include -using std::cout; using std::endl; - -#include -using std::string; - -#include -using std::vector; - -#include -using std::sort; using std::find; - -#include -using std::map; - -#include -using std::ofstream; using std::ifstream; - -#include -using std::ostringstream; - -#include -using std::numeric_limits; - -#include "json11.h" -using json11::Json; - -#include "dungeonjson.h" - - -string read_text_file(string filepath) { - ifstream in_file(filepath); - - if (!in_file.is_open()) - FATAL_ERROR("Cannot open file %s for reading.\n", filepath.c_str()); - - string text; - - in_file.seekg(0, std::ios::end); - text.resize(in_file.tellg()); - - in_file.seekg(0, std::ios::beg); - in_file.read(&text[0], text.size()); - - in_file.close(); - - return text; -} - -void write_text_file(string filepath, string text) { - ofstream out_file(filepath, std::ofstream::binary); - - if (!out_file.is_open()) - FATAL_ERROR("Cannot open file %s for writing.\n", filepath.c_str()); - - out_file << text; - - out_file.close(); -} - -string generate_map_header_text(Json map_data, Json layouts_data, string version) { - string map_layout_id = map_data["layout"].string_value(); - - vector matched; - - for (auto &field : layouts_data["layouts"].array_items()) { - if (map_layout_id == field["id"].string_value()) - matched.push_back(field); - } - - if (matched.size() != 1) - FATAL_ERROR("Failed to find matching layout for %s.\n", map_layout_id.c_str()); - - Json layout = matched[0]; - - ostringstream text; - - text << map_data["name"].string_value() << ":\n" - << "\t.4byte " << layout["name"].string_value() << "\n"; - - if (map_data.object_items().find("shared_events_map") != map_data.object_items().end()) - text << "\t.4byte " << map_data["shared_events_map"].string_value() << "_MapEvents\n"; - else - text << "\t.4byte " << map_data["name"].string_value() << "_MapEvents\n"; - - if (map_data.object_items().find("shared_scripts_map") != map_data.object_items().end()) - text << "\t.4byte " << map_data["shared_scripts_map"].string_value() << "_MapScripts\n"; - else - text << "\t.4byte " << map_data["name"].string_value() << "_MapScripts\n"; - - if (map_data.object_items().find("connections") != map_data.object_items().end() - && map_data["connections"].array_items().size() > 0) - text << "\t.4byte " << map_data["name"].string_value() << "_MapConnections\n"; - else - text << "\t.4byte 0x0\n"; - - text << "\t.2byte " << map_data["music"].string_value() << "\n" - << "\t.2byte " << layout["id"].string_value() << "\n" - << "\t.byte " << map_data["region_map_section"].string_value() << "\n" - << "\t.byte " << map_data["requires_flash"].bool_value() << "\n" - << "\t.byte " << map_data["weather"].string_value() << "\n" - << "\t.byte " << map_data["map_type"].string_value() << "\n" - << "\t.2byte 0\n"; - - if (version == "ruby") - text << "\t.byte " << map_data["show_map_name"].bool_value() << "\n"; - else if (version == "emerald") - text << "\tmap_header_flags " - << "allow_cycling=" << map_data["allow_cycling"].bool_value() << ", " - << "allow_escaping=" << map_data["allow_escaping"].bool_value() << ", " - << "allow_running=" << map_data["allow_running"].bool_value() << ", " - << "show_map_name=" << map_data["show_map_name"].bool_value() << "\n"; - - text << "\t.byte " << map_data["battle_scene"].string_value() << "\n\n"; - - return text.str(); -} - -string generate_map_connections_text(Json map_data) { - if (map_data["connections"] == Json()) - return string("\n"); - - ostringstream text; - - text << map_data["name"].string_value() << "_MapConnectionsList:\n"; - - for (auto &connection : map_data["connections"].array_items()) { - text << "\tconnection " - << connection["direction"].string_value() << ", " - << connection["offset"].int_value() << ", " - << connection["map"].string_value() << "\n"; - } - - text << "\n" << map_data["name"].string_value() << "_MapConnections:\n" - << "\t.4byte " << map_data["connections"].array_items().size() << "\n" - << "\t.4byte " << map_data["name"].string_value() << "_MapConnectionsList\n\n"; - - return text.str(); -} - -string generate_map_events_text(Json map_data) { - if (map_data.object_items().find("shared_events_map") != map_data.object_items().end()) - return string("\n"); - - ostringstream text; - - string objects_label, warps_label, coords_label, bgs_label; - - if (map_data["object_events"].array_items().size() > 0) { - objects_label = map_data["name"].string_value() + "_ObjectEvents"; - text << objects_label << ":\n"; - for (unsigned int i = 0; i < map_data["object_events"].array_items().size(); i++) { - auto obj_event = map_data["object_events"].array_items()[i]; - text << "\tobject_event " << i + 1 << ", " - << obj_event["graphics_id"].string_value() << ", 0, " - << obj_event["x"].int_value() << ", " - << obj_event["y"].int_value() << ", " - << obj_event["elevation"].int_value() << ", " - << obj_event["movement_type"].string_value() << ", " - << obj_event["movement_range_x"].int_value() << ", " - << obj_event["movement_range_y"].int_value() << ", " - << obj_event["trainer_type"].string_value() << ", " - << obj_event["trainer_sight_or_berry_tree_id"].string_value() << ", " - << obj_event["script"].string_value() << ", " - << obj_event["flag"].string_value() << "\n"; - } - text << "\n"; - } else { - objects_label = "0x0"; - } - - if (map_data["warp_events"].array_items().size() > 0) { - warps_label = map_data["name"].string_value() + "_MapWarps"; - text << warps_label << ":\n"; - for (auto &warp_event : map_data["warp_events"].array_items()) { - text << "\twarp_def " - << warp_event["x"].int_value() << ", " - << warp_event["y"].int_value() << ", " - << warp_event["elevation"].int_value() << ", " - << warp_event["dest_warp_id"].int_value() << ", " - << warp_event["dest_map"].string_value() << "\n"; - } - text << "\n"; - } else { - warps_label = "0x0"; - } - - if (map_data["coord_events"].array_items().size() > 0) { - coords_label = map_data["name"].string_value() + "_MapCoordEvents"; - text << coords_label << ":\n"; - for (auto &coord_event : map_data["coord_events"].array_items()) { - if (coord_event["type"].string_value() == "trigger") { - text << "\tcoord_event " - << coord_event["x"].int_value() << ", " - << coord_event["y"].int_value() << ", " - << coord_event["elevation"].int_value() << ", " - << coord_event["var"].string_value() << ", " - << coord_event["var_value"].string_value() << ", " - << coord_event["script"].string_value() << "\n"; - } - else if (coord_event["type"] == "weather") { - text << "\tcoord_weather_event " - << coord_event["x"].int_value() << ", " - << coord_event["y"].int_value() << ", " - << coord_event["elevation"].int_value() << ", " - << coord_event["weather"].string_value() << "\n"; - } - } - text << "\n"; - } else { - coords_label = "0x0"; - } - - if (map_data["bg_events"].array_items().size() > 0) { - bgs_label = map_data["name"].string_value() + "_MapBGEvents"; - text << bgs_label << ":\n"; - for (auto &bg_event : map_data["bg_events"].array_items()) { - if (bg_event["type"] == "sign") { - text << "\tbg_event " - << bg_event["x"].int_value() << ", " - << bg_event["y"].int_value() << ", " - << bg_event["elevation"].int_value() << ", " - << bg_event["player_facing_dir"].string_value() << ", " - << bg_event["script"].string_value() << "\n"; - } - else if (bg_event["type"] == "hidden_item") { - text << "\tbg_hidden_item_event " - << bg_event["x"].int_value() << ", " - << bg_event["y"].int_value() << ", " - << bg_event["elevation"].int_value() << ", " - << bg_event["item"].string_value() << ", " - << bg_event["flag"].string_value() << "\n"; - } - else if (bg_event["type"] == "secret_base") { - text << "\tbg_secret_base_event " - << bg_event["x"].int_value() << ", " - << bg_event["y"].int_value() << ", " - << bg_event["elevation"].int_value() << ", " - << bg_event["secret_base_id"].string_value() << "\n"; - } - } - text << "\n"; - } else { - bgs_label = "0x0"; - } - - text << map_data["name"].string_value() << "_MapEvents::\n" - << "\tmap_events " << objects_label << ", " << warps_label << ", " - << coords_label << ", " << bgs_label << "\n\n"; - - return text.str(); -} - -string generate_pokemon_table_text(Json map_data) { - - ostringstream text; - int pokemon_mask; - int probability_total; - - text << "@ This is auto-generated by " << map_data["name"].string_value() << ".json" << "\n"; - for (auto &table: map_data["tables"].array_items()) { - probability_total = 0; - - text << ".global " << table["name"].string_value() << "\n"; - text << table["name"].string_value() << ":\n"; - - for (auto &pokemon: table["pokemon"].array_items()) { - pokemon_mask = (pokemon["level"].int_value() * 512); - probability_total += pokemon["probability"].int_value(); - text << ".2byte " << pokemon["species"].string_value() << " + " << pokemon_mask; - // We have to repeat to maintain matching - if(pokemon["probability"].int_value() == 0) - { - text << ", " << "0x00, 0x00"; - } - else - { - text << ", " << probability_total << ", " << probability_total; - } - text << ", " << "0x00" << "\n"; - } - - // Append null entry to end - text << "@ END OF TABLE" << "\n"; - text << ".2byte " << "0x00, 0x00, 0x00, 0x00" << "\n"; - } - - return text.str(); -} - -string generate_floorID_table_text(Json map_data) { - - ostringstream text; - - text << "@ This is auto-generated by " << map_data["name"].string_value() << ".json" << "\n"; - - text << ".global " << map_data["name"].string_value() << "\n"; - text << map_data["name"].string_value() << ":\n"; - // Append null entry to Start - text << ".2byte " << "0, 0, 0, 0, 0, 0, 0, 0" << "\n"; - for (auto &table: map_data["tables"].array_items()) { - - text << ".2byte " << table["MainData"].int_value() - << ", " << table["Pokemon"].int_value() - << ", " << table["Traps"].int_value() - << ", " << table["Items"].int_value() - << ", " << table["KecleonShop"].int_value() - << ", " << table["MonsterRoomItems"].int_value() - << ", " << table["BuriedItems"].int_value() - << ", " << "0" << "\n"; - - } - text << "@ END OF TABLE" << "\n"; - - return text.str(); -} - -string get_directory_name(string filename) { - size_t dir_pos = filename.find_last_of("/\\"); - - return filename.substr(0, dir_pos + 1); -} - -void process_map(string map_filepath, string layouts_filepath, string version) { - string mapdata_err, layouts_err; - - string mapdata_json_text = read_text_file(map_filepath); - string layouts_json_text = read_text_file(layouts_filepath); - - Json map_data = Json::parse(mapdata_json_text, mapdata_err); - if (map_data == Json()) - FATAL_ERROR("%s\n", mapdata_err.c_str()); - - Json layouts_data = Json::parse(layouts_json_text, layouts_err); - if (layouts_data == Json()) - FATAL_ERROR("%s\n", layouts_err.c_str()); - - string header_text = generate_map_header_text(map_data, layouts_data, version); - string events_text = generate_map_events_text(map_data); - string connections_text = generate_map_connections_text(map_data); - - string files_dir = get_directory_name(map_filepath); - write_text_file(files_dir + "header.inc", header_text); - write_text_file(files_dir + "events.inc", events_text); - write_text_file(files_dir + "connections.inc", connections_text); -} - -void process_dungeon(string map_filepath) { - string mapdata_err; - - string mapdata_json_text = read_text_file(map_filepath); - - Json map_data = Json::parse(mapdata_json_text, mapdata_err); - if (map_data == Json()) - FATAL_ERROR("%s\n", mapdata_err.c_str()); - - string pokemon_text = generate_pokemon_table_text(map_data); - - string files_dir = get_directory_name(map_filepath); - write_text_file(files_dir + "pokemon_found.inc", pokemon_text); -} - -void process_floorID(string map_filepath) { - string mapdata_err; - - string mapdata_json_text = read_text_file(map_filepath); - - Json map_data = Json::parse(mapdata_json_text, mapdata_err); - if (map_data == Json()) - FATAL_ERROR("%s\n", mapdata_err.c_str()); - - string pokemon_text = generate_floorID_table_text(map_data); - - string files_dir = get_directory_name(map_filepath); - write_text_file(files_dir + "floor_id.inc", pokemon_text); -} - -string generate_groups_text(Json groups_data) { - ostringstream text; - - for (auto &key : groups_data["group_order"].array_items()) { - string group = key.string_value(); - text << group << "::\n"; - auto maps = groups_data[group].array_items(); - for (Json &map_name : maps) - text << "\t.4byte " << map_name.string_value() << "\n"; - text << "\n"; - } - - text << "\t.align 2\n" << "gMapGroups::\n"; - for (auto &group : groups_data["group_order"].array_items()) - text << "\t.4byte " << group.string_value() << "\n"; - text << "\n"; - - return text.str(); -} - -string generate_connections_text(Json groups_data) { - vector map_names; - - for (auto &group : groups_data["group_order"].array_items()) - for (auto map_name : groups_data[group.string_value()].array_items()) - map_names.push_back(map_name); - - vector connections_include_order = groups_data["connections_include_order"].array_items(); - - if (connections_include_order.size() > 0) - sort(map_names.begin(), map_names.end(), [connections_include_order](const Json &a, const Json &b) { - auto iter_a = find(connections_include_order.begin(), connections_include_order.end(), a); - if (iter_a == connections_include_order.end()) - iter_a = connections_include_order.begin() + numeric_limits::max(); - auto iter_b = find(connections_include_order.begin(), connections_include_order.end(), b); - if (iter_b == connections_include_order.end()) - iter_b = connections_include_order.begin() + numeric_limits::max(); - return iter_a < iter_b; - }); - - ostringstream text; - - for (Json map_name : map_names) - text << "\t.include \"data/maps/" << map_name.string_value() << "/connections.inc\"\n"; - - return text.str(); -} - -string generate_headers_text(Json groups_data) { - vector map_names; - - for (auto &group : groups_data["group_order"].array_items()) - for (auto map_name : groups_data[group.string_value()].array_items()) - map_names.push_back(map_name.string_value()); - - ostringstream text; - - for (string map_name : map_names) - text << "\t.include \"data/maps/" << map_name << "/header.inc\"\n"; - - return text.str(); -} - -string generate_events_text(Json groups_data) { - vector map_names; - - for (auto &group : groups_data["group_order"].array_items()) - for (auto map_name : groups_data[group.string_value()].array_items()) - map_names.push_back(map_name.string_value()); - - ostringstream text; - - for (string map_name : map_names) - text << "\t.include \"data/maps/" << map_name << "/events.inc\"\n"; - - return text.str(); -} - -string generate_map_constants_text(string groups_filepath, Json groups_data) { - string file_dir = get_directory_name(groups_filepath); - char dir_separator = file_dir.back(); - - ostringstream text; - - text << "#ifndef GUARD_CONSTANTS_MAP_GROUPS_H\n" - << "#define GUARD_CONSTANTS_MAP_GROUPS_H\n\n"; - - int group_num = 0; - - for (auto &group : groups_data["group_order"].array_items()) { - text << "// Map Group " << group_num << "\n"; - vector map_ids; - size_t max_length = 0; - - for (auto &map_name : groups_data[group.string_value()].array_items()) { - string header_filepath = file_dir + map_name.string_value() + dir_separator + "map.json"; - string err_str; - Json map_data = Json::parse(read_text_file(header_filepath), err_str); - map_ids.push_back(map_data["id"]); - if (map_data["id"].string_value().length() > max_length) - max_length = map_data["id"].string_value().length(); - } - - int map_id_num = 0; - for (Json map_id : map_ids) { - text << "#define " << map_id.string_value() << string((max_length - map_id.string_value().length() + 1), ' ') - << "(" << map_id_num++ << " | (" << group_num << " << 8))\n"; - } - text << "\n"; - - group_num++; - } - - text << "#define MAP_GROUPS_COUNT " << group_num << "\n\n"; - text << "#endif // GUARD_CONSTANTS_MAP_GROUPS_H\n"; - - return text.str(); -} - -void process_groups(string groups_filepath) { - string err; - Json groups_data = Json::parse(read_text_file(groups_filepath), err); - - if (groups_data == Json()) - FATAL_ERROR("%s\n", err.c_str()); - - string groups_text = generate_groups_text(groups_data); - string connections_text = generate_connections_text(groups_data); - string headers_text = generate_headers_text(groups_data); - string events_text = generate_events_text(groups_data); - string map_header_text = generate_map_constants_text(groups_filepath, groups_data); - - string file_dir = get_directory_name(groups_filepath); - char s = file_dir.back(); - - write_text_file(file_dir + "groups.inc", groups_text); - write_text_file(file_dir + "connections.inc", connections_text); - write_text_file(file_dir + "headers.inc", headers_text); - write_text_file(file_dir + "events.inc", events_text); - write_text_file(file_dir + ".." + s + ".." + s + "include" + s + "constants" + s + "map_groups.h", map_header_text); -} - -string generate_layout_headers_text(Json layouts_data) { - ostringstream text; - - for (auto &layout : layouts_data["layouts"].array_items()) { - string border_label = layout["name"].string_value() + "_Border"; - string blockdata_label = layout["name"].string_value() + "_Blockdata"; - text << border_label << "::\n" - << "\t.incbin \"" << layout["border_filepath"].string_value() << "\"\n\n" - << blockdata_label << "::\n" - << "\t.incbin \"" << layout["blockdata_filepath"].string_value() << "\"\n\n" - << "\t.align 2\n" - << layout["name"].string_value() << "::\n" - << "\t.4byte " << layout["width"].int_value() << "\n" - << "\t.4byte " << layout["height"].int_value() << "\n" - << "\t.4byte " << border_label << "\n" - << "\t.4byte " << blockdata_label << "\n" - << "\t.4byte " << layout["primary_tileset"].string_value() << "\n" - << "\t.4byte " << layout["secondary_tileset"].string_value() << "\n\n"; - } - - return text.str(); -} - -string generate_layouts_table_text(Json layouts_data) { - ostringstream text; - - text << "\t.align 2\n" - << layouts_data["layouts_table_label"].string_value() << "::\n"; - - for (auto &layout : layouts_data["layouts"].array_items()) - text << "\t.4byte " << layout["name"].string_value() << "\n"; - - return text.str(); -} - -string generate_layouts_constants_text(Json layouts_data) { - ostringstream text; - - text << "#ifndef GUARD_CONSTANTS_LAYOUTS_H\n" - << "#define GUARD_CONSTANTS_LAYOUTS_H\n\n"; - - int i = 0; - for (auto &layout : layouts_data["layouts"].array_items()) - text << "#define " << layout["id"].string_value() << " " << ++i << "\n"; - - text << "\n#endif // GUARD_CONSTANTS_LAYOUTS_H\n"; - - return text.str(); -} - -void process_layouts(string layouts_filepath) { - string err; - Json layouts_data = Json::parse(read_text_file(layouts_filepath), err); - - if (layouts_data == Json()) - FATAL_ERROR("%s\n", err.c_str()); - - string layout_headers_text = generate_layout_headers_text(layouts_data); - string layouts_table_text = generate_layouts_table_text(layouts_data); - string layouts_constants_text = generate_layouts_constants_text(layouts_data); - - string file_dir = get_directory_name(layouts_filepath); - char s = file_dir.back(); - - write_text_file(file_dir + "layouts.inc", layout_headers_text); - write_text_file(file_dir + "layouts_table.inc", layouts_table_text); - write_text_file(file_dir + ".." + s + ".." + s + "include" + s + "constants" + s + "layouts.h", layouts_constants_text); -} - -int main(int argc, char *argv[]) { - if (argc < 3) - FATAL_ERROR("USAGE: dungeonjson [options]\n"); - - char *version_arg = argv[2]; - string version(version_arg); - if (version != "emerald" && version != "ruby" && version != "pmd-red") - FATAL_ERROR("ERROR: must be 'emerald' or 'ruby' or 'pmd-red'.\n"); - - char *mode_arg = argv[1]; - string mode(mode_arg); - if (mode != "layouts" && mode != "map" && mode != "groups" && mode != "dungeon" && mode != "floor") - FATAL_ERROR("ERROR: must be 'layouts', 'map', 'groups', 'dungeon' or 'floor' '.\n"); - - if (mode == "map") { - if (argc != 5) - FATAL_ERROR("USAGE: dungeonjson map \n"); - - string filepath(argv[3]); - string layouts_filepath(argv[4]); - - process_map(filepath, layouts_filepath, version); - } - else if (mode == "groups") { - if (argc != 4) - FATAL_ERROR("USAGE: dungeonjson groups \n"); - - string filepath(argv[3]); - - process_groups(filepath); - } - else if (mode == "layouts") { - if (argc != 4) - FATAL_ERROR("USAGE: dungeonjson layouts \n"); - - string filepath(argv[3]); - - process_layouts(filepath); - } - else if (mode == "dungeon") { - if (argc != 4) - FATAL_ERROR("USAGE: dungeonjson dungeon \n"); - - string filepath(argv[3]); - - process_dungeon(filepath); - } - else if (mode == "floor") { - if (argc != 4) - FATAL_ERROR("USAGE: dungeonjson dungeon \n"); - - string filepath(argv[3]); - - process_floorID(filepath); - } - - - - return 0; -} +// dungeonjson.cpp + +#include +using std::cout; using std::endl; + +#include +using std::string; + +#include +using std::vector; + +#include +using std::sort; using std::find; + +#include +using std::map; + +#include +using std::ofstream; using std::ifstream; + +#include +using std::ostringstream; + +#include +using std::numeric_limits; + +#include "json11.h" +using json11::Json; + +#include "dungeonjson.h" + + +string read_text_file(string filepath) { + ifstream in_file(filepath); + + if (!in_file.is_open()) + FATAL_ERROR("Cannot open file %s for reading.\n", filepath.c_str()); + + string text; + + in_file.seekg(0, std::ios::end); + text.resize(in_file.tellg()); + + in_file.seekg(0, std::ios::beg); + in_file.read(&text[0], text.size()); + + in_file.close(); + + return text; +} + +void write_text_file(string filepath, string text) { + ofstream out_file(filepath, std::ofstream::binary); + + if (!out_file.is_open()) + FATAL_ERROR("Cannot open file %s for writing.\n", filepath.c_str()); + + out_file << text; + + out_file.close(); +} + +string generate_map_header_text(Json map_data, Json layouts_data, string version) { + string map_layout_id = map_data["layout"].string_value(); + + vector matched; + + for (auto &field : layouts_data["layouts"].array_items()) { + if (map_layout_id == field["id"].string_value()) + matched.push_back(field); + } + + if (matched.size() != 1) + FATAL_ERROR("Failed to find matching layout for %s.\n", map_layout_id.c_str()); + + Json layout = matched[0]; + + ostringstream text; + + text << map_data["name"].string_value() << ":\n" + << "\t.4byte " << layout["name"].string_value() << "\n"; + + if (map_data.object_items().find("shared_events_map") != map_data.object_items().end()) + text << "\t.4byte " << map_data["shared_events_map"].string_value() << "_MapEvents\n"; + else + text << "\t.4byte " << map_data["name"].string_value() << "_MapEvents\n"; + + if (map_data.object_items().find("shared_scripts_map") != map_data.object_items().end()) + text << "\t.4byte " << map_data["shared_scripts_map"].string_value() << "_MapScripts\n"; + else + text << "\t.4byte " << map_data["name"].string_value() << "_MapScripts\n"; + + if (map_data.object_items().find("connections") != map_data.object_items().end() + && map_data["connections"].array_items().size() > 0) + text << "\t.4byte " << map_data["name"].string_value() << "_MapConnections\n"; + else + text << "\t.4byte 0x0\n"; + + text << "\t.2byte " << map_data["music"].string_value() << "\n" + << "\t.2byte " << layout["id"].string_value() << "\n" + << "\t.byte " << map_data["region_map_section"].string_value() << "\n" + << "\t.byte " << map_data["requires_flash"].bool_value() << "\n" + << "\t.byte " << map_data["weather"].string_value() << "\n" + << "\t.byte " << map_data["map_type"].string_value() << "\n" + << "\t.2byte 0\n"; + + if (version == "ruby") + text << "\t.byte " << map_data["show_map_name"].bool_value() << "\n"; + else if (version == "emerald") + text << "\tmap_header_flags " + << "allow_cycling=" << map_data["allow_cycling"].bool_value() << ", " + << "allow_escaping=" << map_data["allow_escaping"].bool_value() << ", " + << "allow_running=" << map_data["allow_running"].bool_value() << ", " + << "show_map_name=" << map_data["show_map_name"].bool_value() << "\n"; + + text << "\t.byte " << map_data["battle_scene"].string_value() << "\n\n"; + + return text.str(); +} + +string generate_map_connections_text(Json map_data) { + if (map_data["connections"] == Json()) + return string("\n"); + + ostringstream text; + + text << map_data["name"].string_value() << "_MapConnectionsList:\n"; + + for (auto &connection : map_data["connections"].array_items()) { + text << "\tconnection " + << connection["direction"].string_value() << ", " + << connection["offset"].int_value() << ", " + << connection["map"].string_value() << "\n"; + } + + text << "\n" << map_data["name"].string_value() << "_MapConnections:\n" + << "\t.4byte " << map_data["connections"].array_items().size() << "\n" + << "\t.4byte " << map_data["name"].string_value() << "_MapConnectionsList\n\n"; + + return text.str(); +} + +string generate_map_events_text(Json map_data) { + if (map_data.object_items().find("shared_events_map") != map_data.object_items().end()) + return string("\n"); + + ostringstream text; + + string objects_label, warps_label, coords_label, bgs_label; + + if (map_data["object_events"].array_items().size() > 0) { + objects_label = map_data["name"].string_value() + "_ObjectEvents"; + text << objects_label << ":\n"; + for (unsigned int i = 0; i < map_data["object_events"].array_items().size(); i++) { + auto obj_event = map_data["object_events"].array_items()[i]; + text << "\tobject_event " << i + 1 << ", " + << obj_event["graphics_id"].string_value() << ", 0, " + << obj_event["x"].int_value() << ", " + << obj_event["y"].int_value() << ", " + << obj_event["elevation"].int_value() << ", " + << obj_event["movement_type"].string_value() << ", " + << obj_event["movement_range_x"].int_value() << ", " + << obj_event["movement_range_y"].int_value() << ", " + << obj_event["trainer_type"].string_value() << ", " + << obj_event["trainer_sight_or_berry_tree_id"].string_value() << ", " + << obj_event["script"].string_value() << ", " + << obj_event["flag"].string_value() << "\n"; + } + text << "\n"; + } else { + objects_label = "0x0"; + } + + if (map_data["warp_events"].array_items().size() > 0) { + warps_label = map_data["name"].string_value() + "_MapWarps"; + text << warps_label << ":\n"; + for (auto &warp_event : map_data["warp_events"].array_items()) { + text << "\twarp_def " + << warp_event["x"].int_value() << ", " + << warp_event["y"].int_value() << ", " + << warp_event["elevation"].int_value() << ", " + << warp_event["dest_warp_id"].int_value() << ", " + << warp_event["dest_map"].string_value() << "\n"; + } + text << "\n"; + } else { + warps_label = "0x0"; + } + + if (map_data["coord_events"].array_items().size() > 0) { + coords_label = map_data["name"].string_value() + "_MapCoordEvents"; + text << coords_label << ":\n"; + for (auto &coord_event : map_data["coord_events"].array_items()) { + if (coord_event["type"].string_value() == "trigger") { + text << "\tcoord_event " + << coord_event["x"].int_value() << ", " + << coord_event["y"].int_value() << ", " + << coord_event["elevation"].int_value() << ", " + << coord_event["var"].string_value() << ", " + << coord_event["var_value"].string_value() << ", " + << coord_event["script"].string_value() << "\n"; + } + else if (coord_event["type"] == "weather") { + text << "\tcoord_weather_event " + << coord_event["x"].int_value() << ", " + << coord_event["y"].int_value() << ", " + << coord_event["elevation"].int_value() << ", " + << coord_event["weather"].string_value() << "\n"; + } + } + text << "\n"; + } else { + coords_label = "0x0"; + } + + if (map_data["bg_events"].array_items().size() > 0) { + bgs_label = map_data["name"].string_value() + "_MapBGEvents"; + text << bgs_label << ":\n"; + for (auto &bg_event : map_data["bg_events"].array_items()) { + if (bg_event["type"] == "sign") { + text << "\tbg_event " + << bg_event["x"].int_value() << ", " + << bg_event["y"].int_value() << ", " + << bg_event["elevation"].int_value() << ", " + << bg_event["player_facing_dir"].string_value() << ", " + << bg_event["script"].string_value() << "\n"; + } + else if (bg_event["type"] == "hidden_item") { + text << "\tbg_hidden_item_event " + << bg_event["x"].int_value() << ", " + << bg_event["y"].int_value() << ", " + << bg_event["elevation"].int_value() << ", " + << bg_event["item"].string_value() << ", " + << bg_event["flag"].string_value() << "\n"; + } + else if (bg_event["type"] == "secret_base") { + text << "\tbg_secret_base_event " + << bg_event["x"].int_value() << ", " + << bg_event["y"].int_value() << ", " + << bg_event["elevation"].int_value() << ", " + << bg_event["secret_base_id"].string_value() << "\n"; + } + } + text << "\n"; + } else { + bgs_label = "0x0"; + } + + text << map_data["name"].string_value() << "_MapEvents::\n" + << "\tmap_events " << objects_label << ", " << warps_label << ", " + << coords_label << ", " << bgs_label << "\n\n"; + + return text.str(); +} + +string generate_pokemon_table_text(Json map_data) { + + ostringstream text; + int pokemon_mask; + int probability_total; + + text << "@ This is auto-generated by " << map_data["name"].string_value() << ".json" << "\n"; + for (auto &table: map_data["tables"].array_items()) { + probability_total = 0; + + text << ".global " << table["name"].string_value() << "\n"; + text << table["name"].string_value() << ":\n"; + + for (auto &pokemon: table["pokemon"].array_items()) { + pokemon_mask = (pokemon["level"].int_value() * 512); + probability_total += pokemon["probability"].int_value(); + text << ".2byte " << pokemon["species"].string_value() << " + " << pokemon_mask; + // We have to repeat to maintain matching + if(pokemon["probability"].int_value() == 0) + { + text << ", " << "0x00, 0x00"; + } + else + { + text << ", " << probability_total << ", " << probability_total; + } + text << ", " << "0x00" << "\n"; + } + + // Append null entry to end + text << "@ END OF TABLE" << "\n"; + text << ".2byte " << "0x00, 0x00, 0x00, 0x00" << "\n"; + } + + return text.str(); +} + +string generate_floorID_table_text(Json map_data) { + + ostringstream text; + + text << "@ This is auto-generated by " << map_data["name"].string_value() << ".json" << "\n"; + + text << ".global " << map_data["name"].string_value() << "\n"; + text << map_data["name"].string_value() << ":\n"; + // Append null entry to Start + text << ".2byte " << "0, 0, 0, 0, 0, 0, 0, 0" << "\n"; + for (auto &table: map_data["tables"].array_items()) { + + text << ".2byte " << table["MainData"].int_value() + << ", " << table["Pokemon"].int_value() + << ", " << table["Traps"].int_value() + << ", " << table["Items"].int_value() + << ", " << table["KecleonShop"].int_value() + << ", " << table["MonsterRoomItems"].int_value() + << ", " << table["BuriedItems"].int_value() + << ", " << "0" << "\n"; + + } + text << "@ END OF TABLE" << "\n"; + + return text.str(); +} + +string get_directory_name(string filename) { + size_t dir_pos = filename.find_last_of("/\\"); + + return filename.substr(0, dir_pos + 1); +} + +void process_map(string map_filepath, string layouts_filepath, string version) { + string mapdata_err, layouts_err; + + string mapdata_json_text = read_text_file(map_filepath); + string layouts_json_text = read_text_file(layouts_filepath); + + Json map_data = Json::parse(mapdata_json_text, mapdata_err); + if (map_data == Json()) + FATAL_ERROR("%s\n", mapdata_err.c_str()); + + Json layouts_data = Json::parse(layouts_json_text, layouts_err); + if (layouts_data == Json()) + FATAL_ERROR("%s\n", layouts_err.c_str()); + + string header_text = generate_map_header_text(map_data, layouts_data, version); + string events_text = generate_map_events_text(map_data); + string connections_text = generate_map_connections_text(map_data); + + string files_dir = get_directory_name(map_filepath); + write_text_file(files_dir + "header.inc", header_text); + write_text_file(files_dir + "events.inc", events_text); + write_text_file(files_dir + "connections.inc", connections_text); +} + +void process_dungeon(string map_filepath) { + string mapdata_err; + + string mapdata_json_text = read_text_file(map_filepath); + + Json map_data = Json::parse(mapdata_json_text, mapdata_err); + if (map_data == Json()) + FATAL_ERROR("%s\n", mapdata_err.c_str()); + + string pokemon_text = generate_pokemon_table_text(map_data); + + string files_dir = get_directory_name(map_filepath); + write_text_file(files_dir + "pokemon_found.inc", pokemon_text); +} + +void process_floorID(string map_filepath) { + string mapdata_err; + + string mapdata_json_text = read_text_file(map_filepath); + + Json map_data = Json::parse(mapdata_json_text, mapdata_err); + if (map_data == Json()) + FATAL_ERROR("%s\n", mapdata_err.c_str()); + + string pokemon_text = generate_floorID_table_text(map_data); + + string files_dir = get_directory_name(map_filepath); + write_text_file(files_dir + "floor_id.inc", pokemon_text); +} + +string generate_groups_text(Json groups_data) { + ostringstream text; + + for (auto &key : groups_data["group_order"].array_items()) { + string group = key.string_value(); + text << group << "::\n"; + auto maps = groups_data[group].array_items(); + for (Json &map_name : maps) + text << "\t.4byte " << map_name.string_value() << "\n"; + text << "\n"; + } + + text << "\t.align 2\n" << "gMapGroups::\n"; + for (auto &group : groups_data["group_order"].array_items()) + text << "\t.4byte " << group.string_value() << "\n"; + text << "\n"; + + return text.str(); +} + +string generate_connections_text(Json groups_data) { + vector map_names; + + for (auto &group : groups_data["group_order"].array_items()) + for (auto map_name : groups_data[group.string_value()].array_items()) + map_names.push_back(map_name); + + vector connections_include_order = groups_data["connections_include_order"].array_items(); + + if (connections_include_order.size() > 0) + sort(map_names.begin(), map_names.end(), [connections_include_order](const Json &a, const Json &b) { + auto iter_a = find(connections_include_order.begin(), connections_include_order.end(), a); + if (iter_a == connections_include_order.end()) + iter_a = connections_include_order.begin() + numeric_limits::max(); + auto iter_b = find(connections_include_order.begin(), connections_include_order.end(), b); + if (iter_b == connections_include_order.end()) + iter_b = connections_include_order.begin() + numeric_limits::max(); + return iter_a < iter_b; + }); + + ostringstream text; + + for (Json map_name : map_names) + text << "\t.include \"data/maps/" << map_name.string_value() << "/connections.inc\"\n"; + + return text.str(); +} + +string generate_headers_text(Json groups_data) { + vector map_names; + + for (auto &group : groups_data["group_order"].array_items()) + for (auto map_name : groups_data[group.string_value()].array_items()) + map_names.push_back(map_name.string_value()); + + ostringstream text; + + for (string map_name : map_names) + text << "\t.include \"data/maps/" << map_name << "/header.inc\"\n"; + + return text.str(); +} + +string generate_events_text(Json groups_data) { + vector map_names; + + for (auto &group : groups_data["group_order"].array_items()) + for (auto map_name : groups_data[group.string_value()].array_items()) + map_names.push_back(map_name.string_value()); + + ostringstream text; + + for (string map_name : map_names) + text << "\t.include \"data/maps/" << map_name << "/events.inc\"\n"; + + return text.str(); +} + +string generate_map_constants_text(string groups_filepath, Json groups_data) { + string file_dir = get_directory_name(groups_filepath); + char dir_separator = file_dir.back(); + + ostringstream text; + + text << "#ifndef GUARD_CONSTANTS_MAP_GROUPS_H\n" + << "#define GUARD_CONSTANTS_MAP_GROUPS_H\n\n"; + + int group_num = 0; + + for (auto &group : groups_data["group_order"].array_items()) { + text << "// Map Group " << group_num << "\n"; + vector map_ids; + size_t max_length = 0; + + for (auto &map_name : groups_data[group.string_value()].array_items()) { + string header_filepath = file_dir + map_name.string_value() + dir_separator + "map.json"; + string err_str; + Json map_data = Json::parse(read_text_file(header_filepath), err_str); + map_ids.push_back(map_data["id"]); + if (map_data["id"].string_value().length() > max_length) + max_length = map_data["id"].string_value().length(); + } + + int map_id_num = 0; + for (Json map_id : map_ids) { + text << "#define " << map_id.string_value() << string((max_length - map_id.string_value().length() + 1), ' ') + << "(" << map_id_num++ << " | (" << group_num << " << 8))\n"; + } + text << "\n"; + + group_num++; + } + + text << "#define MAP_GROUPS_COUNT " << group_num << "\n\n"; + text << "#endif // GUARD_CONSTANTS_MAP_GROUPS_H\n"; + + return text.str(); +} + +void process_groups(string groups_filepath) { + string err; + Json groups_data = Json::parse(read_text_file(groups_filepath), err); + + if (groups_data == Json()) + FATAL_ERROR("%s\n", err.c_str()); + + string groups_text = generate_groups_text(groups_data); + string connections_text = generate_connections_text(groups_data); + string headers_text = generate_headers_text(groups_data); + string events_text = generate_events_text(groups_data); + string map_header_text = generate_map_constants_text(groups_filepath, groups_data); + + string file_dir = get_directory_name(groups_filepath); + char s = file_dir.back(); + + write_text_file(file_dir + "groups.inc", groups_text); + write_text_file(file_dir + "connections.inc", connections_text); + write_text_file(file_dir + "headers.inc", headers_text); + write_text_file(file_dir + "events.inc", events_text); + write_text_file(file_dir + ".." + s + ".." + s + "include" + s + "constants" + s + "map_groups.h", map_header_text); +} + +string generate_layout_headers_text(Json layouts_data) { + ostringstream text; + + for (auto &layout : layouts_data["layouts"].array_items()) { + string border_label = layout["name"].string_value() + "_Border"; + string blockdata_label = layout["name"].string_value() + "_Blockdata"; + text << border_label << "::\n" + << "\t.incbin \"" << layout["border_filepath"].string_value() << "\"\n\n" + << blockdata_label << "::\n" + << "\t.incbin \"" << layout["blockdata_filepath"].string_value() << "\"\n\n" + << "\t.align 2\n" + << layout["name"].string_value() << "::\n" + << "\t.4byte " << layout["width"].int_value() << "\n" + << "\t.4byte " << layout["height"].int_value() << "\n" + << "\t.4byte " << border_label << "\n" + << "\t.4byte " << blockdata_label << "\n" + << "\t.4byte " << layout["primary_tileset"].string_value() << "\n" + << "\t.4byte " << layout["secondary_tileset"].string_value() << "\n\n"; + } + + return text.str(); +} + +string generate_layouts_table_text(Json layouts_data) { + ostringstream text; + + text << "\t.align 2\n" + << layouts_data["layouts_table_label"].string_value() << "::\n"; + + for (auto &layout : layouts_data["layouts"].array_items()) + text << "\t.4byte " << layout["name"].string_value() << "\n"; + + return text.str(); +} + +string generate_layouts_constants_text(Json layouts_data) { + ostringstream text; + + text << "#ifndef GUARD_CONSTANTS_LAYOUTS_H\n" + << "#define GUARD_CONSTANTS_LAYOUTS_H\n\n"; + + int i = 0; + for (auto &layout : layouts_data["layouts"].array_items()) + text << "#define " << layout["id"].string_value() << " " << ++i << "\n"; + + text << "\n#endif // GUARD_CONSTANTS_LAYOUTS_H\n"; + + return text.str(); +} + +void process_layouts(string layouts_filepath) { + string err; + Json layouts_data = Json::parse(read_text_file(layouts_filepath), err); + + if (layouts_data == Json()) + FATAL_ERROR("%s\n", err.c_str()); + + string layout_headers_text = generate_layout_headers_text(layouts_data); + string layouts_table_text = generate_layouts_table_text(layouts_data); + string layouts_constants_text = generate_layouts_constants_text(layouts_data); + + string file_dir = get_directory_name(layouts_filepath); + char s = file_dir.back(); + + write_text_file(file_dir + "layouts.inc", layout_headers_text); + write_text_file(file_dir + "layouts_table.inc", layouts_table_text); + write_text_file(file_dir + ".." + s + ".." + s + "include" + s + "constants" + s + "layouts.h", layouts_constants_text); +} + +int main(int argc, char *argv[]) { + if (argc < 3) + FATAL_ERROR("USAGE: dungeonjson [options]\n"); + + char *version_arg = argv[2]; + string version(version_arg); + if (version != "emerald" && version != "ruby" && version != "pmd-red") + FATAL_ERROR("ERROR: must be 'emerald' or 'ruby' or 'pmd-red'.\n"); + + char *mode_arg = argv[1]; + string mode(mode_arg); + if (mode != "layouts" && mode != "map" && mode != "groups" && mode != "dungeon" && mode != "floor") + FATAL_ERROR("ERROR: must be 'layouts', 'map', 'groups', 'dungeon' or 'floor' '.\n"); + + if (mode == "map") { + if (argc != 5) + FATAL_ERROR("USAGE: dungeonjson map \n"); + + string filepath(argv[3]); + string layouts_filepath(argv[4]); + + process_map(filepath, layouts_filepath, version); + } + else if (mode == "groups") { + if (argc != 4) + FATAL_ERROR("USAGE: dungeonjson groups \n"); + + string filepath(argv[3]); + + process_groups(filepath); + } + else if (mode == "layouts") { + if (argc != 4) + FATAL_ERROR("USAGE: dungeonjson layouts \n"); + + string filepath(argv[3]); + + process_layouts(filepath); + } + else if (mode == "dungeon") { + if (argc != 4) + FATAL_ERROR("USAGE: dungeonjson dungeon \n"); + + string filepath(argv[3]); + + process_dungeon(filepath); + } + else if (mode == "floor") { + if (argc != 4) + FATAL_ERROR("USAGE: dungeonjson dungeon \n"); + + string filepath(argv[3]); + + process_floorID(filepath); + } + + + + return 0; +} diff --git a/tools/dungeonjson/json11.cpp b/tools/dungeonjson/json11.cpp index 1da5302..d66cb61 100644 --- a/tools/dungeonjson/json11.cpp +++ b/tools/dungeonjson/json11.cpp @@ -1,786 +1,786 @@ -/* Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -#include "json11.h" -#include -#include -#include -#include -#include - -namespace json11 { - -static const int max_depth = 200; - -using std::string; -using std::vector; -using std::map; -using std::make_shared; -using std::initializer_list; -using std::move; - -/* Helper for representing null - just a do-nothing struct, plus comparison - * operators so the helpers in JsonValue work. We can't use nullptr_t because - * it may not be orderable. - */ -struct NullStruct { - bool operator==(NullStruct) const { return true; } - bool operator<(NullStruct) const { return false; } -}; - -/* * * * * * * * * * * * * * * * * * * * - * Serialization - */ - -static void dump(NullStruct, string &out) { - out += "null"; -} - -static void dump(double value, string &out) { - if (std::isfinite(value)) { - char buf[32]; - snprintf(buf, sizeof buf, "%.17g", value); - out += buf; - } else { - out += "null"; - } -} - -static void dump(int value, string &out) { - char buf[32]; - snprintf(buf, sizeof buf, "%d", value); - out += buf; -} - -static void dump(bool value, string &out) { - out += value ? "true" : "false"; -} - -static void dump(const string &value, string &out) { - out += '"'; - for (size_t i = 0; i < value.length(); i++) { - const char ch = value[i]; - if (ch == '\\') { - out += "\\\\"; - } else if (ch == '"') { - out += "\\\""; - } else if (ch == '\b') { - out += "\\b"; - } else if (ch == '\f') { - out += "\\f"; - } else if (ch == '\n') { - out += "\\n"; - } else if (ch == '\r') { - out += "\\r"; - } else if (ch == '\t') { - out += "\\t"; - } else if (static_cast(ch) <= 0x1f) { - char buf[8]; - snprintf(buf, sizeof buf, "\\u%04x", ch); - out += buf; - } else if (static_cast(ch) == 0xe2 && static_cast(value[i+1]) == 0x80 - && static_cast(value[i+2]) == 0xa8) { - out += "\\u2028"; - i += 2; - } else if (static_cast(ch) == 0xe2 && static_cast(value[i+1]) == 0x80 - && static_cast(value[i+2]) == 0xa9) { - out += "\\u2029"; - i += 2; - } else { - out += ch; - } - } - out += '"'; -} - -static void dump(const Json::array &values, string &out) { - bool first = true; - out += "["; - for (const auto &value : values) { - if (!first) - out += ", "; - value.dump(out); - first = false; - } - out += "]"; -} - -static void dump(const Json::object &values, string &out) { - bool first = true; - out += "{"; - for (const auto &kv : values) { - if (!first) - out += ", "; - dump(kv.first, out); - out += ": "; - kv.second.dump(out); - first = false; - } - out += "}"; -} - -void Json::dump(string &out) const { - m_ptr->dump(out); -} - -/* * * * * * * * * * * * * * * * * * * * - * Value wrappers - */ - -template -class Value : public JsonValue { -protected: - - // Constructors - explicit Value(const T &value) : m_value(value) {} - explicit Value(T &&value) : m_value(move(value)) {} - - // Get type tag - Json::Type type() const override { - return tag; - } - - // Comparisons - bool equals(const JsonValue * other) const override { - return m_value == static_cast *>(other)->m_value; - } - bool less(const JsonValue * other) const override { - return m_value < static_cast *>(other)->m_value; - } - - const T m_value; - void dump(string &out) const override { json11::dump(m_value, out); } -}; - -class JsonDouble final : public Value { - double number_value() const override { return m_value; } - int int_value() const override { return static_cast(m_value); } - bool equals(const JsonValue * other) const override { return m_value == other->number_value(); } - bool less(const JsonValue * other) const override { return m_value < other->number_value(); } -public: - explicit JsonDouble(double value) : Value(value) {} -}; - -class JsonInt final : public Value { - double number_value() const override { return m_value; } - int int_value() const override { return m_value; } - bool equals(const JsonValue * other) const override { return m_value == other->number_value(); } - bool less(const JsonValue * other) const override { return m_value < other->number_value(); } -public: - explicit JsonInt(int value) : Value(value) {} -}; - -class JsonBoolean final : public Value { - bool bool_value() const override { return m_value; } -public: - explicit JsonBoolean(bool value) : Value(value) {} -}; - -class JsonString final : public Value { - const string &string_value() const override { return m_value; } -public: - explicit JsonString(const string &value) : Value(value) {} - explicit JsonString(string &&value) : Value(move(value)) {} -}; - -class JsonArray final : public Value { - const Json::array &array_items() const override { return m_value; } - const Json & operator[](size_t i) const override; -public: - explicit JsonArray(const Json::array &value) : Value(value) {} - explicit JsonArray(Json::array &&value) : Value(move(value)) {} -}; - -class JsonObject final : public Value { - const Json::object &object_items() const override { return m_value; } - const Json & operator[](const string &key) const override; -public: - explicit JsonObject(const Json::object &value) : Value(value) {} - explicit JsonObject(Json::object &&value) : Value(move(value)) {} -}; - -class JsonNull final : public Value { -public: - JsonNull() : Value({}) {} -}; - -/* * * * * * * * * * * * * * * * * * * * - * Static globals - static-init-safe - */ -struct Statics { - const std::shared_ptr null = make_shared(); - const std::shared_ptr t = make_shared(true); - const std::shared_ptr f = make_shared(false); - const string empty_string; - const vector empty_vector; - const map empty_map; - Statics() {} -}; - -static const Statics & statics() { - static const Statics s {}; - return s; -} - -static const Json & static_null() { - // This has to be separate, not in Statics, because Json() accesses statics().null. - static const Json json_null; - return json_null; -} - -/* * * * * * * * * * * * * * * * * * * * - * Constructors - */ - -Json::Json() noexcept : m_ptr(statics().null) {} -Json::Json(std::nullptr_t) noexcept : m_ptr(statics().null) {} -Json::Json(double value) : m_ptr(make_shared(value)) {} -Json::Json(int value) : m_ptr(make_shared(value)) {} -Json::Json(bool value) : m_ptr(value ? statics().t : statics().f) {} -Json::Json(const string &value) : m_ptr(make_shared(value)) {} -Json::Json(string &&value) : m_ptr(make_shared(move(value))) {} -Json::Json(const char * value) : m_ptr(make_shared(value)) {} -Json::Json(const Json::array &values) : m_ptr(make_shared(values)) {} -Json::Json(Json::array &&values) : m_ptr(make_shared(move(values))) {} -Json::Json(const Json::object &values) : m_ptr(make_shared(values)) {} -Json::Json(Json::object &&values) : m_ptr(make_shared(move(values))) {} - -/* * * * * * * * * * * * * * * * * * * * - * Accessors - */ - -Json::Type Json::type() const { return m_ptr->type(); } -double Json::number_value() const { return m_ptr->number_value(); } -int Json::int_value() const { return m_ptr->int_value(); } -bool Json::bool_value() const { return m_ptr->bool_value(); } -const string & Json::string_value() const { return m_ptr->string_value(); } -const vector & Json::array_items() const { return m_ptr->array_items(); } -const map & Json::object_items() const { return m_ptr->object_items(); } -const Json & Json::operator[] (size_t i) const { return (*m_ptr)[i]; } -const Json & Json::operator[] (const string &key) const { return (*m_ptr)[key]; } - -double JsonValue::number_value() const { return 0; } -int JsonValue::int_value() const { return 0; } -bool JsonValue::bool_value() const { return false; } -const string & JsonValue::string_value() const { return statics().empty_string; } -const vector & JsonValue::array_items() const { return statics().empty_vector; } -const map & JsonValue::object_items() const { return statics().empty_map; } -const Json & JsonValue::operator[] (size_t) const { return static_null(); } -const Json & JsonValue::operator[] (const string &) const { return static_null(); } - -const Json & JsonObject::operator[] (const string &key) const { - auto iter = m_value.find(key); - return (iter == m_value.end()) ? static_null() : iter->second; -} -const Json & JsonArray::operator[] (size_t i) const { - if (i >= m_value.size()) return static_null(); - else return m_value[i]; -} - -/* * * * * * * * * * * * * * * * * * * * - * Comparison - */ - -bool Json::operator== (const Json &other) const { - if (m_ptr == other.m_ptr) - return true; - if (m_ptr->type() != other.m_ptr->type()) - return false; - - return m_ptr->equals(other.m_ptr.get()); -} - -bool Json::operator< (const Json &other) const { - if (m_ptr == other.m_ptr) - return false; - if (m_ptr->type() != other.m_ptr->type()) - return m_ptr->type() < other.m_ptr->type(); - - return m_ptr->less(other.m_ptr.get()); -} - -/* * * * * * * * * * * * * * * * * * * * - * Parsing - */ - -/* esc(c) - * - * Format char c suitable for printing in an error message. - */ -static inline string esc(char c) { - char buf[12]; - if (static_cast(c) >= 0x20 && static_cast(c) <= 0x7f) { - snprintf(buf, sizeof buf, "'%c' (%d)", c, c); - } else { - snprintf(buf, sizeof buf, "(%d)", c); - } - return string(buf); -} - -static inline bool in_range(long x, long lower, long upper) { - return (x >= lower && x <= upper); -} - -namespace { -/* JsonParser - * - * Object that tracks all state of an in-progress parse. - */ -struct JsonParser final { - - /* State - */ - const string &str; - size_t i; - string &err; - bool failed; - const JsonParse strategy; - - /* fail(msg, err_ret = Json()) - * - * Mark this parse as failed. - */ - Json fail(string &&msg) { - return fail(move(msg), Json()); - } - - template - T fail(string &&msg, const T err_ret) { - if (!failed) - err = std::move(msg); - failed = true; - return err_ret; - } - - /* consume_whitespace() - * - * Advance until the current character is non-whitespace. - */ - void consume_whitespace() { - while (str[i] == ' ' || str[i] == '\r' || str[i] == '\n' || str[i] == '\t') - i++; - } - - /* consume_comment() - * - * Advance comments (c-style inline and multiline). - */ - bool consume_comment() { - bool comment_found = false; - if (str[i] == '/') { - i++; - if (i == str.size()) - return fail("unexpected end of input after start of comment", false); - if (str[i] == '/') { // inline comment - i++; - // advance until next line, or end of input - while (i < str.size() && str[i] != '\n') { - i++; - } - comment_found = true; - } - else if (str[i] == '*') { // multiline comment - i++; - if (i > str.size()-2) - return fail("unexpected end of input inside multi-line comment", false); - // advance until closing tokens - while (!(str[i] == '*' && str[i+1] == '/')) { - i++; - if (i > str.size()-2) - return fail( - "unexpected end of input inside multi-line comment", false); - } - i += 2; - comment_found = true; - } - else - return fail("malformed comment", false); - } - return comment_found; - } - - /* consume_garbage() - * - * Advance until the current character is non-whitespace and non-comment. - */ - void consume_garbage() { - consume_whitespace(); - if(strategy == JsonParse::COMMENTS) { - bool comment_found = false; - do { - comment_found = consume_comment(); - if (failed) return; - consume_whitespace(); - } - while(comment_found); - } - } - - /* get_next_token() - * - * Return the next non-whitespace character. If the end of the input is reached, - * flag an error and return 0. - */ - char get_next_token() { - consume_garbage(); - if (failed) return static_cast(0); - if (i == str.size()) - return fail("unexpected end of input", static_cast(0)); - - return str[i++]; - } - - /* encode_utf8(pt, out) - * - * Encode pt as UTF-8 and add it to out. - */ - void encode_utf8(long pt, string & out) { - if (pt < 0) - return; - - if (pt < 0x80) { - out += static_cast(pt); - } else if (pt < 0x800) { - out += static_cast((pt >> 6) | 0xC0); - out += static_cast((pt & 0x3F) | 0x80); - } else if (pt < 0x10000) { - out += static_cast((pt >> 12) | 0xE0); - out += static_cast(((pt >> 6) & 0x3F) | 0x80); - out += static_cast((pt & 0x3F) | 0x80); - } else { - out += static_cast((pt >> 18) | 0xF0); - out += static_cast(((pt >> 12) & 0x3F) | 0x80); - out += static_cast(((pt >> 6) & 0x3F) | 0x80); - out += static_cast((pt & 0x3F) | 0x80); - } - } - - /* parse_string() - * - * Parse a string, starting at the current position. - */ - string parse_string() { - string out; - long last_escaped_codepoint = -1; - while (true) { - if (i == str.size()) - return fail("unexpected end of input in string", ""); - - char ch = str[i++]; - - if (ch == '"') { - encode_utf8(last_escaped_codepoint, out); - return out; - } - - if (in_range(ch, 0, 0x1f)) - return fail("unescaped " + esc(ch) + " in string", ""); - - // The usual case: non-escaped characters - if (ch != '\\') { - encode_utf8(last_escaped_codepoint, out); - last_escaped_codepoint = -1; - out += ch; - continue; - } - - // Handle escapes - if (i == str.size()) - return fail("unexpected end of input in string", ""); - - ch = str[i++]; - - if (ch == 'u') { - // Extract 4-byte escape sequence - string esc = str.substr(i, 4); - // Explicitly check length of the substring. The following loop - // relies on std::string returning the terminating NUL when - // accessing str[length]. Checking here reduces brittleness. - if (esc.length() < 4) { - return fail("bad \\u escape: " + esc, ""); - } - for (size_t j = 0; j < 4; j++) { - if (!in_range(esc[j], 'a', 'f') && !in_range(esc[j], 'A', 'F') - && !in_range(esc[j], '0', '9')) - return fail("bad \\u escape: " + esc, ""); - } - - long codepoint = strtol(esc.data(), nullptr, 16); - - // JSON specifies that characters outside the BMP shall be encoded as a pair - // of 4-hex-digit \u escapes encoding their surrogate pair components. Check - // whether we're in the middle of such a beast: the previous codepoint was an - // escaped lead (high) surrogate, and this is a trail (low) surrogate. - if (in_range(last_escaped_codepoint, 0xD800, 0xDBFF) - && in_range(codepoint, 0xDC00, 0xDFFF)) { - // Reassemble the two surrogate pairs into one astral-plane character, per - // the UTF-16 algorithm. - encode_utf8((((last_escaped_codepoint - 0xD800) << 10) - | (codepoint - 0xDC00)) + 0x10000, out); - last_escaped_codepoint = -1; - } else { - encode_utf8(last_escaped_codepoint, out); - last_escaped_codepoint = codepoint; - } - - i += 4; - continue; - } - - encode_utf8(last_escaped_codepoint, out); - last_escaped_codepoint = -1; - - if (ch == 'b') { - out += '\b'; - } else if (ch == 'f') { - out += '\f'; - } else if (ch == 'n') { - out += '\n'; - } else if (ch == 'r') { - out += '\r'; - } else if (ch == 't') { - out += '\t'; - } else if (ch == '"' || ch == '\\' || ch == '/') { - out += ch; - } else { - return fail("invalid escape character " + esc(ch), ""); - } - } - } - - /* parse_number() - * - * Parse a double. - */ - Json parse_number() { - size_t start_pos = i; - - if (str[i] == '-') - i++; - - // Integer part - if (str[i] == '0') { - i++; - if (in_range(str[i], '0', '9')) - return fail("leading 0s not permitted in numbers"); - } else if (in_range(str[i], '1', '9')) { - i++; - while (in_range(str[i], '0', '9')) - i++; - } else { - return fail("invalid " + esc(str[i]) + " in number"); - } - - if (str[i] != '.' && str[i] != 'e' && str[i] != 'E' - && (i - start_pos) <= static_cast(std::numeric_limits::digits10)) { - return std::atoi(str.c_str() + start_pos); - } - - // Decimal part - if (str[i] == '.') { - i++; - if (!in_range(str[i], '0', '9')) - return fail("at least one digit required in fractional part"); - - while (in_range(str[i], '0', '9')) - i++; - } - - // Exponent part - if (str[i] == 'e' || str[i] == 'E') { - i++; - - if (str[i] == '+' || str[i] == '-') - i++; - - if (!in_range(str[i], '0', '9')) - return fail("at least one digit required in exponent"); - - while (in_range(str[i], '0', '9')) - i++; - } - - return std::strtod(str.c_str() + start_pos, nullptr); - } - - /* expect(str, res) - * - * Expect that 'str' starts at the character that was just read. If it does, advance - * the input and return res. If not, flag an error. - */ - Json expect(const string &expected, Json res) { - assert(i != 0); - i--; - if (str.compare(i, expected.length(), expected) == 0) { - i += expected.length(); - return res; - } else { - return fail("parse error: expected " + expected + ", got " + str.substr(i, expected.length())); - } - } - - /* parse_json() - * - * Parse a JSON object. - */ - Json parse_json(int depth) { - if (depth > max_depth) { - return fail("exceeded maximum nesting depth"); - } - - char ch = get_next_token(); - if (failed) - return Json(); - - if (ch == '-' || (ch >= '0' && ch <= '9')) { - i--; - return parse_number(); - } - - if (ch == 't') - return expect("true", true); - - if (ch == 'f') - return expect("false", false); - - if (ch == 'n') - return expect("null", Json()); - - if (ch == '"') - return parse_string(); - - if (ch == '{') { - map data; - ch = get_next_token(); - if (ch == '}') - return data; - - while (1) { - if (ch != '"') - return fail("expected '\"' in object, got " + esc(ch)); - - string key = parse_string(); - if (failed) - return Json(); - - ch = get_next_token(); - if (ch != ':') - return fail("expected ':' in object, got " + esc(ch)); - - data[std::move(key)] = parse_json(depth + 1); - if (failed) - return Json(); - - ch = get_next_token(); - if (ch == '}') - break; - if (ch != ',') - return fail("expected ',' in object, got " + esc(ch)); - - ch = get_next_token(); - } - return data; - } - - if (ch == '[') { - vector data; - ch = get_next_token(); - if (ch == ']') - return data; - - while (1) { - i--; - data.push_back(parse_json(depth + 1)); - if (failed) - return Json(); - - ch = get_next_token(); - if (ch == ']') - break; - if (ch != ',') - return fail("expected ',' in list, got " + esc(ch)); - - ch = get_next_token(); - (void)ch; - } - return data; - } - - return fail("expected value, got " + esc(ch)); - } -}; -}//namespace { - -Json Json::parse(const string &in, string &err, JsonParse strategy) { - JsonParser parser { in, 0, err, false, strategy }; - Json result = parser.parse_json(0); - - // Check for any trailing garbage - parser.consume_garbage(); - if (parser.failed) - return Json(); - if (parser.i != in.size()) - return parser.fail("unexpected trailing " + esc(in[parser.i])); - - return result; -} - -// Documented in json11.hpp -vector Json::parse_multi(const string &in, - std::string::size_type &parser_stop_pos, - string &err, - JsonParse strategy) { - JsonParser parser { in, 0, err, false, strategy }; - parser_stop_pos = 0; - vector json_vec; - while (parser.i != in.size() && !parser.failed) { - json_vec.push_back(parser.parse_json(0)); - if (parser.failed) - break; - - // Check for another object - parser.consume_garbage(); - if (parser.failed) - break; - parser_stop_pos = parser.i; - } - return json_vec; -} - -/* * * * * * * * * * * * * * * * * * * * - * Shape-checking - */ - -bool Json::has_shape(const shape & types, string & err) const { - if (!is_object()) { - err = "expected JSON object, got " + dump(); - return false; - } - - for (auto & item : types) { - if ((*this)[item.first].type() != item.second) { - err = "bad type for " + item.first + " in " + dump(); - return false; - } - } - - return true; -} - -} // namespace json11 +/* Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#include "json11.h" +#include +#include +#include +#include +#include + +namespace json11 { + +static const int max_depth = 200; + +using std::string; +using std::vector; +using std::map; +using std::make_shared; +using std::initializer_list; +using std::move; + +/* Helper for representing null - just a do-nothing struct, plus comparison + * operators so the helpers in JsonValue work. We can't use nullptr_t because + * it may not be orderable. + */ +struct NullStruct { + bool operator==(NullStruct) const { return true; } + bool operator<(NullStruct) const { return false; } +}; + +/* * * * * * * * * * * * * * * * * * * * + * Serialization + */ + +static void dump(NullStruct, string &out) { + out += "null"; +} + +static void dump(double value, string &out) { + if (std::isfinite(value)) { + char buf[32]; + snprintf(buf, sizeof buf, "%.17g", value); + out += buf; + } else { + out += "null"; + } +} + +static void dump(int value, string &out) { + char buf[32]; + snprintf(buf, sizeof buf, "%d", value); + out += buf; +} + +static void dump(bool value, string &out) { + out += value ? "true" : "false"; +} + +static void dump(const string &value, string &out) { + out += '"'; + for (size_t i = 0; i < value.length(); i++) { + const char ch = value[i]; + if (ch == '\\') { + out += "\\\\"; + } else if (ch == '"') { + out += "\\\""; + } else if (ch == '\b') { + out += "\\b"; + } else if (ch == '\f') { + out += "\\f"; + } else if (ch == '\n') { + out += "\\n"; + } else if (ch == '\r') { + out += "\\r"; + } else if (ch == '\t') { + out += "\\t"; + } else if (static_cast(ch) <= 0x1f) { + char buf[8]; + snprintf(buf, sizeof buf, "\\u%04x", ch); + out += buf; + } else if (static_cast(ch) == 0xe2 && static_cast(value[i+1]) == 0x80 + && static_cast(value[i+2]) == 0xa8) { + out += "\\u2028"; + i += 2; + } else if (static_cast(ch) == 0xe2 && static_cast(value[i+1]) == 0x80 + && static_cast(value[i+2]) == 0xa9) { + out += "\\u2029"; + i += 2; + } else { + out += ch; + } + } + out += '"'; +} + +static void dump(const Json::array &values, string &out) { + bool first = true; + out += "["; + for (const auto &value : values) { + if (!first) + out += ", "; + value.dump(out); + first = false; + } + out += "]"; +} + +static void dump(const Json::object &values, string &out) { + bool first = true; + out += "{"; + for (const auto &kv : values) { + if (!first) + out += ", "; + dump(kv.first, out); + out += ": "; + kv.second.dump(out); + first = false; + } + out += "}"; +} + +void Json::dump(string &out) const { + m_ptr->dump(out); +} + +/* * * * * * * * * * * * * * * * * * * * + * Value wrappers + */ + +template +class Value : public JsonValue { +protected: + + // Constructors + explicit Value(const T &value) : m_value(value) {} + explicit Value(T &&value) : m_value(move(value)) {} + + // Get type tag + Json::Type type() const override { + return tag; + } + + // Comparisons + bool equals(const JsonValue * other) const override { + return m_value == static_cast *>(other)->m_value; + } + bool less(const JsonValue * other) const override { + return m_value < static_cast *>(other)->m_value; + } + + const T m_value; + void dump(string &out) const override { json11::dump(m_value, out); } +}; + +class JsonDouble final : public Value { + double number_value() const override { return m_value; } + int int_value() const override { return static_cast(m_value); } + bool equals(const JsonValue * other) const override { return m_value == other->number_value(); } + bool less(const JsonValue * other) const override { return m_value < other->number_value(); } +public: + explicit JsonDouble(double value) : Value(value) {} +}; + +class JsonInt final : public Value { + double number_value() const override { return m_value; } + int int_value() const override { return m_value; } + bool equals(const JsonValue * other) const override { return m_value == other->number_value(); } + bool less(const JsonValue * other) const override { return m_value < other->number_value(); } +public: + explicit JsonInt(int value) : Value(value) {} +}; + +class JsonBoolean final : public Value { + bool bool_value() const override { return m_value; } +public: + explicit JsonBoolean(bool value) : Value(value) {} +}; + +class JsonString final : public Value { + const string &string_value() const override { return m_value; } +public: + explicit JsonString(const string &value) : Value(value) {} + explicit JsonString(string &&value) : Value(move(value)) {} +}; + +class JsonArray final : public Value { + const Json::array &array_items() const override { return m_value; } + const Json & operator[](size_t i) const override; +public: + explicit JsonArray(const Json::array &value) : Value(value) {} + explicit JsonArray(Json::array &&value) : Value(move(value)) {} +}; + +class JsonObject final : public Value { + const Json::object &object_items() const override { return m_value; } + const Json & operator[](const string &key) const override; +public: + explicit JsonObject(const Json::object &value) : Value(value) {} + explicit JsonObject(Json::object &&value) : Value(move(value)) {} +}; + +class JsonNull final : public Value { +public: + JsonNull() : Value({}) {} +}; + +/* * * * * * * * * * * * * * * * * * * * + * Static globals - static-init-safe + */ +struct Statics { + const std::shared_ptr null = make_shared(); + const std::shared_ptr t = make_shared(true); + const std::shared_ptr f = make_shared(false); + const string empty_string; + const vector empty_vector; + const map empty_map; + Statics() {} +}; + +static const Statics & statics() { + static const Statics s {}; + return s; +} + +static const Json & static_null() { + // This has to be separate, not in Statics, because Json() accesses statics().null. + static const Json json_null; + return json_null; +} + +/* * * * * * * * * * * * * * * * * * * * + * Constructors + */ + +Json::Json() noexcept : m_ptr(statics().null) {} +Json::Json(std::nullptr_t) noexcept : m_ptr(statics().null) {} +Json::Json(double value) : m_ptr(make_shared(value)) {} +Json::Json(int value) : m_ptr(make_shared(value)) {} +Json::Json(bool value) : m_ptr(value ? statics().t : statics().f) {} +Json::Json(const string &value) : m_ptr(make_shared(value)) {} +Json::Json(string &&value) : m_ptr(make_shared(move(value))) {} +Json::Json(const char * value) : m_ptr(make_shared(value)) {} +Json::Json(const Json::array &values) : m_ptr(make_shared(values)) {} +Json::Json(Json::array &&values) : m_ptr(make_shared(move(values))) {} +Json::Json(const Json::object &values) : m_ptr(make_shared(values)) {} +Json::Json(Json::object &&values) : m_ptr(make_shared(move(values))) {} + +/* * * * * * * * * * * * * * * * * * * * + * Accessors + */ + +Json::Type Json::type() const { return m_ptr->type(); } +double Json::number_value() const { return m_ptr->number_value(); } +int Json::int_value() const { return m_ptr->int_value(); } +bool Json::bool_value() const { return m_ptr->bool_value(); } +const string & Json::string_value() const { return m_ptr->string_value(); } +const vector & Json::array_items() const { return m_ptr->array_items(); } +const map & Json::object_items() const { return m_ptr->object_items(); } +const Json & Json::operator[] (size_t i) const { return (*m_ptr)[i]; } +const Json & Json::operator[] (const string &key) const { return (*m_ptr)[key]; } + +double JsonValue::number_value() const { return 0; } +int JsonValue::int_value() const { return 0; } +bool JsonValue::bool_value() const { return false; } +const string & JsonValue::string_value() const { return statics().empty_string; } +const vector & JsonValue::array_items() const { return statics().empty_vector; } +const map & JsonValue::object_items() const { return statics().empty_map; } +const Json & JsonValue::operator[] (size_t) const { return static_null(); } +const Json & JsonValue::operator[] (const string &) const { return static_null(); } + +const Json & JsonObject::operator[] (const string &key) const { + auto iter = m_value.find(key); + return (iter == m_value.end()) ? static_null() : iter->second; +} +const Json & JsonArray::operator[] (size_t i) const { + if (i >= m_value.size()) return static_null(); + else return m_value[i]; +} + +/* * * * * * * * * * * * * * * * * * * * + * Comparison + */ + +bool Json::operator== (const Json &other) const { + if (m_ptr == other.m_ptr) + return true; + if (m_ptr->type() != other.m_ptr->type()) + return false; + + return m_ptr->equals(other.m_ptr.get()); +} + +bool Json::operator< (const Json &other) const { + if (m_ptr == other.m_ptr) + return false; + if (m_ptr->type() != other.m_ptr->type()) + return m_ptr->type() < other.m_ptr->type(); + + return m_ptr->less(other.m_ptr.get()); +} + +/* * * * * * * * * * * * * * * * * * * * + * Parsing + */ + +/* esc(c) + * + * Format char c suitable for printing in an error message. + */ +static inline string esc(char c) { + char buf[12]; + if (static_cast(c) >= 0x20 && static_cast(c) <= 0x7f) { + snprintf(buf, sizeof buf, "'%c' (%d)", c, c); + } else { + snprintf(buf, sizeof buf, "(%d)", c); + } + return string(buf); +} + +static inline bool in_range(long x, long lower, long upper) { + return (x >= lower && x <= upper); +} + +namespace { +/* JsonParser + * + * Object that tracks all state of an in-progress parse. + */ +struct JsonParser final { + + /* State + */ + const string &str; + size_t i; + string &err; + bool failed; + const JsonParse strategy; + + /* fail(msg, err_ret = Json()) + * + * Mark this parse as failed. + */ + Json fail(string &&msg) { + return fail(move(msg), Json()); + } + + template + T fail(string &&msg, const T err_ret) { + if (!failed) + err = std::move(msg); + failed = true; + return err_ret; + } + + /* consume_whitespace() + * + * Advance until the current character is non-whitespace. + */ + void consume_whitespace() { + while (str[i] == ' ' || str[i] == '\r' || str[i] == '\n' || str[i] == '\t') + i++; + } + + /* consume_comment() + * + * Advance comments (c-style inline and multiline). + */ + bool consume_comment() { + bool comment_found = false; + if (str[i] == '/') { + i++; + if (i == str.size()) + return fail("unexpected end of input after start of comment", false); + if (str[i] == '/') { // inline comment + i++; + // advance until next line, or end of input + while (i < str.size() && str[i] != '\n') { + i++; + } + comment_found = true; + } + else if (str[i] == '*') { // multiline comment + i++; + if (i > str.size()-2) + return fail("unexpected end of input inside multi-line comment", false); + // advance until closing tokens + while (!(str[i] == '*' && str[i+1] == '/')) { + i++; + if (i > str.size()-2) + return fail( + "unexpected end of input inside multi-line comment", false); + } + i += 2; + comment_found = true; + } + else + return fail("malformed comment", false); + } + return comment_found; + } + + /* consume_garbage() + * + * Advance until the current character is non-whitespace and non-comment. + */ + void consume_garbage() { + consume_whitespace(); + if(strategy == JsonParse::COMMENTS) { + bool comment_found = false; + do { + comment_found = consume_comment(); + if (failed) return; + consume_whitespace(); + } + while(comment_found); + } + } + + /* get_next_token() + * + * Return the next non-whitespace character. If the end of the input is reached, + * flag an error and return 0. + */ + char get_next_token() { + consume_garbage(); + if (failed) return static_cast(0); + if (i == str.size()) + return fail("unexpected end of input", static_cast(0)); + + return str[i++]; + } + + /* encode_utf8(pt, out) + * + * Encode pt as UTF-8 and add it to out. + */ + void encode_utf8(long pt, string & out) { + if (pt < 0) + return; + + if (pt < 0x80) { + out += static_cast(pt); + } else if (pt < 0x800) { + out += static_cast((pt >> 6) | 0xC0); + out += static_cast((pt & 0x3F) | 0x80); + } else if (pt < 0x10000) { + out += static_cast((pt >> 12) | 0xE0); + out += static_cast(((pt >> 6) & 0x3F) | 0x80); + out += static_cast((pt & 0x3F) | 0x80); + } else { + out += static_cast((pt >> 18) | 0xF0); + out += static_cast(((pt >> 12) & 0x3F) | 0x80); + out += static_cast(((pt >> 6) & 0x3F) | 0x80); + out += static_cast((pt & 0x3F) | 0x80); + } + } + + /* parse_string() + * + * Parse a string, starting at the current position. + */ + string parse_string() { + string out; + long last_escaped_codepoint = -1; + while (true) { + if (i == str.size()) + return fail("unexpected end of input in string", ""); + + char ch = str[i++]; + + if (ch == '"') { + encode_utf8(last_escaped_codepoint, out); + return out; + } + + if (in_range(ch, 0, 0x1f)) + return fail("unescaped " + esc(ch) + " in string", ""); + + // The usual case: non-escaped characters + if (ch != '\\') { + encode_utf8(last_escaped_codepoint, out); + last_escaped_codepoint = -1; + out += ch; + continue; + } + + // Handle escapes + if (i == str.size()) + return fail("unexpected end of input in string", ""); + + ch = str[i++]; + + if (ch == 'u') { + // Extract 4-byte escape sequence + string esc = str.substr(i, 4); + // Explicitly check length of the substring. The following loop + // relies on std::string returning the terminating NUL when + // accessing str[length]. Checking here reduces brittleness. + if (esc.length() < 4) { + return fail("bad \\u escape: " + esc, ""); + } + for (size_t j = 0; j < 4; j++) { + if (!in_range(esc[j], 'a', 'f') && !in_range(esc[j], 'A', 'F') + && !in_range(esc[j], '0', '9')) + return fail("bad \\u escape: " + esc, ""); + } + + long codepoint = strtol(esc.data(), nullptr, 16); + + // JSON specifies that characters outside the BMP shall be encoded as a pair + // of 4-hex-digit \u escapes encoding their surrogate pair components. Check + // whether we're in the middle of such a beast: the previous codepoint was an + // escaped lead (high) surrogate, and this is a trail (low) surrogate. + if (in_range(last_escaped_codepoint, 0xD800, 0xDBFF) + && in_range(codepoint, 0xDC00, 0xDFFF)) { + // Reassemble the two surrogate pairs into one astral-plane character, per + // the UTF-16 algorithm. + encode_utf8((((last_escaped_codepoint - 0xD800) << 10) + | (codepoint - 0xDC00)) + 0x10000, out); + last_escaped_codepoint = -1; + } else { + encode_utf8(last_escaped_codepoint, out); + last_escaped_codepoint = codepoint; + } + + i += 4; + continue; + } + + encode_utf8(last_escaped_codepoint, out); + last_escaped_codepoint = -1; + + if (ch == 'b') { + out += '\b'; + } else if (ch == 'f') { + out += '\f'; + } else if (ch == 'n') { + out += '\n'; + } else if (ch == 'r') { + out += '\r'; + } else if (ch == 't') { + out += '\t'; + } else if (ch == '"' || ch == '\\' || ch == '/') { + out += ch; + } else { + return fail("invalid escape character " + esc(ch), ""); + } + } + } + + /* parse_number() + * + * Parse a double. + */ + Json parse_number() { + size_t start_pos = i; + + if (str[i] == '-') + i++; + + // Integer part + if (str[i] == '0') { + i++; + if (in_range(str[i], '0', '9')) + return fail("leading 0s not permitted in numbers"); + } else if (in_range(str[i], '1', '9')) { + i++; + while (in_range(str[i], '0', '9')) + i++; + } else { + return fail("invalid " + esc(str[i]) + " in number"); + } + + if (str[i] != '.' && str[i] != 'e' && str[i] != 'E' + && (i - start_pos) <= static_cast(std::numeric_limits::digits10)) { + return std::atoi(str.c_str() + start_pos); + } + + // Decimal part + if (str[i] == '.') { + i++; + if (!in_range(str[i], '0', '9')) + return fail("at least one digit required in fractional part"); + + while (in_range(str[i], '0', '9')) + i++; + } + + // Exponent part + if (str[i] == 'e' || str[i] == 'E') { + i++; + + if (str[i] == '+' || str[i] == '-') + i++; + + if (!in_range(str[i], '0', '9')) + return fail("at least one digit required in exponent"); + + while (in_range(str[i], '0', '9')) + i++; + } + + return std::strtod(str.c_str() + start_pos, nullptr); + } + + /* expect(str, res) + * + * Expect that 'str' starts at the character that was just read. If it does, advance + * the input and return res. If not, flag an error. + */ + Json expect(const string &expected, Json res) { + assert(i != 0); + i--; + if (str.compare(i, expected.length(), expected) == 0) { + i += expected.length(); + return res; + } else { + return fail("parse error: expected " + expected + ", got " + str.substr(i, expected.length())); + } + } + + /* parse_json() + * + * Parse a JSON object. + */ + Json parse_json(int depth) { + if (depth > max_depth) { + return fail("exceeded maximum nesting depth"); + } + + char ch = get_next_token(); + if (failed) + return Json(); + + if (ch == '-' || (ch >= '0' && ch <= '9')) { + i--; + return parse_number(); + } + + if (ch == 't') + return expect("true", true); + + if (ch == 'f') + return expect("false", false); + + if (ch == 'n') + return expect("null", Json()); + + if (ch == '"') + return parse_string(); + + if (ch == '{') { + map data; + ch = get_next_token(); + if (ch == '}') + return data; + + while (1) { + if (ch != '"') + return fail("expected '\"' in object, got " + esc(ch)); + + string key = parse_string(); + if (failed) + return Json(); + + ch = get_next_token(); + if (ch != ':') + return fail("expected ':' in object, got " + esc(ch)); + + data[std::move(key)] = parse_json(depth + 1); + if (failed) + return Json(); + + ch = get_next_token(); + if (ch == '}') + break; + if (ch != ',') + return fail("expected ',' in object, got " + esc(ch)); + + ch = get_next_token(); + } + return data; + } + + if (ch == '[') { + vector data; + ch = get_next_token(); + if (ch == ']') + return data; + + while (1) { + i--; + data.push_back(parse_json(depth + 1)); + if (failed) + return Json(); + + ch = get_next_token(); + if (ch == ']') + break; + if (ch != ',') + return fail("expected ',' in list, got " + esc(ch)); + + ch = get_next_token(); + (void)ch; + } + return data; + } + + return fail("expected value, got " + esc(ch)); + } +}; +}//namespace { + +Json Json::parse(const string &in, string &err, JsonParse strategy) { + JsonParser parser { in, 0, err, false, strategy }; + Json result = parser.parse_json(0); + + // Check for any trailing garbage + parser.consume_garbage(); + if (parser.failed) + return Json(); + if (parser.i != in.size()) + return parser.fail("unexpected trailing " + esc(in[parser.i])); + + return result; +} + +// Documented in json11.hpp +vector Json::parse_multi(const string &in, + std::string::size_type &parser_stop_pos, + string &err, + JsonParse strategy) { + JsonParser parser { in, 0, err, false, strategy }; + parser_stop_pos = 0; + vector json_vec; + while (parser.i != in.size() && !parser.failed) { + json_vec.push_back(parser.parse_json(0)); + if (parser.failed) + break; + + // Check for another object + parser.consume_garbage(); + if (parser.failed) + break; + parser_stop_pos = parser.i; + } + return json_vec; +} + +/* * * * * * * * * * * * * * * * * * * * + * Shape-checking + */ + +bool Json::has_shape(const shape & types, string & err) const { + if (!is_object()) { + err = "expected JSON object, got " + dump(); + return false; + } + + for (auto & item : types) { + if ((*this)[item.first].type() != item.second) { + err = "bad type for " + item.first + " in " + dump(); + return false; + } + } + + return true; +} + +} // namespace json11 diff --git a/tools/gbafix/.gitignore b/tools/gbafix/.gitignore index 3cebf8a..0bf7356 100644 --- a/tools/gbafix/.gitignore +++ b/tools/gbafix/.gitignore @@ -1,2 +1,2 @@ -gbafix -README +gbafix +README diff --git a/tools/gbafix/COPYING b/tools/gbafix/COPYING index 94a9ed0..818433e 100644 --- a/tools/gbafix/COPYING +++ b/tools/gbafix/COPYING @@ -1,674 +1,674 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/tools/gbagfx/.gitignore b/tools/gbagfx/.gitignore index dbbb3f0..12a06ea 100644 --- a/tools/gbagfx/.gitignore +++ b/tools/gbagfx/.gitignore @@ -1 +1 @@ -gbagfx +gbagfx diff --git a/tools/gbagfx/LICENSE b/tools/gbagfx/LICENSE index b66bf81..01c9d12 100644 --- a/tools/gbagfx/LICENSE +++ b/tools/gbagfx/LICENSE @@ -1,19 +1,19 @@ -Copyright (c) 2015 YamaArashi - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. +Copyright (c) 2015 YamaArashi + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/tools/jsonproc/.gitignore b/tools/jsonproc/.gitignore index a613cf2..ea58d57 100644 --- a/tools/jsonproc/.gitignore +++ b/tools/jsonproc/.gitignore @@ -1 +1 @@ -jsonproc +jsonproc diff --git a/tools/jsonproc/inja.hpp b/tools/jsonproc/inja.hpp index d5bf5bc..7f24e06 100644 --- a/tools/jsonproc/inja.hpp +++ b/tools/jsonproc/inja.hpp @@ -1,3529 +1,3529 @@ -// MIT License - -// Copyright (c) 2018 lbersch - -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: - -// The above copyright notice and this permission notice shall be included in all -// copies or substantial portions of the Software. - -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -// SOFTWARE. - - -// --- - - -// Copyright (c) 2009-2018 FIRST -// All rights reserved. - -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are met: -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// * Neither the name of the FIRST nor the -// names of its contributors may be used to endorse or promote products -// derived from this software without specific prior written permission. - -// THIS SOFTWARE IS PROVIDED BY FIRST AND CONTRIBUTORS``AS IS'' AND ANY -// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -// WARRANTIES OF MERCHANTABILITY NONINFRINGEMENT AND FITNESS FOR A PARTICULAR -// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL FIRST OR CONTRIBUTORS BE LIABLE FOR -// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -// ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -#ifndef PANTOR_INJA_HPP -#define PANTOR_INJA_HPP - -#include -#include -#include -#include -#include -#include -#include - -#include - -// #include "environment.hpp" -#ifndef PANTOR_INJA_ENVIRONMENT_HPP -#define PANTOR_INJA_ENVIRONMENT_HPP - -#include -#include -#include -#include - -#include - -// #include "config.hpp" -#ifndef PANTOR_INJA_CONFIG_HPP -#define PANTOR_INJA_CONFIG_HPP - -#include -#include - -// #include "string_view.hpp" -// Copyright 2017-2019 by Martin Moene -// -// string-view lite, a C++17-like string_view for C++98 and later. -// For more information see https://github.com/martinmoene/string-view-lite -// -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - - - -#ifndef NONSTD_SV_LITE_H_INCLUDED -#define NONSTD_SV_LITE_H_INCLUDED - -#define string_view_lite_MAJOR 1 -#define string_view_lite_MINOR 1 -#define string_view_lite_PATCH 0 - -#define string_view_lite_VERSION nssv_STRINGIFY(string_view_lite_MAJOR) "." nssv_STRINGIFY(string_view_lite_MINOR) "." nssv_STRINGIFY(string_view_lite_PATCH) - -#define nssv_STRINGIFY( x ) nssv_STRINGIFY_( x ) -#define nssv_STRINGIFY_( x ) #x - -// string-view lite configuration: - -#define nssv_STRING_VIEW_DEFAULT 0 -#define nssv_STRING_VIEW_NONSTD 1 -#define nssv_STRING_VIEW_STD 2 - -#if !defined( nssv_CONFIG_SELECT_STRING_VIEW ) -# define nssv_CONFIG_SELECT_STRING_VIEW ( nssv_HAVE_STD_STRING_VIEW ? nssv_STRING_VIEW_STD : nssv_STRING_VIEW_NONSTD ) -#endif - -#if defined( nssv_CONFIG_SELECT_STD_STRING_VIEW ) || defined( nssv_CONFIG_SELECT_NONSTD_STRING_VIEW ) -# error nssv_CONFIG_SELECT_STD_STRING_VIEW and nssv_CONFIG_SELECT_NONSTD_STRING_VIEW are deprecated and removed, please use nssv_CONFIG_SELECT_STRING_VIEW=nssv_STRING_VIEW_... -#endif - -#ifndef nssv_CONFIG_STD_SV_OPERATOR -# define nssv_CONFIG_STD_SV_OPERATOR 0 -#endif - -#ifndef nssv_CONFIG_USR_SV_OPERATOR -# define nssv_CONFIG_USR_SV_OPERATOR 1 -#endif - -#ifdef nssv_CONFIG_CONVERSION_STD_STRING -# define nssv_CONFIG_CONVERSION_STD_STRING_CLASS_METHODS nssv_CONFIG_CONVERSION_STD_STRING -# define nssv_CONFIG_CONVERSION_STD_STRING_FREE_FUNCTIONS nssv_CONFIG_CONVERSION_STD_STRING -#endif - -#ifndef nssv_CONFIG_CONVERSION_STD_STRING_CLASS_METHODS -# define nssv_CONFIG_CONVERSION_STD_STRING_CLASS_METHODS 1 -#endif - -#ifndef nssv_CONFIG_CONVERSION_STD_STRING_FREE_FUNCTIONS -# define nssv_CONFIG_CONVERSION_STD_STRING_FREE_FUNCTIONS 1 -#endif - -// Control presence of exception handling (try and auto discover): - -#ifndef nssv_CONFIG_NO_EXCEPTIONS -# if defined(__cpp_exceptions) || defined(__EXCEPTIONS) || defined(_CPPUNWIND) -# define nssv_CONFIG_NO_EXCEPTIONS 0 -# else -# define nssv_CONFIG_NO_EXCEPTIONS 1 -# endif -#endif - -// C++ language version detection (C++20 is speculative): -// Note: VC14.0/1900 (VS2015) lacks too much from C++14. - -#ifndef nssv_CPLUSPLUS -# if defined(_MSVC_LANG ) && !defined(__clang__) -# define nssv_CPLUSPLUS (_MSC_VER == 1900 ? 201103L : _MSVC_LANG ) -# else -# define nssv_CPLUSPLUS __cplusplus -# endif -#endif - -#define nssv_CPP98_OR_GREATER ( nssv_CPLUSPLUS >= 199711L ) -#define nssv_CPP11_OR_GREATER ( nssv_CPLUSPLUS >= 201103L ) -#define nssv_CPP11_OR_GREATER_ ( nssv_CPLUSPLUS >= 201103L ) -#define nssv_CPP14_OR_GREATER ( nssv_CPLUSPLUS >= 201402L ) -#define nssv_CPP17_OR_GREATER ( nssv_CPLUSPLUS >= 201703L ) -#define nssv_CPP20_OR_GREATER ( nssv_CPLUSPLUS >= 202000L ) - -// use C++17 std::string_view if available and requested: - -#if nssv_CPP17_OR_GREATER && defined(__has_include ) -# if __has_include( ) -# define nssv_HAVE_STD_STRING_VIEW 1 -# else -# define nssv_HAVE_STD_STRING_VIEW 0 -# endif -#else -# define nssv_HAVE_STD_STRING_VIEW 0 -#endif - -#define nssv_USES_STD_STRING_VIEW ( (nssv_CONFIG_SELECT_STRING_VIEW == nssv_STRING_VIEW_STD) || ((nssv_CONFIG_SELECT_STRING_VIEW == nssv_STRING_VIEW_DEFAULT) && nssv_HAVE_STD_STRING_VIEW) ) - -#define nssv_HAVE_STARTS_WITH ( nssv_CPP20_OR_GREATER || !nssv_USES_STD_STRING_VIEW ) -#define nssv_HAVE_ENDS_WITH nssv_HAVE_STARTS_WITH - -// -// Use C++17 std::string_view: -// - -#if nssv_USES_STD_STRING_VIEW - -#include - -// Extensions for std::string: - -#if nssv_CONFIG_CONVERSION_STD_STRING_FREE_FUNCTIONS - -namespace nonstd { - -template< class CharT, class Traits, class Allocator = std::allocator > -std::basic_string -to_string( std::basic_string_view v, Allocator const & a = Allocator() ) -{ - return std::basic_string( v.begin(), v.end(), a ); -} - -template< class CharT, class Traits, class Allocator > -std::basic_string_view -to_string_view( std::basic_string const & s ) -{ - return std::basic_string_view( s.data(), s.size() ); -} - -// Literal operators sv and _sv: - -#if nssv_CONFIG_STD_SV_OPERATOR - -using namespace std::literals::string_view_literals; - -#endif - -#if nssv_CONFIG_USR_SV_OPERATOR - -inline namespace literals { -inline namespace string_view_literals { - - -constexpr std::string_view operator "" _sv( const char* str, size_t len ) noexcept // (1) -{ - return std::string_view{ str, len }; -} - -constexpr std::u16string_view operator "" _sv( const char16_t* str, size_t len ) noexcept // (2) -{ - return std::u16string_view{ str, len }; -} - -constexpr std::u32string_view operator "" _sv( const char32_t* str, size_t len ) noexcept // (3) -{ - return std::u32string_view{ str, len }; -} - -constexpr std::wstring_view operator "" _sv( const wchar_t* str, size_t len ) noexcept // (4) -{ - return std::wstring_view{ str, len }; -} - -}} // namespace literals::string_view_literals - -#endif // nssv_CONFIG_USR_SV_OPERATOR - -} // namespace nonstd - -#endif // nssv_CONFIG_CONVERSION_STD_STRING_FREE_FUNCTIONS - -namespace nonstd { - -using std::string_view; -using std::wstring_view; -using std::u16string_view; -using std::u32string_view; -using std::basic_string_view; - -// literal "sv" and "_sv", see above - -using std::operator==; -using std::operator!=; -using std::operator<; -using std::operator<=; -using std::operator>; -using std::operator>=; - -using std::operator<<; - -} // namespace nonstd - -#else // nssv_HAVE_STD_STRING_VIEW - -// -// Before C++17: use string_view lite: -// - -// Compiler versions: -// -// MSVC++ 6.0 _MSC_VER == 1200 (Visual Studio 6.0) -// MSVC++ 7.0 _MSC_VER == 1300 (Visual Studio .NET 2002) -// MSVC++ 7.1 _MSC_VER == 1310 (Visual Studio .NET 2003) -// MSVC++ 8.0 _MSC_VER == 1400 (Visual Studio 2005) -// MSVC++ 9.0 _MSC_VER == 1500 (Visual Studio 2008) -// MSVC++ 10.0 _MSC_VER == 1600 (Visual Studio 2010) -// MSVC++ 11.0 _MSC_VER == 1700 (Visual Studio 2012) -// MSVC++ 12.0 _MSC_VER == 1800 (Visual Studio 2013) -// MSVC++ 14.0 _MSC_VER == 1900 (Visual Studio 2015) -// MSVC++ 14.1 _MSC_VER >= 1910 (Visual Studio 2017) - -#if defined(_MSC_VER ) && !defined(__clang__) -# define nssv_COMPILER_MSVC_VER (_MSC_VER ) -# define nssv_COMPILER_MSVC_VERSION (_MSC_VER / 10 - 10 * ( 5 + (_MSC_VER < 1900 ) ) ) -#else -# define nssv_COMPILER_MSVC_VER 0 -# define nssv_COMPILER_MSVC_VERSION 0 -#endif - -#define nssv_COMPILER_VERSION( major, minor, patch ) (10 * ( 10 * major + minor) + patch) - -#if defined(__clang__) -# define nssv_COMPILER_CLANG_VERSION nssv_COMPILER_VERSION(__clang_major__, __clang_minor__, __clang_patchlevel__) -#else -# define nssv_COMPILER_CLANG_VERSION 0 -#endif - -#if defined(__GNUC__) && !defined(__clang__) -# define nssv_COMPILER_GNUC_VERSION nssv_COMPILER_VERSION(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__) -#else -# define nssv_COMPILER_GNUC_VERSION 0 -#endif - -// half-open range [lo..hi): -#define nssv_BETWEEN( v, lo, hi ) ( (lo) <= (v) && (v) < (hi) ) - -// Presence of language and library features: - -#ifdef _HAS_CPP0X -# define nssv_HAS_CPP0X _HAS_CPP0X -#else -# define nssv_HAS_CPP0X 0 -#endif - -// Unless defined otherwise below, consider VC14 as C++11 for variant-lite: - -#if nssv_COMPILER_MSVC_VER >= 1900 -# undef nssv_CPP11_OR_GREATER -# define nssv_CPP11_OR_GREATER 1 -#endif - -#define nssv_CPP11_90 (nssv_CPP11_OR_GREATER_ || nssv_COMPILER_MSVC_VER >= 1500) -#define nssv_CPP11_100 (nssv_CPP11_OR_GREATER_ || nssv_COMPILER_MSVC_VER >= 1600) -#define nssv_CPP11_110 (nssv_CPP11_OR_GREATER_ || nssv_COMPILER_MSVC_VER >= 1700) -#define nssv_CPP11_120 (nssv_CPP11_OR_GREATER_ || nssv_COMPILER_MSVC_VER >= 1800) -#define nssv_CPP11_140 (nssv_CPP11_OR_GREATER_ || nssv_COMPILER_MSVC_VER >= 1900) -#define nssv_CPP11_141 (nssv_CPP11_OR_GREATER_ || nssv_COMPILER_MSVC_VER >= 1910) - -#define nssv_CPP14_000 (nssv_CPP14_OR_GREATER) -#define nssv_CPP17_000 (nssv_CPP17_OR_GREATER) - -// Presence of C++11 language features: - -#define nssv_HAVE_CONSTEXPR_11 nssv_CPP11_140 -#define nssv_HAVE_EXPLICIT_CONVERSION nssv_CPP11_140 -#define nssv_HAVE_INLINE_NAMESPACE nssv_CPP11_140 -#define nssv_HAVE_NOEXCEPT nssv_CPP11_140 -#define nssv_HAVE_NULLPTR nssv_CPP11_100 -#define nssv_HAVE_REF_QUALIFIER nssv_CPP11_140 -#define nssv_HAVE_UNICODE_LITERALS nssv_CPP11_140 -#define nssv_HAVE_USER_DEFINED_LITERALS nssv_CPP11_140 -#define nssv_HAVE_WCHAR16_T nssv_CPP11_100 -#define nssv_HAVE_WCHAR32_T nssv_CPP11_100 - -#if ! ( ( nssv_CPP11 && nssv_COMPILER_CLANG_VERSION ) || nssv_BETWEEN( nssv_COMPILER_CLANG_VERSION, 300, 400 ) ) -# define nssv_HAVE_STD_DEFINED_LITERALS nssv_CPP11_140 -#endif - -// Presence of C++14 language features: - -#define nssv_HAVE_CONSTEXPR_14 nssv_CPP14_000 - -// Presence of C++17 language features: - -#define nssv_HAVE_NODISCARD nssv_CPP17_000 - -// Presence of C++ library features: - -#define nssv_HAVE_STD_HASH nssv_CPP11_120 - -// C++ feature usage: - -#if nssv_HAVE_CONSTEXPR_11 -# define nssv_constexpr constexpr -#else -# define nssv_constexpr /*constexpr*/ -#endif - -#if nssv_HAVE_CONSTEXPR_14 -# define nssv_constexpr14 constexpr -#else -# define nssv_constexpr14 /*constexpr*/ -#endif - -#if nssv_HAVE_EXPLICIT_CONVERSION -# define nssv_explicit explicit -#else -# define nssv_explicit /*explicit*/ -#endif - -#if nssv_HAVE_INLINE_NAMESPACE -# define nssv_inline_ns inline -#else -# define nssv_inline_ns /*inline*/ -#endif - -#if nssv_HAVE_NOEXCEPT -# define nssv_noexcept noexcept -#else -# define nssv_noexcept /*noexcept*/ -#endif - -//#if nssv_HAVE_REF_QUALIFIER -//# define nssv_ref_qual & -//# define nssv_refref_qual && -//#else -//# define nssv_ref_qual /*&*/ -//# define nssv_refref_qual /*&&*/ -//#endif - -#if nssv_HAVE_NULLPTR -# define nssv_nullptr nullptr -#else -# define nssv_nullptr NULL -#endif - -#if nssv_HAVE_NODISCARD -# define nssv_nodiscard [[nodiscard]] -#else -# define nssv_nodiscard /*[[nodiscard]]*/ -#endif - -// Additional includes: - -#include -#include -#include -#include -#include -#include // std::char_traits<> - -#if ! nssv_CONFIG_NO_EXCEPTIONS -# include -#endif - -#if nssv_CPP11_OR_GREATER -# include -#endif - -// Clang, GNUC, MSVC warning suppression macros: - -#if defined(__clang__) -# pragma clang diagnostic ignored "-Wreserved-user-defined-literal" -# pragma clang diagnostic push -# pragma clang diagnostic ignored "-Wuser-defined-literals" -#elif defined(__GNUC__) -# pragma GCC diagnostic push -# pragma GCC diagnostic ignored "-Wliteral-suffix" -#endif // __clang__ - -#if nssv_COMPILER_MSVC_VERSION >= 140 -# define nssv_SUPPRESS_MSGSL_WARNING(expr) [[gsl::suppress(expr)]] -# define nssv_SUPPRESS_MSVC_WARNING(code, descr) __pragma(warning(suppress: code) ) -# define nssv_DISABLE_MSVC_WARNINGS(codes) __pragma(warning(push)) __pragma(warning(disable: codes)) -#else -# define nssv_SUPPRESS_MSGSL_WARNING(expr) -# define nssv_SUPPRESS_MSVC_WARNING(code, descr) -# define nssv_DISABLE_MSVC_WARNINGS(codes) -#endif - -#if defined(__clang__) -# define nssv_RESTORE_WARNINGS() _Pragma("clang diagnostic pop") -#elif defined(__GNUC__) -# define nssv_RESTORE_WARNINGS() _Pragma("GCC diagnostic pop") -#elif nssv_COMPILER_MSVC_VERSION >= 140 -# define nssv_RESTORE_WARNINGS() __pragma(warning(pop )) -#else -# define nssv_RESTORE_WARNINGS() -#endif - -// Suppress the following MSVC (GSL) warnings: -// - C4455, non-gsl : 'operator ""sv': literal suffix identifiers that do not -// start with an underscore are reserved -// - C26472, gsl::t.1 : don't use a static_cast for arithmetic conversions; -// use brace initialization, gsl::narrow_cast or gsl::narow -// - C26481: gsl::b.1 : don't use pointer arithmetic. Use span instead - -nssv_DISABLE_MSVC_WARNINGS( 4455 26481 26472 ) -//nssv_DISABLE_CLANG_WARNINGS( "-Wuser-defined-literals" ) -//nssv_DISABLE_GNUC_WARNINGS( -Wliteral-suffix ) - -namespace nonstd { namespace sv_lite { - -template -< - class CharT, - class Traits = std::char_traits -> -class basic_string_view; - -// -// basic_string_view: -// - -template -< - class CharT, - class Traits /* = std::char_traits */ -> -class basic_string_view -{ -public: - // Member types: - - typedef Traits traits_type; - typedef CharT value_type; - - typedef CharT * pointer; - typedef CharT const * const_pointer; - typedef CharT & reference; - typedef CharT const & const_reference; - - typedef const_pointer iterator; - typedef const_pointer const_iterator; - typedef std::reverse_iterator< const_iterator > reverse_iterator; - typedef std::reverse_iterator< const_iterator > const_reverse_iterator; - - typedef std::size_t size_type; - typedef std::ptrdiff_t difference_type; - - // 24.4.2.1 Construction and assignment: - - nssv_constexpr basic_string_view() nssv_noexcept - : data_( nssv_nullptr ) - , size_( 0 ) - {} - -#if nssv_CPP11_OR_GREATER - nssv_constexpr basic_string_view( basic_string_view const & other ) nssv_noexcept = default; -#else - nssv_constexpr basic_string_view( basic_string_view const & other ) nssv_noexcept - : data_( other.data_) - , size_( other.size_) - {} -#endif - - nssv_constexpr basic_string_view( CharT const * s, size_type count ) - : data_( s ) - , size_( count ) - {} - - nssv_constexpr basic_string_view( CharT const * s) - : data_( s ) - , size_( Traits::length(s) ) - {} - - // Assignment: - -#if nssv_CPP11_OR_GREATER - nssv_constexpr14 basic_string_view & operator=( basic_string_view const & other ) nssv_noexcept = default; -#else - nssv_constexpr14 basic_string_view & operator=( basic_string_view const & other ) nssv_noexcept - { - data_ = other.data_; - size_ = other.size_; - return *this; - } -#endif - - // 24.4.2.2 Iterator support: - - nssv_constexpr const_iterator begin() const nssv_noexcept { return data_; } - nssv_constexpr const_iterator end() const nssv_noexcept { return data_ + size_; } - - nssv_constexpr const_iterator cbegin() const nssv_noexcept { return begin(); } - nssv_constexpr const_iterator cend() const nssv_noexcept { return end(); } - - nssv_constexpr const_reverse_iterator rbegin() const nssv_noexcept { return const_reverse_iterator( end() ); } - nssv_constexpr const_reverse_iterator rend() const nssv_noexcept { return const_reverse_iterator( begin() ); } - - nssv_constexpr const_reverse_iterator crbegin() const nssv_noexcept { return rbegin(); } - nssv_constexpr const_reverse_iterator crend() const nssv_noexcept { return rend(); } - - // 24.4.2.3 Capacity: - - nssv_constexpr size_type size() const nssv_noexcept { return size_; } - nssv_constexpr size_type length() const nssv_noexcept { return size_; } - nssv_constexpr size_type max_size() const nssv_noexcept { return (std::numeric_limits< size_type >::max)(); } - - // since C++20 - nssv_nodiscard nssv_constexpr bool empty() const nssv_noexcept - { - return 0 == size_; - } - - // 24.4.2.4 Element access: - - nssv_constexpr const_reference operator[]( size_type pos ) const - { - return data_at( pos ); - } - - nssv_constexpr14 const_reference at( size_type pos ) const - { -#if nssv_CONFIG_NO_EXCEPTIONS - assert( pos < size() ); -#else - if ( pos >= size() ) - { - throw std::out_of_range("nonst::string_view::at()"); - } -#endif - return data_at( pos ); - } - - nssv_constexpr const_reference front() const { return data_at( 0 ); } - nssv_constexpr const_reference back() const { return data_at( size() - 1 ); } - - nssv_constexpr const_pointer data() const nssv_noexcept { return data_; } - - // 24.4.2.5 Modifiers: - - nssv_constexpr14 void remove_prefix( size_type n ) - { - assert( n <= size() ); - data_ += n; - size_ -= n; - } - - nssv_constexpr14 void remove_suffix( size_type n ) - { - assert( n <= size() ); - size_ -= n; - } - - nssv_constexpr14 void swap( basic_string_view & other ) nssv_noexcept - { - using std::swap; - swap( data_, other.data_ ); - swap( size_, other.size_ ); - } - - // 24.4.2.6 String operations: - - size_type copy( CharT * dest, size_type n, size_type pos = 0 ) const - { -#if nssv_CONFIG_NO_EXCEPTIONS - assert( pos <= size() ); -#else - if ( pos > size() ) - { - throw std::out_of_range("nonst::string_view::copy()"); - } -#endif - const size_type rlen = (std::min)( n, size() - pos ); - - (void) Traits::copy( dest, data() + pos, rlen ); - - return rlen; - } - - nssv_constexpr14 basic_string_view substr( size_type pos = 0, size_type n = npos ) const - { -#if nssv_CONFIG_NO_EXCEPTIONS - assert( pos <= size() ); -#else - if ( pos > size() ) - { - throw std::out_of_range("nonst::string_view::substr()"); - } -#endif - return basic_string_view( data() + pos, (std::min)( n, size() - pos ) ); - } - - // compare(), 6x: - - nssv_constexpr14 int compare( basic_string_view other ) const nssv_noexcept // (1) - { - if ( const int result = Traits::compare( data(), other.data(), (std::min)( size(), other.size() ) ) ) - return result; - - return size() == other.size() ? 0 : size() < other.size() ? -1 : 1; - } - - nssv_constexpr int compare( size_type pos1, size_type n1, basic_string_view other ) const // (2) - { - return substr( pos1, n1 ).compare( other ); - } - - nssv_constexpr int compare( size_type pos1, size_type n1, basic_string_view other, size_type pos2, size_type n2 ) const // (3) - { - return substr( pos1, n1 ).compare( other.substr( pos2, n2 ) ); - } - - nssv_constexpr int compare( CharT const * s ) const // (4) - { - return compare( basic_string_view( s ) ); - } - - nssv_constexpr int compare( size_type pos1, size_type n1, CharT const * s ) const // (5) - { - return substr( pos1, n1 ).compare( basic_string_view( s ) ); - } - - nssv_constexpr int compare( size_type pos1, size_type n1, CharT const * s, size_type n2 ) const // (6) - { - return substr( pos1, n1 ).compare( basic_string_view( s, n2 ) ); - } - - // 24.4.2.7 Searching: - - // starts_with(), 3x, since C++20: - - nssv_constexpr bool starts_with( basic_string_view v ) const nssv_noexcept // (1) - { - return size() >= v.size() && compare( 0, v.size(), v ) == 0; - } - - nssv_constexpr bool starts_with( CharT c ) const nssv_noexcept // (2) - { - return starts_with( basic_string_view( &c, 1 ) ); - } - - nssv_constexpr bool starts_with( CharT const * s ) const // (3) - { - return starts_with( basic_string_view( s ) ); - } - - // ends_with(), 3x, since C++20: - - nssv_constexpr bool ends_with( basic_string_view v ) const nssv_noexcept // (1) - { - return size() >= v.size() && compare( size() - v.size(), npos, v ) == 0; - } - - nssv_constexpr bool ends_with( CharT c ) const nssv_noexcept // (2) - { - return ends_with( basic_string_view( &c, 1 ) ); - } - - nssv_constexpr bool ends_with( CharT const * s ) const // (3) - { - return ends_with( basic_string_view( s ) ); - } - - // find(), 4x: - - nssv_constexpr14 size_type find( basic_string_view v, size_type pos = 0 ) const nssv_noexcept // (1) - { - return assert( v.size() == 0 || v.data() != nssv_nullptr ) - , pos >= size() - ? npos - : to_pos( std::search( cbegin() + pos, cend(), v.cbegin(), v.cend(), Traits::eq ) ); - } - - nssv_constexpr14 size_type find( CharT c, size_type pos = 0 ) const nssv_noexcept // (2) - { - return find( basic_string_view( &c, 1 ), pos ); - } - - nssv_constexpr14 size_type find( CharT const * s, size_type pos, size_type n ) const // (3) - { - return find( basic_string_view( s, n ), pos ); - } - - nssv_constexpr14 size_type find( CharT const * s, size_type pos = 0 ) const // (4) - { - return find( basic_string_view( s ), pos ); - } - - // rfind(), 4x: - - nssv_constexpr14 size_type rfind( basic_string_view v, size_type pos = npos ) const nssv_noexcept // (1) - { - if ( size() < v.size() ) - return npos; - - if ( v.empty() ) - return (std::min)( size(), pos ); - - const_iterator last = cbegin() + (std::min)( size() - v.size(), pos ) + v.size(); - const_iterator result = std::find_end( cbegin(), last, v.cbegin(), v.cend(), Traits::eq ); - - return result != last ? size_type( result - cbegin() ) : npos; - } - - nssv_constexpr14 size_type rfind( CharT c, size_type pos = npos ) const nssv_noexcept // (2) - { - return rfind( basic_string_view( &c, 1 ), pos ); - } - - nssv_constexpr14 size_type rfind( CharT const * s, size_type pos, size_type n ) const // (3) - { - return rfind( basic_string_view( s, n ), pos ); - } - - nssv_constexpr14 size_type rfind( CharT const * s, size_type pos = npos ) const // (4) - { - return rfind( basic_string_view( s ), pos ); - } - - // find_first_of(), 4x: - - nssv_constexpr size_type find_first_of( basic_string_view v, size_type pos = 0 ) const nssv_noexcept // (1) - { - return pos >= size() - ? npos - : to_pos( std::find_first_of( cbegin() + pos, cend(), v.cbegin(), v.cend(), Traits::eq ) ); - } - - nssv_constexpr size_type find_first_of( CharT c, size_type pos = 0 ) const nssv_noexcept // (2) - { - return find_first_of( basic_string_view( &c, 1 ), pos ); - } - - nssv_constexpr size_type find_first_of( CharT const * s, size_type pos, size_type n ) const // (3) - { - return find_first_of( basic_string_view( s, n ), pos ); - } - - nssv_constexpr size_type find_first_of( CharT const * s, size_type pos = 0 ) const // (4) - { - return find_first_of( basic_string_view( s ), pos ); - } - - // find_last_of(), 4x: - - nssv_constexpr size_type find_last_of( basic_string_view v, size_type pos = npos ) const nssv_noexcept // (1) - { - return empty() - ? npos - : pos >= size() - ? find_last_of( v, size() - 1 ) - : to_pos( std::find_first_of( const_reverse_iterator( cbegin() + pos + 1 ), crend(), v.cbegin(), v.cend(), Traits::eq ) ); - } - - nssv_constexpr size_type find_last_of( CharT c, size_type pos = npos ) const nssv_noexcept // (2) - { - return find_last_of( basic_string_view( &c, 1 ), pos ); - } - - nssv_constexpr size_type find_last_of( CharT const * s, size_type pos, size_type count ) const // (3) - { - return find_last_of( basic_string_view( s, count ), pos ); - } - - nssv_constexpr size_type find_last_of( CharT const * s, size_type pos = npos ) const // (4) - { - return find_last_of( basic_string_view( s ), pos ); - } - - // find_first_not_of(), 4x: - - nssv_constexpr size_type find_first_not_of( basic_string_view v, size_type pos = 0 ) const nssv_noexcept // (1) - { - return pos >= size() - ? npos - : to_pos( std::find_if( cbegin() + pos, cend(), not_in_view( v ) ) ); - } - - nssv_constexpr size_type find_first_not_of( CharT c, size_type pos = 0 ) const nssv_noexcept // (2) - { - return find_first_not_of( basic_string_view( &c, 1 ), pos ); - } - - nssv_constexpr size_type find_first_not_of( CharT const * s, size_type pos, size_type count ) const // (3) - { - return find_first_not_of( basic_string_view( s, count ), pos ); - } - - nssv_constexpr size_type find_first_not_of( CharT const * s, size_type pos = 0 ) const // (4) - { - return find_first_not_of( basic_string_view( s ), pos ); - } - - // find_last_not_of(), 4x: - - nssv_constexpr size_type find_last_not_of( basic_string_view v, size_type pos = npos ) const nssv_noexcept // (1) - { - return empty() - ? npos - : pos >= size() - ? find_last_not_of( v, size() - 1 ) - : to_pos( std::find_if( const_reverse_iterator( cbegin() + pos + 1 ), crend(), not_in_view( v ) ) ); - } - - nssv_constexpr size_type find_last_not_of( CharT c, size_type pos = npos ) const nssv_noexcept // (2) - { - return find_last_not_of( basic_string_view( &c, 1 ), pos ); - } - - nssv_constexpr size_type find_last_not_of( CharT const * s, size_type pos, size_type count ) const // (3) - { - return find_last_not_of( basic_string_view( s, count ), pos ); - } - - nssv_constexpr size_type find_last_not_of( CharT const * s, size_type pos = npos ) const // (4) - { - return find_last_not_of( basic_string_view( s ), pos ); - } - - // Constants: - -#if nssv_CPP17_OR_GREATER - static nssv_constexpr size_type npos = size_type(-1); -#elif nssv_CPP11_OR_GREATER - enum : size_type { npos = size_type(-1) }; -#else - enum { npos = size_type(-1) }; -#endif - -private: - struct not_in_view - { - const basic_string_view v; - - nssv_constexpr not_in_view( basic_string_view v ) : v( v ) {} - - nssv_constexpr bool operator()( CharT c ) const - { - return npos == v.find_first_of( c ); - } - }; - - nssv_constexpr size_type to_pos( const_iterator it ) const - { - return it == cend() ? npos : size_type( it - cbegin() ); - } - - nssv_constexpr size_type to_pos( const_reverse_iterator it ) const - { - return it == crend() ? npos : size_type( crend() - it - 1 ); - } - - nssv_constexpr const_reference data_at( size_type pos ) const - { -#if nssv_BETWEEN( nssv_COMPILER_GNUC_VERSION, 1, 500 ) - return data_[pos]; -#else - return assert( pos < size() ), data_[pos]; -#endif - } - -private: - const_pointer data_; - size_type size_; - -public: -#if nssv_CONFIG_CONVERSION_STD_STRING_CLASS_METHODS - - template< class Allocator > - basic_string_view( std::basic_string const & s ) nssv_noexcept - : data_( s.data() ) - , size_( s.size() ) - {} - -#if nssv_HAVE_EXPLICIT_CONVERSION - - template< class Allocator > - explicit operator std::basic_string() const - { - return to_string( Allocator() ); - } - -#endif // nssv_HAVE_EXPLICIT_CONVERSION - -#if nssv_CPP11_OR_GREATER - - template< class Allocator = std::allocator > - std::basic_string - to_string( Allocator const & a = Allocator() ) const - { - return std::basic_string( begin(), end(), a ); - } - -#else - - std::basic_string - to_string() const - { - return std::basic_string( begin(), end() ); - } - - template< class Allocator > - std::basic_string - to_string( Allocator const & a ) const - { - return std::basic_string( begin(), end(), a ); - } - -#endif // nssv_CPP11_OR_GREATER - -#endif // nssv_CONFIG_CONVERSION_STD_STRING_CLASS_METHODS -}; - -// -// Non-member functions: -// - -// 24.4.3 Non-member comparison functions: -// lexicographically compare two string views (function template): - -template< class CharT, class Traits > -nssv_constexpr bool operator== ( - basic_string_view lhs, - basic_string_view rhs ) nssv_noexcept -{ return lhs.compare( rhs ) == 0 ; } - -template< class CharT, class Traits > -nssv_constexpr bool operator!= ( - basic_string_view lhs, - basic_string_view rhs ) nssv_noexcept -{ return lhs.compare( rhs ) != 0 ; } - -template< class CharT, class Traits > -nssv_constexpr bool operator< ( - basic_string_view lhs, - basic_string_view rhs ) nssv_noexcept -{ return lhs.compare( rhs ) < 0 ; } - -template< class CharT, class Traits > -nssv_constexpr bool operator<= ( - basic_string_view lhs, - basic_string_view rhs ) nssv_noexcept -{ return lhs.compare( rhs ) <= 0 ; } - -template< class CharT, class Traits > -nssv_constexpr bool operator> ( - basic_string_view lhs, - basic_string_view rhs ) nssv_noexcept -{ return lhs.compare( rhs ) > 0 ; } - -template< class CharT, class Traits > -nssv_constexpr bool operator>= ( - basic_string_view lhs, - basic_string_view rhs ) nssv_noexcept -{ return lhs.compare( rhs ) >= 0 ; } - -// Let S be basic_string_view, and sv be an instance of S. -// Implementations shall provide sufficient additional overloads marked -// constexpr and noexcept so that an object t with an implicit conversion -// to S can be compared according to Table 67. - -#if nssv_CPP11_OR_GREATER && ! nssv_BETWEEN( nssv_COMPILER_MSVC_VERSION, 100, 141 ) - -#define nssv_BASIC_STRING_VIEW_I(T,U) typename std::decay< basic_string_view >::type - -#if nssv_BETWEEN( nssv_COMPILER_MSVC_VERSION, 140, 150 ) -# define nssv_MSVC_ORDER(x) , int=x -#else -# define nssv_MSVC_ORDER(x) /*, int=x*/ -#endif - -// == - -template< class CharT, class Traits nssv_MSVC_ORDER(1) > -nssv_constexpr bool operator==( - basic_string_view lhs, - nssv_BASIC_STRING_VIEW_I(CharT, Traits) rhs ) nssv_noexcept -{ return lhs.compare( rhs ) == 0; } - -template< class CharT, class Traits nssv_MSVC_ORDER(2) > -nssv_constexpr bool operator==( - nssv_BASIC_STRING_VIEW_I(CharT, Traits) lhs, - basic_string_view rhs ) nssv_noexcept -{ return lhs.size() == rhs.size() && lhs.compare( rhs ) == 0; } - -// != - -template< class CharT, class Traits nssv_MSVC_ORDER(1) > -nssv_constexpr bool operator!= ( - basic_string_view < CharT, Traits > lhs, - nssv_BASIC_STRING_VIEW_I( CharT, Traits ) rhs ) nssv_noexcept -{ return lhs.size() != rhs.size() || lhs.compare( rhs ) != 0 ; } - -template< class CharT, class Traits nssv_MSVC_ORDER(2) > -nssv_constexpr bool operator!= ( - nssv_BASIC_STRING_VIEW_I( CharT, Traits ) lhs, - basic_string_view < CharT, Traits > rhs ) nssv_noexcept -{ return lhs.compare( rhs ) != 0 ; } - -// < - -template< class CharT, class Traits nssv_MSVC_ORDER(1) > -nssv_constexpr bool operator< ( - basic_string_view < CharT, Traits > lhs, - nssv_BASIC_STRING_VIEW_I( CharT, Traits ) rhs ) nssv_noexcept -{ return lhs.compare( rhs ) < 0 ; } - -template< class CharT, class Traits nssv_MSVC_ORDER(2) > -nssv_constexpr bool operator< ( - nssv_BASIC_STRING_VIEW_I( CharT, Traits ) lhs, - basic_string_view < CharT, Traits > rhs ) nssv_noexcept -{ return lhs.compare( rhs ) < 0 ; } - -// <= - -template< class CharT, class Traits nssv_MSVC_ORDER(1) > -nssv_constexpr bool operator<= ( - basic_string_view < CharT, Traits > lhs, - nssv_BASIC_STRING_VIEW_I( CharT, Traits ) rhs ) nssv_noexcept -{ return lhs.compare( rhs ) <= 0 ; } - -template< class CharT, class Traits nssv_MSVC_ORDER(2) > -nssv_constexpr bool operator<= ( - nssv_BASIC_STRING_VIEW_I( CharT, Traits ) lhs, - basic_string_view < CharT, Traits > rhs ) nssv_noexcept -{ return lhs.compare( rhs ) <= 0 ; } - -// > - -template< class CharT, class Traits nssv_MSVC_ORDER(1) > -nssv_constexpr bool operator> ( - basic_string_view < CharT, Traits > lhs, - nssv_BASIC_STRING_VIEW_I( CharT, Traits ) rhs ) nssv_noexcept -{ return lhs.compare( rhs ) > 0 ; } - -template< class CharT, class Traits nssv_MSVC_ORDER(2) > -nssv_constexpr bool operator> ( - nssv_BASIC_STRING_VIEW_I( CharT, Traits ) lhs, - basic_string_view < CharT, Traits > rhs ) nssv_noexcept -{ return lhs.compare( rhs ) > 0 ; } - -// >= - -template< class CharT, class Traits nssv_MSVC_ORDER(1) > -nssv_constexpr bool operator>= ( - basic_string_view < CharT, Traits > lhs, - nssv_BASIC_STRING_VIEW_I( CharT, Traits ) rhs ) nssv_noexcept -{ return lhs.compare( rhs ) >= 0 ; } - -template< class CharT, class Traits nssv_MSVC_ORDER(2) > -nssv_constexpr bool operator>= ( - nssv_BASIC_STRING_VIEW_I( CharT, Traits ) lhs, - basic_string_view < CharT, Traits > rhs ) nssv_noexcept -{ return lhs.compare( rhs ) >= 0 ; } - -#undef nssv_MSVC_ORDER -#undef nssv_BASIC_STRING_VIEW_I - -#endif // nssv_CPP11_OR_GREATER - -// 24.4.4 Inserters and extractors: - -namespace detail { - -template< class Stream > -void write_padding( Stream & os, std::streamsize n ) -{ - for ( std::streamsize i = 0; i < n; ++i ) - os.rdbuf()->sputc( os.fill() ); -} - -template< class Stream, class View > -Stream & write_to_stream( Stream & os, View const & sv ) -{ - typename Stream::sentry sentry( os ); - - if ( !os ) - return os; - - const std::streamsize length = static_cast( sv.length() ); - - // Whether, and how, to pad: - const bool pad = ( length < os.width() ); - const bool left_pad = pad && ( os.flags() & std::ios_base::adjustfield ) == std::ios_base::right; - - if ( left_pad ) - write_padding( os, os.width() - length ); - - // Write span characters: - os.rdbuf()->sputn( sv.begin(), length ); - - if ( pad && !left_pad ) - write_padding( os, os.width() - length ); - - // Reset output stream width: - os.width( 0 ); - - return os; -} - -} // namespace detail - -template< class CharT, class Traits > -std::basic_ostream & -operator<<( - std::basic_ostream& os, - basic_string_view sv ) -{ - return detail::write_to_stream( os, sv ); -} - -// Several typedefs for common character types are provided: - -typedef basic_string_view string_view; -typedef basic_string_view wstring_view; -#if nssv_HAVE_WCHAR16_T -typedef basic_string_view u16string_view; -typedef basic_string_view u32string_view; -#endif - -}} // namespace nonstd::sv_lite - -// -// 24.4.6 Suffix for basic_string_view literals: -// - -#if nssv_HAVE_USER_DEFINED_LITERALS - -namespace nonstd { -nssv_inline_ns namespace literals { -nssv_inline_ns namespace string_view_literals { - -#if nssv_CONFIG_STD_SV_OPERATOR && nssv_HAVE_STD_DEFINED_LITERALS - -nssv_constexpr nonstd::sv_lite::string_view operator "" sv( const char* str, size_t len ) nssv_noexcept // (1) -{ - return nonstd::sv_lite::string_view{ str, len }; -} - -nssv_constexpr nonstd::sv_lite::u16string_view operator "" sv( const char16_t* str, size_t len ) nssv_noexcept // (2) -{ - return nonstd::sv_lite::u16string_view{ str, len }; -} - -nssv_constexpr nonstd::sv_lite::u32string_view operator "" sv( const char32_t* str, size_t len ) nssv_noexcept // (3) -{ - return nonstd::sv_lite::u32string_view{ str, len }; -} - -nssv_constexpr nonstd::sv_lite::wstring_view operator "" sv( const wchar_t* str, size_t len ) nssv_noexcept // (4) -{ - return nonstd::sv_lite::wstring_view{ str, len }; -} - -#endif // nssv_CONFIG_STD_SV_OPERATOR && nssv_HAVE_STD_DEFINED_LITERALS - -#if nssv_CONFIG_USR_SV_OPERATOR - -nssv_constexpr nonstd::sv_lite::string_view operator "" _sv( const char* str, size_t len ) nssv_noexcept // (1) -{ - return nonstd::sv_lite::string_view{ str, len }; -} - -nssv_constexpr nonstd::sv_lite::u16string_view operator "" _sv( const char16_t* str, size_t len ) nssv_noexcept // (2) -{ - return nonstd::sv_lite::u16string_view{ str, len }; -} - -nssv_constexpr nonstd::sv_lite::u32string_view operator "" _sv( const char32_t* str, size_t len ) nssv_noexcept // (3) -{ - return nonstd::sv_lite::u32string_view{ str, len }; -} - -nssv_constexpr nonstd::sv_lite::wstring_view operator "" _sv( const wchar_t* str, size_t len ) nssv_noexcept // (4) -{ - return nonstd::sv_lite::wstring_view{ str, len }; -} - -#endif // nssv_CONFIG_USR_SV_OPERATOR - -}}} // namespace nonstd::literals::string_view_literals - -#endif - -// -// Extensions for std::string: -// - -#if nssv_CONFIG_CONVERSION_STD_STRING_FREE_FUNCTIONS - -namespace nonstd { -namespace sv_lite { - -// Exclude MSVC 14 (19.00): it yields ambiguous to_string(): - -#if nssv_CPP11_OR_GREATER && nssv_COMPILER_MSVC_VERSION != 140 - -template< class CharT, class Traits, class Allocator = std::allocator > -std::basic_string -to_string( basic_string_view v, Allocator const & a = Allocator() ) -{ - return std::basic_string( v.begin(), v.end(), a ); -} - -#else - -template< class CharT, class Traits > -std::basic_string -to_string( basic_string_view v ) -{ - return std::basic_string( v.begin(), v.end() ); -} - -template< class CharT, class Traits, class Allocator > -std::basic_string -to_string( basic_string_view v, Allocator const & a ) -{ - return std::basic_string( v.begin(), v.end(), a ); -} - -#endif // nssv_CPP11_OR_GREATER - -template< class CharT, class Traits, class Allocator > -basic_string_view -to_string_view( std::basic_string const & s ) -{ - return basic_string_view( s.data(), s.size() ); -} - -}} // namespace nonstd::sv_lite - -#endif // nssv_CONFIG_CONVERSION_STD_STRING_FREE_FUNCTIONS - -// -// make types and algorithms available in namespace nonstd: -// - -namespace nonstd { - -using sv_lite::basic_string_view; -using sv_lite::string_view; -using sv_lite::wstring_view; - -#if nssv_HAVE_WCHAR16_T -using sv_lite::u16string_view; -#endif -#if nssv_HAVE_WCHAR32_T -using sv_lite::u32string_view; -#endif - -// literal "sv" - -using sv_lite::operator==; -using sv_lite::operator!=; -using sv_lite::operator<; -using sv_lite::operator<=; -using sv_lite::operator>; -using sv_lite::operator>=; - -using sv_lite::operator<<; - -#if nssv_CONFIG_CONVERSION_STD_STRING_FREE_FUNCTIONS -using sv_lite::to_string; -using sv_lite::to_string_view; -#endif - -} // namespace nonstd - -// 24.4.5 Hash support (C++11): - -// Note: The hash value of a string view object is equal to the hash value of -// the corresponding string object. - -#if nssv_HAVE_STD_HASH - -#include - -namespace std { - -template<> -struct hash< nonstd::string_view > -{ -public: - std::size_t operator()( nonstd::string_view v ) const nssv_noexcept - { - return std::hash()( std::string( v.data(), v.size() ) ); - } -}; - -template<> -struct hash< nonstd::wstring_view > -{ -public: - std::size_t operator()( nonstd::wstring_view v ) const nssv_noexcept - { - return std::hash()( std::wstring( v.data(), v.size() ) ); - } -}; - -template<> -struct hash< nonstd::u16string_view > -{ -public: - std::size_t operator()( nonstd::u16string_view v ) const nssv_noexcept - { - return std::hash()( std::u16string( v.data(), v.size() ) ); - } -}; - -template<> -struct hash< nonstd::u32string_view > -{ -public: - std::size_t operator()( nonstd::u32string_view v ) const nssv_noexcept - { - return std::hash()( std::u32string( v.data(), v.size() ) ); - } -}; - -} // namespace std - -#endif // nssv_HAVE_STD_HASH - -nssv_RESTORE_WARNINGS() - -#endif // nssv_HAVE_STD_STRING_VIEW -#endif // NONSTD_SV_LITE_H_INCLUDED - - - -namespace inja { - -enum class ElementNotation { - Dot, - Pointer -}; - -/*! - * \brief Class for lexer configuration. - */ -struct LexerConfig { - std::string statement_open {"{%"}; - std::string statement_close {"%}"}; - std::string line_statement {"##"}; - std::string expression_open {"{{"}; - std::string expression_close {"}}"}; - std::string comment_open {"{#"}; - std::string comment_close {"#}"}; - std::string open_chars {"#{"}; - - bool trim_blocks {false}; - bool lstrip_blocks {false}; - - void update_open_chars() { - open_chars = ""; - if (open_chars.find(line_statement[0]) == std::string::npos) { - open_chars += line_statement[0]; - } - if (open_chars.find(statement_open[0]) == std::string::npos) { - open_chars += statement_open[0]; - } - if (open_chars.find(expression_open[0]) == std::string::npos) { - open_chars += expression_open[0]; - } - if (open_chars.find(comment_open[0]) == std::string::npos) { - open_chars += comment_open[0]; - } - } -}; - -/*! - * \brief Class for parser configuration. - */ -struct ParserConfig { - ElementNotation notation {ElementNotation::Dot}; -}; - -} - -#endif // PANTOR_INJA_CONFIG_HPP - -// #include "function_storage.hpp" -#ifndef PANTOR_INJA_FUNCTION_STORAGE_HPP -#define PANTOR_INJA_FUNCTION_STORAGE_HPP - -#include - -// #include "bytecode.hpp" -#ifndef PANTOR_INJA_BYTECODE_HPP -#define PANTOR_INJA_BYTECODE_HPP - -#include -#include - -#include - -// #include "string_view.hpp" - - - -namespace inja { - -using json = nlohmann::json; - - -struct Bytecode { - enum class Op : uint8_t { - Nop, - // print StringRef (always immediate) - PrintText, - // print value - PrintValue, - // push value onto stack (always immediate) - Push, - - // builtin functions - // result is pushed to stack - // args specify number of arguments - // all functions can take their "last" argument either immediate - // or popped off stack (e.g. if immediate, it's like the immediate was - // just pushed to the stack) - Not, - And, - Or, - In, - Equal, - Greater, - GreaterEqual, - Less, - LessEqual, - At, - Different, - DivisibleBy, - Even, - First, - Float, - Int, - Last, - Length, - Lower, - Max, - Min, - Odd, - Range, - Result, - Round, - Sort, - Upper, - Exists, - ExistsInObject, - IsBoolean, - IsNumber, - IsInteger, - IsFloat, - IsObject, - IsArray, - IsString, - Default, - - // include another template - // value is the template name - Include, - - // callback function - // str is the function name (this means it cannot be a lookup) - // args specify number of arguments - // as with builtin functions, "last" argument can be immediate - Callback, - - // unconditional jump - // args is the index of the bytecode to jump to. - Jump, - - // conditional jump - // value popped off stack is checked for truthyness - // if false, args is the index of the bytecode to jump to. - // if true, no action is taken (falls through) - ConditionalJump, - - // start loop - // value popped off stack is what is iterated over - // args is index of bytecode after end loop (jumped to if iterable is - // empty) - // immediate value is key name (for maps) - // str is value name - StartLoop, - - // end a loop - // args is index of the first bytecode in the loop body - EndLoop, - }; - - enum Flag { - // location of value for value-taking ops (mask) - ValueMask = 0x03, - // pop value off stack - ValuePop = 0x00, - // value is immediate rather than on stack - ValueImmediate = 0x01, - // lookup immediate str (dot notation) - ValueLookupDot = 0x02, - // lookup immediate str (json pointer notation) - ValueLookupPointer = 0x03, - }; - - Op op {Op::Nop}; - uint32_t args: 30; - uint32_t flags: 2; - - json value; - std::string str; - - Bytecode(): args(0), flags(0) {} - explicit Bytecode(Op op, unsigned int args = 0): op(op), args(args), flags(0) {} - explicit Bytecode(Op op, nonstd::string_view str, unsigned int flags): op(op), args(0), flags(flags), str(str) {} - explicit Bytecode(Op op, json&& value, unsigned int flags): op(op), args(0), flags(flags), value(std::move(value)) {} -}; - -} // namespace inja - -#endif // PANTOR_INJA_BYTECODE_HPP - -// #include "string_view.hpp" - - - -namespace inja { - -using namespace nlohmann; - -using Arguments = std::vector; -using CallbackFunction = std::function; - -/*! - * \brief Class for builtin functions and user-defined callbacks. - */ -class FunctionStorage { - public: - void add_builtin(nonstd::string_view name, unsigned int num_args, Bytecode::Op op) { - auto& data = get_or_new(name, num_args); - data.op = op; - } - - void add_callback(nonstd::string_view name, unsigned int num_args, const CallbackFunction& function) { - auto& data = get_or_new(name, num_args); - data.function = function; - } - - Bytecode::Op find_builtin(nonstd::string_view name, unsigned int num_args) const { - if (auto ptr = get(name, num_args)) { - return ptr->op; - } - return Bytecode::Op::Nop; - } - - CallbackFunction find_callback(nonstd::string_view name, unsigned int num_args) const { - if (auto ptr = get(name, num_args)) { - return ptr->function; - } - return nullptr; - } - - private: - struct FunctionData { - unsigned int num_args {0}; - Bytecode::Op op {Bytecode::Op::Nop}; // for builtins - CallbackFunction function; // for callbacks - }; - - FunctionData& get_or_new(nonstd::string_view name, unsigned int num_args) { - auto &vec = m_map[static_cast(name)]; - for (auto &i: vec) { - if (i.num_args == num_args) return i; - } - vec.emplace_back(); - vec.back().num_args = num_args; - return vec.back(); - } - - const FunctionData* get(nonstd::string_view name, unsigned int num_args) const { - auto it = m_map.find(static_cast(name)); - if (it == m_map.end()) return nullptr; - for (auto &&i: it->second) { - if (i.num_args == num_args) return &i; - } - return nullptr; - } - - std::map> m_map; -}; - -} - -#endif // PANTOR_INJA_FUNCTION_STORAGE_HPP - -// #include "parser.hpp" -#ifndef PANTOR_INJA_PARSER_HPP -#define PANTOR_INJA_PARSER_HPP - -#include -#include -#include -#include - -// #include "bytecode.hpp" - -// #include "config.hpp" - -// #include "function_storage.hpp" - -// #include "lexer.hpp" -#ifndef PANTOR_INJA_LEXER_HPP -#define PANTOR_INJA_LEXER_HPP - -#include -#include - -// #include "config.hpp" - -// #include "token.hpp" -#ifndef PANTOR_INJA_TOKEN_HPP -#define PANTOR_INJA_TOKEN_HPP - -#include - -// #include "string_view.hpp" - - - -namespace inja { - -/*! - * \brief Helper-class for the inja Parser. - */ -struct Token { - enum class Kind { - Text, - ExpressionOpen, // {{ - ExpressionClose, // }} - LineStatementOpen, // ## - LineStatementClose, // \n - StatementOpen, // {% - StatementClose, // %} - CommentOpen, // {# - CommentClose, // #} - Id, // this, this.foo - Number, // 1, 2, -1, 5.2, -5.3 - String, // "this" - Comma, // , - Colon, // : - LeftParen, // ( - RightParen, // ) - LeftBracket, // [ - RightBracket, // ] - LeftBrace, // { - RightBrace, // } - Equal, // == - GreaterThan, // > - GreaterEqual, // >= - LessThan, // < - LessEqual, // <= - NotEqual, // != - Unknown, - Eof - } kind {Kind::Unknown}; - - nonstd::string_view text; - - constexpr Token() = default; - constexpr Token(Kind kind, nonstd::string_view text): kind(kind), text(text) {} - - std::string describe() const { - switch (kind) { - case Kind::Text: - return ""; - case Kind::LineStatementClose: - return ""; - case Kind::Eof: - return ""; - default: - return static_cast(text); - } - } -}; - -} - -#endif // PANTOR_INJA_TOKEN_HPP - -// #include "utils.hpp" -#ifndef PANTOR_INJA_UTILS_HPP -#define PANTOR_INJA_UTILS_HPP - -#include -#include -#include -#include -#include - -// #include "string_view.hpp" - - - -namespace inja { - -inline void inja_throw(const std::string& type, const std::string& message) { - throw std::runtime_error("[inja.exception." + type + "] " + message); -} - -inline std::ifstream open_file_or_throw(const std::string& path) { - std::ifstream file; - file.exceptions(std::ifstream::failbit | std::ifstream::badbit); - try { - file.open(path); - } catch(const std::ios_base::failure& e) { - inja_throw("file_error", "failed accessing file at '" + path + "'"); - } - return file; -} - -namespace string_view { - inline nonstd::string_view slice(nonstd::string_view view, size_t start, size_t end) { - start = std::min(start, view.size()); - end = std::min(std::max(start, end), view.size()); - return view.substr(start, end - start); // StringRef(Data + Start, End - Start); - } - - inline std::pair split(nonstd::string_view view, char Separator) { - size_t idx = view.find(Separator); - if (idx == nonstd::string_view::npos) { - return std::make_pair(view, nonstd::string_view()); - } - return std::make_pair(slice(view, 0, idx), slice(view, idx + 1, nonstd::string_view::npos)); - } - - inline bool starts_with(nonstd::string_view view, nonstd::string_view prefix) { - return (view.size() >= prefix.size() && view.compare(0, prefix.size(), prefix) == 0); - } -} // namespace string - -} // namespace inja - -#endif // PANTOR_INJA_UTILS_HPP - - - -namespace inja { - -/*! - * \brief Class for lexing an inja Template. - */ -class Lexer { - enum class State { - Text, - ExpressionStart, - ExpressionBody, - LineStart, - LineBody, - StatementStart, - StatementBody, - CommentStart, - CommentBody - } m_state; - - const LexerConfig& m_config; - nonstd::string_view m_in; - size_t m_tok_start; - size_t m_pos; - - public: - explicit Lexer(const LexerConfig& config) : m_config(config) {} - - void start(nonstd::string_view in) { - m_in = in; - m_tok_start = 0; - m_pos = 0; - m_state = State::Text; - } - - Token scan() { - m_tok_start = m_pos; - - again: - if (m_tok_start >= m_in.size()) return make_token(Token::Kind::Eof); - - switch (m_state) { - default: - case State::Text: { - // fast-scan to first open character - size_t open_start = m_in.substr(m_pos).find_first_of(m_config.open_chars); - if (open_start == nonstd::string_view::npos) { - // didn't find open, return remaining text as text token - m_pos = m_in.size(); - return make_token(Token::Kind::Text); - } - m_pos += open_start; - - // try to match one of the opening sequences, and get the close - nonstd::string_view open_str = m_in.substr(m_pos); - bool must_lstrip = false; - if (inja::string_view::starts_with(open_str, m_config.expression_open)) { - m_state = State::ExpressionStart; - } else if (inja::string_view::starts_with(open_str, m_config.statement_open)) { - m_state = State::StatementStart; - must_lstrip = m_config.lstrip_blocks; - } else if (inja::string_view::starts_with(open_str, m_config.comment_open)) { - m_state = State::CommentStart; - must_lstrip = m_config.lstrip_blocks; - } else if ((m_pos == 0 || m_in[m_pos - 1] == '\n') && - inja::string_view::starts_with(open_str, m_config.line_statement)) { - m_state = State::LineStart; - } else { - m_pos += 1; // wasn't actually an opening sequence - goto again; - } - - nonstd::string_view text = string_view::slice(m_in, m_tok_start, m_pos); - if (must_lstrip) - text = clear_final_line_if_whitespace(text); - - if (text.empty()) goto again; // don't generate empty token - return Token(Token::Kind::Text, text); - } - case State::ExpressionStart: { - m_state = State::ExpressionBody; - m_pos += m_config.expression_open.size(); - return make_token(Token::Kind::ExpressionOpen); - } - case State::LineStart: { - m_state = State::LineBody; - m_pos += m_config.line_statement.size(); - return make_token(Token::Kind::LineStatementOpen); - } - case State::StatementStart: { - m_state = State::StatementBody; - m_pos += m_config.statement_open.size(); - return make_token(Token::Kind::StatementOpen); - } - case State::CommentStart: { - m_state = State::CommentBody; - m_pos += m_config.comment_open.size(); - return make_token(Token::Kind::CommentOpen); - } - case State::ExpressionBody: - return scan_body(m_config.expression_close, Token::Kind::ExpressionClose); - case State::LineBody: - return scan_body("\n", Token::Kind::LineStatementClose); - case State::StatementBody: - return scan_body(m_config.statement_close, Token::Kind::StatementClose, m_config.trim_blocks); - case State::CommentBody: { - // fast-scan to comment close - size_t end = m_in.substr(m_pos).find(m_config.comment_close); - if (end == nonstd::string_view::npos) { - m_pos = m_in.size(); - return make_token(Token::Kind::Eof); - } - // return the entire comment in the close token - m_state = State::Text; - m_pos += end + m_config.comment_close.size(); - Token tok = make_token(Token::Kind::CommentClose); - if (m_config.trim_blocks) - skip_newline(); - return tok; - } - } - } - - const LexerConfig& get_config() const { return m_config; } - - private: - Token scan_body(nonstd::string_view close, Token::Kind closeKind, bool trim = false) { - again: - // skip whitespace (except for \n as it might be a close) - if (m_tok_start >= m_in.size()) return make_token(Token::Kind::Eof); - char ch = m_in[m_tok_start]; - if (ch == ' ' || ch == '\t' || ch == '\r') { - m_tok_start += 1; - goto again; - } - - // check for close - if (inja::string_view::starts_with(m_in.substr(m_tok_start), close)) { - m_state = State::Text; - m_pos = m_tok_start + close.size(); - Token tok = make_token(closeKind); - if (trim) - skip_newline(); - return tok; - } - - // skip \n - if (ch == '\n') { - m_tok_start += 1; - goto again; - } - - m_pos = m_tok_start + 1; - if (std::isalpha(ch)) return scan_id(); - switch (ch) { - case ',': - return make_token(Token::Kind::Comma); - case ':': - return make_token(Token::Kind::Colon); - case '(': - return make_token(Token::Kind::LeftParen); - case ')': - return make_token(Token::Kind::RightParen); - case '[': - return make_token(Token::Kind::LeftBracket); - case ']': - return make_token(Token::Kind::RightBracket); - case '{': - return make_token(Token::Kind::LeftBrace); - case '}': - return make_token(Token::Kind::RightBrace); - case '>': - if (m_pos < m_in.size() && m_in[m_pos] == '=') { - m_pos += 1; - return make_token(Token::Kind::GreaterEqual); - } - return make_token(Token::Kind::GreaterThan); - case '<': - if (m_pos < m_in.size() && m_in[m_pos] == '=') { - m_pos += 1; - return make_token(Token::Kind::LessEqual); - } - return make_token(Token::Kind::LessThan); - case '=': - if (m_pos < m_in.size() && m_in[m_pos] == '=') { - m_pos += 1; - return make_token(Token::Kind::Equal); - } - return make_token(Token::Kind::Unknown); - case '!': - if (m_pos < m_in.size() && m_in[m_pos] == '=') { - m_pos += 1; - return make_token(Token::Kind::NotEqual); - } - return make_token(Token::Kind::Unknown); - case '\"': - return scan_string(); - case '0': - case '1': - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': - case '8': - case '9': - case '-': - return scan_number(); - case '_': - return scan_id(); - default: - return make_token(Token::Kind::Unknown); - } - } - - Token scan_id() { - for (;;) { - if (m_pos >= m_in.size()) { - break; - } - char ch = m_in[m_pos]; - if (!std::isalnum(ch) && ch != '.' && ch != '/' && ch != '_' && ch != '-') { - break; - } - m_pos += 1; - } - return make_token(Token::Kind::Id); - } - - Token scan_number() { - for (;;) { - if (m_pos >= m_in.size()) { - break; - } - char ch = m_in[m_pos]; - // be very permissive in lexer (we'll catch errors when conversion happens) - if (!std::isdigit(ch) && ch != '.' && ch != 'e' && ch != 'E' && ch != '+' && ch != '-') { - break; - } - m_pos += 1; - } - return make_token(Token::Kind::Number); - } - - Token scan_string() { - bool escape {false}; - for (;;) { - if (m_pos >= m_in.size()) break; - char ch = m_in[m_pos++]; - if (ch == '\\') { - escape = true; - } else if (!escape && ch == m_in[m_tok_start]) { - break; - } else { - escape = false; - } - } - return make_token(Token::Kind::String); - } - - Token make_token(Token::Kind kind) const { - return Token(kind, string_view::slice(m_in, m_tok_start, m_pos)); - } - - void skip_newline() { - if (m_pos < m_in.size()) { - char ch = m_in[m_pos]; - if (ch == '\n') - m_pos += 1; - else if (ch == '\r') { - m_pos += 1; - if (m_pos < m_in.size() && m_in[m_pos] == '\n') - m_pos += 1; - } - } - } - - static nonstd::string_view clear_final_line_if_whitespace(nonstd::string_view text) - { - nonstd::string_view result = text; - while (!result.empty()) { - char ch = result.back(); - if (ch == ' ' || ch == '\t') - result.remove_suffix(1); - else if (ch == '\n' || ch == '\r') - break; - else - return text; - } - return result; - } -}; - -} - -#endif // PANTOR_INJA_LEXER_HPP - -// #include "template.hpp" -#ifndef PANTOR_INJA_TEMPLATE_HPP -#define PANTOR_INJA_TEMPLATE_HPP - -#include -#include -#include - -// #include "bytecode.hpp" - - - -namespace inja { - -/*! - * \brief The main inja Template. - */ -struct Template { - std::vector bytecodes; - std::string content; -}; - -using TemplateStorage = std::map; - -} - -#endif // PANTOR_INJA_TEMPLATE_HPP - -// #include "token.hpp" - -// #include "utils.hpp" - - -#include - - -namespace inja { - -class ParserStatic { - ParserStatic() { - functions.add_builtin("at", 2, Bytecode::Op::At); - functions.add_builtin("default", 2, Bytecode::Op::Default); - functions.add_builtin("divisibleBy", 2, Bytecode::Op::DivisibleBy); - functions.add_builtin("even", 1, Bytecode::Op::Even); - functions.add_builtin("first", 1, Bytecode::Op::First); - functions.add_builtin("float", 1, Bytecode::Op::Float); - functions.add_builtin("int", 1, Bytecode::Op::Int); - functions.add_builtin("last", 1, Bytecode::Op::Last); - functions.add_builtin("length", 1, Bytecode::Op::Length); - functions.add_builtin("lower", 1, Bytecode::Op::Lower); - functions.add_builtin("max", 1, Bytecode::Op::Max); - functions.add_builtin("min", 1, Bytecode::Op::Min); - functions.add_builtin("odd", 1, Bytecode::Op::Odd); - functions.add_builtin("range", 1, Bytecode::Op::Range); - functions.add_builtin("round", 2, Bytecode::Op::Round); - functions.add_builtin("sort", 1, Bytecode::Op::Sort); - functions.add_builtin("upper", 1, Bytecode::Op::Upper); - functions.add_builtin("exists", 1, Bytecode::Op::Exists); - functions.add_builtin("existsIn", 2, Bytecode::Op::ExistsInObject); - functions.add_builtin("isBoolean", 1, Bytecode::Op::IsBoolean); - functions.add_builtin("isNumber", 1, Bytecode::Op::IsNumber); - functions.add_builtin("isInteger", 1, Bytecode::Op::IsInteger); - functions.add_builtin("isFloat", 1, Bytecode::Op::IsFloat); - functions.add_builtin("isObject", 1, Bytecode::Op::IsObject); - functions.add_builtin("isArray", 1, Bytecode::Op::IsArray); - functions.add_builtin("isString", 1, Bytecode::Op::IsString); - } - - public: - ParserStatic(const ParserStatic&) = delete; - ParserStatic& operator=(const ParserStatic&) = delete; - - static const ParserStatic& get_instance() { - static ParserStatic inst; - return inst; - } - - FunctionStorage functions; -}; - -/*! - * \brief Class for parsing an inja Template. - */ -class Parser { - public: - explicit Parser(const ParserConfig& parser_config, const LexerConfig& lexer_config, TemplateStorage& included_templates): m_config(parser_config), m_lexer(lexer_config), m_included_templates(included_templates), m_static(ParserStatic::get_instance()) { } - - bool parse_expression(Template& tmpl) { - if (!parse_expression_and(tmpl)) return false; - if (m_tok.kind != Token::Kind::Id || m_tok.text != static_cast("or")) return true; - get_next_token(); - if (!parse_expression_and(tmpl)) return false; - append_function(tmpl, Bytecode::Op::Or, 2); - return true; - } - - bool parse_expression_and(Template& tmpl) { - if (!parse_expression_not(tmpl)) return false; - if (m_tok.kind != Token::Kind::Id || m_tok.text != static_cast("and")) return true; - get_next_token(); - if (!parse_expression_not(tmpl)) return false; - append_function(tmpl, Bytecode::Op::And, 2); - return true; - } - - bool parse_expression_not(Template& tmpl) { - if (m_tok.kind == Token::Kind::Id && m_tok.text == static_cast("not")) { - get_next_token(); - if (!parse_expression_not(tmpl)) return false; - append_function(tmpl, Bytecode::Op::Not, 1); - return true; - } else { - return parse_expression_comparison(tmpl); - } - } - - bool parse_expression_comparison(Template& tmpl) { - if (!parse_expression_datum(tmpl)) return false; - Bytecode::Op op; - switch (m_tok.kind) { - case Token::Kind::Id: - if (m_tok.text == static_cast("in")) - op = Bytecode::Op::In; - else - return true; - break; - case Token::Kind::Equal: - op = Bytecode::Op::Equal; - break; - case Token::Kind::GreaterThan: - op = Bytecode::Op::Greater; - break; - case Token::Kind::LessThan: - op = Bytecode::Op::Less; - break; - case Token::Kind::LessEqual: - op = Bytecode::Op::LessEqual; - break; - case Token::Kind::GreaterEqual: - op = Bytecode::Op::GreaterEqual; - break; - case Token::Kind::NotEqual: - op = Bytecode::Op::Different; - break; - default: - return true; - } - get_next_token(); - if (!parse_expression_datum(tmpl)) return false; - append_function(tmpl, op, 2); - return true; - } - - bool parse_expression_datum(Template& tmpl) { - nonstd::string_view json_first; - size_t bracket_level = 0; - size_t brace_level = 0; - - for (;;) { - switch (m_tok.kind) { - case Token::Kind::LeftParen: { - get_next_token(); - if (!parse_expression(tmpl)) return false; - if (m_tok.kind != Token::Kind::RightParen) { - inja_throw("parser_error", "unmatched '('"); - } - get_next_token(); - return true; - } - case Token::Kind::Id: - get_peek_token(); - if (m_peek_tok.kind == Token::Kind::LeftParen) { - // function call, parse arguments - Token func_token = m_tok; - get_next_token(); // id - get_next_token(); // leftParen - unsigned int num_args = 0; - if (m_tok.kind == Token::Kind::RightParen) { - // no args - get_next_token(); - } else { - for (;;) { - if (!parse_expression(tmpl)) { - inja_throw("parser_error", "expected expression, got '" + m_tok.describe() + "'"); - } - num_args += 1; - if (m_tok.kind == Token::Kind::RightParen) { - get_next_token(); - break; - } - if (m_tok.kind != Token::Kind::Comma) { - inja_throw("parser_error", "expected ')' or ',', got '" + m_tok.describe() + "'"); - } - get_next_token(); - } - } - - auto op = m_static.functions.find_builtin(func_token.text, num_args); - - if (op != Bytecode::Op::Nop) { - // swap arguments for default(); see comment in RenderTo() - if (op == Bytecode::Op::Default) - std::swap(tmpl.bytecodes.back(), *(tmpl.bytecodes.rbegin() + 1)); - append_function(tmpl, op, num_args); - return true; - } else { - append_callback(tmpl, func_token.text, num_args); - return true; - } - } else if (m_tok.text == static_cast("true") || - m_tok.text == static_cast("false") || - m_tok.text == static_cast("null")) { - // true, false, null are json literals - if (brace_level == 0 && bracket_level == 0) { - json_first = m_tok.text; - goto returnJson; - } - break; - } else { - // normal literal (json read) - tmpl.bytecodes.emplace_back( - Bytecode::Op::Push, m_tok.text, - m_config.notation == ElementNotation::Pointer ? Bytecode::Flag::ValueLookupPointer : Bytecode::Flag::ValueLookupDot); - get_next_token(); - return true; - } - // json passthrough - case Token::Kind::Number: - case Token::Kind::String: - if (brace_level == 0 && bracket_level == 0) { - json_first = m_tok.text; - goto returnJson; - } - break; - case Token::Kind::Comma: - case Token::Kind::Colon: - if (brace_level == 0 && bracket_level == 0) { - inja_throw("parser_error", "unexpected token '" + m_tok.describe() + "'"); - } - break; - case Token::Kind::LeftBracket: - if (brace_level == 0 && bracket_level == 0) { - json_first = m_tok.text; - } - bracket_level += 1; - break; - case Token::Kind::LeftBrace: - if (brace_level == 0 && bracket_level == 0) { - json_first = m_tok.text; - } - brace_level += 1; - break; - case Token::Kind::RightBracket: - if (bracket_level == 0) { - inja_throw("parser_error", "unexpected ']'"); - } - --bracket_level; - if (brace_level == 0 && bracket_level == 0) goto returnJson; - break; - case Token::Kind::RightBrace: - if (brace_level == 0) { - inja_throw("parser_error", "unexpected '}'"); - } - --brace_level; - if (brace_level == 0 && bracket_level == 0) goto returnJson; - break; - default: - if (brace_level != 0) { - inja_throw("parser_error", "unmatched '{'"); - } - if (bracket_level != 0) { - inja_throw("parser_error", "unmatched '['"); - } - return false; - } - - get_next_token(); - } - - returnJson: - // bridge across all intermediate tokens - nonstd::string_view json_text(json_first.data(), m_tok.text.data() - json_first.data() + m_tok.text.size()); - tmpl.bytecodes.emplace_back(Bytecode::Op::Push, json::parse(json_text), Bytecode::Flag::ValueImmediate); - get_next_token(); - return true; - } - - bool parse_statement(Template& tmpl, nonstd::string_view path) { - if (m_tok.kind != Token::Kind::Id) return false; - - if (m_tok.text == static_cast("if")) { - get_next_token(); - - // evaluate expression - if (!parse_expression(tmpl)) return false; - - // start a new if block on if stack - m_if_stack.emplace_back(tmpl.bytecodes.size()); - - // conditional jump; destination will be filled in by else or endif - tmpl.bytecodes.emplace_back(Bytecode::Op::ConditionalJump); - } else if (m_tok.text == static_cast("endif")) { - if (m_if_stack.empty()) { - inja_throw("parser_error", "endif without matching if"); - } - auto& if_data = m_if_stack.back(); - get_next_token(); - - // previous conditional jump jumps here - if (if_data.prev_cond_jump != std::numeric_limits::max()) { - tmpl.bytecodes[if_data.prev_cond_jump].args = tmpl.bytecodes.size(); - } - - // update all previous unconditional jumps to here - for (unsigned int i: if_data.uncond_jumps) { - tmpl.bytecodes[i].args = tmpl.bytecodes.size(); - } - - // pop if stack - m_if_stack.pop_back(); - } else if (m_tok.text == static_cast("else")) { - if (m_if_stack.empty()) - inja_throw("parser_error", "else without matching if"); - auto& if_data = m_if_stack.back(); - get_next_token(); - - // end previous block with unconditional jump to endif; destination will be - // filled in by endif - if_data.uncond_jumps.push_back(tmpl.bytecodes.size()); - tmpl.bytecodes.emplace_back(Bytecode::Op::Jump); - - // previous conditional jump jumps here - tmpl.bytecodes[if_data.prev_cond_jump].args = tmpl.bytecodes.size(); - if_data.prev_cond_jump = std::numeric_limits::max(); - - // chained else if - if (m_tok.kind == Token::Kind::Id && m_tok.text == static_cast("if")) { - get_next_token(); - - // evaluate expression - if (!parse_expression(tmpl)) return false; - - // update "previous jump" - if_data.prev_cond_jump = tmpl.bytecodes.size(); - - // conditional jump; destination will be filled in by else or endif - tmpl.bytecodes.emplace_back(Bytecode::Op::ConditionalJump); - } - } else if (m_tok.text == static_cast("for")) { - get_next_token(); - - // options: for a in arr; for a, b in obj - if (m_tok.kind != Token::Kind::Id) - inja_throw("parser_error", "expected id, got '" + m_tok.describe() + "'"); - Token value_token = m_tok; - get_next_token(); - - Token key_token; - if (m_tok.kind == Token::Kind::Comma) { - get_next_token(); - if (m_tok.kind != Token::Kind::Id) - inja_throw("parser_error", "expected id, got '" + m_tok.describe() + "'"); - key_token = std::move(value_token); - value_token = m_tok; - get_next_token(); - } - - if (m_tok.kind != Token::Kind::Id || m_tok.text != static_cast("in")) - inja_throw("parser_error", - "expected 'in', got '" + m_tok.describe() + "'"); - get_next_token(); - - if (!parse_expression(tmpl)) return false; - - m_loop_stack.push_back(tmpl.bytecodes.size()); - - tmpl.bytecodes.emplace_back(Bytecode::Op::StartLoop); - if (!key_token.text.empty()) { - tmpl.bytecodes.back().value = key_token.text; - } - tmpl.bytecodes.back().str = static_cast(value_token.text); - } else if (m_tok.text == static_cast("endfor")) { - get_next_token(); - if (m_loop_stack.empty()) { - inja_throw("parser_error", "endfor without matching for"); - } - - // update loop with EndLoop index (for empty case) - tmpl.bytecodes[m_loop_stack.back()].args = tmpl.bytecodes.size(); - - tmpl.bytecodes.emplace_back(Bytecode::Op::EndLoop); - tmpl.bytecodes.back().args = m_loop_stack.back() + 1; // loop body - m_loop_stack.pop_back(); - } else if (m_tok.text == static_cast("include")) { - get_next_token(); - - if (m_tok.kind != Token::Kind::String) { - inja_throw("parser_error", "expected string, got '" + m_tok.describe() + "'"); - } - - // build the relative path - json json_name = json::parse(m_tok.text); - std::string pathname = static_cast(path); - pathname += json_name.get_ref(); - if (pathname.compare(0, 2, "./") == 0) { - pathname.erase(0, 2); - } - // sys::path::remove_dots(pathname, true, sys::path::Style::posix); - - if (m_included_templates.find(pathname) == m_included_templates.end()) { - Template include_template = parse_template(pathname); - m_included_templates.emplace(pathname, include_template); - } - - // generate a reference bytecode - tmpl.bytecodes.emplace_back(Bytecode::Op::Include, json(pathname), Bytecode::Flag::ValueImmediate); - - get_next_token(); - } else { - return false; - } - return true; - } - - void append_function(Template& tmpl, Bytecode::Op op, unsigned int num_args) { - // we can merge with back-to-back push - if (!tmpl.bytecodes.empty()) { - Bytecode& last = tmpl.bytecodes.back(); - if (last.op == Bytecode::Op::Push) { - last.op = op; - last.args = num_args; - return; - } - } - - // otherwise just add it to the end - tmpl.bytecodes.emplace_back(op, num_args); - } - - void append_callback(Template& tmpl, nonstd::string_view name, unsigned int num_args) { - // we can merge with back-to-back push value (not lookup) - if (!tmpl.bytecodes.empty()) { - Bytecode& last = tmpl.bytecodes.back(); - if (last.op == Bytecode::Op::Push && - (last.flags & Bytecode::Flag::ValueMask) == Bytecode::Flag::ValueImmediate) { - last.op = Bytecode::Op::Callback; - last.args = num_args; - last.str = static_cast(name); - return; - } - } - - // otherwise just add it to the end - tmpl.bytecodes.emplace_back(Bytecode::Op::Callback, num_args); - tmpl.bytecodes.back().str = static_cast(name); - } - - void parse_into(Template& tmpl, nonstd::string_view path) { - m_lexer.start(tmpl.content); - - for (;;) { - get_next_token(); - switch (m_tok.kind) { - case Token::Kind::Eof: - if (!m_if_stack.empty()) inja_throw("parser_error", "unmatched if"); - if (!m_loop_stack.empty()) inja_throw("parser_error", "unmatched for"); - return; - case Token::Kind::Text: - tmpl.bytecodes.emplace_back(Bytecode::Op::PrintText, m_tok.text, 0u); - break; - case Token::Kind::StatementOpen: - get_next_token(); - if (!parse_statement(tmpl, path)) { - inja_throw("parser_error", "expected statement, got '" + m_tok.describe() + "'"); - } - if (m_tok.kind != Token::Kind::StatementClose) { - inja_throw("parser_error", "expected statement close, got '" + m_tok.describe() + "'"); - } - break; - case Token::Kind::LineStatementOpen: - get_next_token(); - parse_statement(tmpl, path); - if (m_tok.kind != Token::Kind::LineStatementClose && - m_tok.kind != Token::Kind::Eof) { - inja_throw("parser_error", "expected line statement close, got '" + m_tok.describe() + "'"); - } - break; - case Token::Kind::ExpressionOpen: - get_next_token(); - if (!parse_expression(tmpl)) { - inja_throw("parser_error", "expected expression, got '" + m_tok.describe() + "'"); - } - append_function(tmpl, Bytecode::Op::PrintValue, 1); - if (m_tok.kind != Token::Kind::ExpressionClose) { - inja_throw("parser_error", "expected expression close, got '" + m_tok.describe() + "'"); - } - break; - case Token::Kind::CommentOpen: - get_next_token(); - if (m_tok.kind != Token::Kind::CommentClose) { - inja_throw("parser_error", "expected comment close, got '" + m_tok.describe() + "'"); - } - break; - default: - inja_throw("parser_error", "unexpected token '" + m_tok.describe() + "'"); - break; - } - } - } - - Template parse(nonstd::string_view input, nonstd::string_view path) { - Template result; - result.content = static_cast(input); - parse_into(result, path); - return result; - } - - Template parse(nonstd::string_view input) { - return parse(input, "./"); - } - - Template parse_template(nonstd::string_view filename) { - Template result; - result.content = load_file(filename); - - nonstd::string_view path = filename.substr(0, filename.find_last_of("/\\") + 1); - // StringRef path = sys::path::parent_path(filename); - Parser(m_config, m_lexer.get_config(), m_included_templates).parse_into(result, path); - return result; - } - - std::string load_file(nonstd::string_view filename) { - std::ifstream file = open_file_or_throw(static_cast(filename)); - std::string text((std::istreambuf_iterator(file)), std::istreambuf_iterator()); - return text; - } - - private: - const ParserConfig& m_config; - Lexer m_lexer; - Token m_tok; - Token m_peek_tok; - bool m_have_peek_tok {false}; - TemplateStorage& m_included_templates; - const ParserStatic& m_static; - - struct IfData { - unsigned int prev_cond_jump; - std::vector uncond_jumps; - - explicit IfData(unsigned int condJump): prev_cond_jump(condJump) {} - }; - - std::vector m_if_stack; - std::vector m_loop_stack; - - void get_next_token() { - if (m_have_peek_tok) { - m_tok = m_peek_tok; - m_have_peek_tok = false; - } else { - m_tok = m_lexer.scan(); - } - } - - void get_peek_token() { - if (!m_have_peek_tok) { - m_peek_tok = m_lexer.scan(); - m_have_peek_tok = true; - } - } -}; - -} // namespace inja - -#endif // PANTOR_INJA_PARSER_HPP - -// #include "polyfill.hpp" -#ifndef PANTOR_INJA_POLYFILL_HPP -#define PANTOR_INJA_POLYFILL_HPP - - -#if __cplusplus < 201402L - -#include -#include -#include -#include - - -namespace stdinja { - template struct _Unique_if { - typedef std::unique_ptr _Single_object; - }; - - template struct _Unique_if { - typedef std::unique_ptr _Unknown_bound; - }; - - template struct _Unique_if { - typedef void _Known_bound; - }; - - template - typename _Unique_if::_Single_object - make_unique(Args&&... args) { - return std::unique_ptr(new T(std::forward(args)...)); - } - - template - typename _Unique_if::_Unknown_bound - make_unique(size_t n) { - typedef typename std::remove_extent::type U; - return std::unique_ptr(new U[n]()); - } - - template - typename _Unique_if::_Known_bound - make_unique(Args&&...) = delete; -} - -#else - -namespace stdinja = std; - -#endif // memory */ - - -#endif // PANTOR_INJA_POLYFILL_HPP - -// #include "renderer.hpp" -#ifndef PANTOR_INJA_RENDERER_HPP -#define PANTOR_INJA_RENDERER_HPP - -#include -#include -#include -#include -#include - -#include - -// #include "bytecode.hpp" - -// #include "template.hpp" - -// #include "utils.hpp" - - - -namespace inja { - -inline nonstd::string_view convert_dot_to_json_pointer(nonstd::string_view dot, std::string& out) { - out.clear(); - do { - nonstd::string_view part; - std::tie(part, dot) = string_view::split(dot, '.'); - out.push_back('/'); - out.append(part.begin(), part.end()); - } while (!dot.empty()); - return nonstd::string_view(out.data(), out.size()); -} - -/*! - * \brief Class for rendering a Template with data. - */ -class Renderer { - std::vector& get_args(const Bytecode& bc) { - m_tmp_args.clear(); - - bool has_imm = ((bc.flags & Bytecode::Flag::ValueMask) != Bytecode::Flag::ValuePop); - - // get args from stack - unsigned int pop_args = bc.args; - if (has_imm) { - pop_args -= 1; - } - - for (auto i = std::prev(m_stack.end(), pop_args); i != m_stack.end(); i++) { - m_tmp_args.push_back(&(*i)); - } - - // get immediate arg - if (has_imm) { - m_tmp_args.push_back(get_imm(bc)); - } - - return m_tmp_args; - } - - void pop_args(const Bytecode& bc) { - unsigned int popArgs = bc.args; - if ((bc.flags & Bytecode::Flag::ValueMask) != Bytecode::Flag::ValuePop) { - popArgs -= 1; - } - for (unsigned int i = 0; i < popArgs; ++i) { - m_stack.pop_back(); - } - } - - const json* get_imm(const Bytecode& bc) { - std::string ptr_buffer; - nonstd::string_view ptr; - switch (bc.flags & Bytecode::Flag::ValueMask) { - case Bytecode::Flag::ValuePop: - return nullptr; - case Bytecode::Flag::ValueImmediate: - return &bc.value; - case Bytecode::Flag::ValueLookupDot: - ptr = convert_dot_to_json_pointer(bc.str, ptr_buffer); - break; - case Bytecode::Flag::ValueLookupPointer: - ptr_buffer += '/'; - ptr_buffer += bc.str; - ptr = ptr_buffer; - break; - } - try { - return &m_data->at(json::json_pointer(ptr.data())); - } catch (std::exception&) { - // try to evaluate as a no-argument callback - if (auto callback = m_callbacks.find_callback(bc.str, 0)) { - std::vector arguments {}; - m_tmp_val = callback(arguments); - return &m_tmp_val; - } - inja_throw("render_error", "variable '" + static_cast(bc.str) + "' not found"); - return nullptr; - } - } - - bool truthy(const json& var) const { - if (var.empty()) { - return false; - } else if (var.is_number()) { - return (var != 0); - } else if (var.is_string()) { - return !var.empty(); - } - - try { - return var.get(); - } catch (json::type_error& e) { - inja_throw("json_error", e.what()); - throw; - } - } - - void update_loop_data() { - LoopLevel& level = m_loop_stack.back(); - - if (level.loop_type == LoopLevel::Type::Array) { - level.data[static_cast(level.value_name)] = level.values.at(level.index); // *level.it; - auto& loopData = level.data["loop"]; - loopData["index"] = level.index; - loopData["index1"] = level.index + 1; - loopData["is_first"] = (level.index == 0); - loopData["is_last"] = (level.index == level.size - 1); - } else { - level.data[static_cast(level.key_name)] = level.map_it->first; - level.data[static_cast(level.value_name)] = *level.map_it->second; - } - } - - const TemplateStorage& m_included_templates; - const FunctionStorage& m_callbacks; - - std::vector m_stack; - - - struct LoopLevel { - enum class Type { Map, Array }; - - Type loop_type; - nonstd::string_view key_name; // variable name for keys - nonstd::string_view value_name; // variable name for values - json data; // data with loop info added - - json values; // values to iterate over - - // loop over list - size_t index; // current list index - size_t size; // length of list - - // loop over map - using KeyValue = std::pair; - using MapValues = std::vector; - MapValues map_values; // values to iterate over - MapValues::iterator map_it; // iterator over values - - }; - - std::vector m_loop_stack; - const json* m_data; - - std::vector m_tmp_args; - json m_tmp_val; - - - public: - Renderer(const TemplateStorage& included_templates, const FunctionStorage& callbacks): m_included_templates(included_templates), m_callbacks(callbacks) { - m_stack.reserve(16); - m_tmp_args.reserve(4); - m_loop_stack.reserve(16); - } - - void render_to(std::ostream& os, const Template& tmpl, const json& data) { - m_data = &data; - - for (size_t i = 0; i < tmpl.bytecodes.size(); ++i) { - const auto& bc = tmpl.bytecodes[i]; - - switch (bc.op) { - case Bytecode::Op::Nop: { - break; - } - case Bytecode::Op::PrintText: { - os << bc.str; - break; - } - case Bytecode::Op::PrintValue: { - const json& val = *get_args(bc)[0]; - if (val.is_string()) { - os << val.get_ref(); - } else { - os << val.dump(); - } - pop_args(bc); - break; - } - case Bytecode::Op::Push: { - m_stack.emplace_back(*get_imm(bc)); - break; - } - case Bytecode::Op::Upper: { - auto result = get_args(bc)[0]->get(); - std::transform(result.begin(), result.end(), result.begin(), ::toupper); - pop_args(bc); - m_stack.emplace_back(std::move(result)); - break; - } - case Bytecode::Op::Lower: { - auto result = get_args(bc)[0]->get(); - std::transform(result.begin(), result.end(), result.begin(), ::tolower); - pop_args(bc); - m_stack.emplace_back(std::move(result)); - break; - } - case Bytecode::Op::Range: { - int number = get_args(bc)[0]->get(); - std::vector result(number); - std::iota(std::begin(result), std::end(result), 0); - pop_args(bc); - m_stack.emplace_back(std::move(result)); - break; - } - case Bytecode::Op::Length: { - const json& val = *get_args(bc)[0]; - - int result; - if (val.is_string()) { - result = val.get_ref().length(); - } else { - result = val.size(); - } - - pop_args(bc); - m_stack.emplace_back(result); - break; - } - case Bytecode::Op::Sort: { - auto result = get_args(bc)[0]->get>(); - std::sort(result.begin(), result.end()); - pop_args(bc); - m_stack.emplace_back(std::move(result)); - break; - } - case Bytecode::Op::At: { - auto args = get_args(bc); - auto result = args[0]->at(args[1]->get()); - pop_args(bc); - m_stack.emplace_back(result); - break; - } - case Bytecode::Op::First: { - auto result = get_args(bc)[0]->front(); - pop_args(bc); - m_stack.emplace_back(result); - break; - } - case Bytecode::Op::Last: { - auto result = get_args(bc)[0]->back(); - pop_args(bc); - m_stack.emplace_back(result); - break; - } - case Bytecode::Op::Round: { - auto args = get_args(bc); - double number = args[0]->get(); - int precision = args[1]->get(); - pop_args(bc); - m_stack.emplace_back(std::round(number * std::pow(10.0, precision)) / std::pow(10.0, precision)); - break; - } - case Bytecode::Op::DivisibleBy: { - auto args = get_args(bc); - int number = args[0]->get(); - int divisor = args[1]->get(); - pop_args(bc); - m_stack.emplace_back((divisor != 0) && (number % divisor == 0)); - break; - } - case Bytecode::Op::Odd: { - int number = get_args(bc)[0]->get(); - pop_args(bc); - m_stack.emplace_back(number % 2 != 0); - break; - } - case Bytecode::Op::Even: { - int number = get_args(bc)[0]->get(); - pop_args(bc); - m_stack.emplace_back(number % 2 == 0); - break; - } - case Bytecode::Op::Max: { - auto args = get_args(bc); - auto result = *std::max_element(args[0]->begin(), args[0]->end()); - pop_args(bc); - m_stack.emplace_back(std::move(result)); - break; - } - case Bytecode::Op::Min: { - auto args = get_args(bc); - auto result = *std::min_element(args[0]->begin(), args[0]->end()); - pop_args(bc); - m_stack.emplace_back(std::move(result)); - break; - } - case Bytecode::Op::Not: { - bool result = !truthy(*get_args(bc)[0]); - pop_args(bc); - m_stack.emplace_back(result); - break; - } - case Bytecode::Op::And: { - auto args = get_args(bc); - bool result = truthy(*args[0]) && truthy(*args[1]); - pop_args(bc); - m_stack.emplace_back(result); - break; - } - case Bytecode::Op::Or: { - auto args = get_args(bc); - bool result = truthy(*args[0]) || truthy(*args[1]); - pop_args(bc); - m_stack.emplace_back(result); - break; - } - case Bytecode::Op::In: { - auto args = get_args(bc); - bool result = std::find(args[1]->begin(), args[1]->end(), *args[0]) != - args[1]->end(); - pop_args(bc); - m_stack.emplace_back(result); - break; - } - case Bytecode::Op::Equal: { - auto args = get_args(bc); - bool result = (*args[0] == *args[1]); - pop_args(bc); - m_stack.emplace_back(result); - break; - } - case Bytecode::Op::Greater: { - auto args = get_args(bc); - bool result = (*args[0] > *args[1]); - pop_args(bc); - m_stack.emplace_back(result); - break; - } - case Bytecode::Op::Less: { - auto args = get_args(bc); - bool result = (*args[0] < *args[1]); - pop_args(bc); - m_stack.emplace_back(result); - break; - } - case Bytecode::Op::GreaterEqual: { - auto args = get_args(bc); - bool result = (*args[0] >= *args[1]); - pop_args(bc); - m_stack.emplace_back(result); - break; - } - case Bytecode::Op::LessEqual: { - auto args = get_args(bc); - bool result = (*args[0] <= *args[1]); - pop_args(bc); - m_stack.emplace_back(result); - break; - } - case Bytecode::Op::Different: { - auto args = get_args(bc); - bool result = (*args[0] != *args[1]); - pop_args(bc); - m_stack.emplace_back(result); - break; - } - case Bytecode::Op::Float: { - double result = - std::stod(get_args(bc)[0]->get_ref()); - pop_args(bc); - m_stack.emplace_back(result); - break; - } - case Bytecode::Op::Int: { - int result = std::stoi(get_args(bc)[0]->get_ref()); - pop_args(bc); - m_stack.emplace_back(result); - break; - } - case Bytecode::Op::Exists: { - auto&& name = get_args(bc)[0]->get_ref(); - bool result = (data.find(name) != data.end()); - pop_args(bc); - m_stack.emplace_back(result); - break; - } - case Bytecode::Op::ExistsInObject: { - auto args = get_args(bc); - auto&& name = args[1]->get_ref(); - bool result = (args[0]->find(name) != args[0]->end()); - pop_args(bc); - m_stack.emplace_back(result); - break; - } - case Bytecode::Op::IsBoolean: { - bool result = get_args(bc)[0]->is_boolean(); - pop_args(bc); - m_stack.emplace_back(result); - break; - } - case Bytecode::Op::IsNumber: { - bool result = get_args(bc)[0]->is_number(); - pop_args(bc); - m_stack.emplace_back(result); - break; - } - case Bytecode::Op::IsInteger: { - bool result = get_args(bc)[0]->is_number_integer(); - pop_args(bc); - m_stack.emplace_back(result); - break; - } - case Bytecode::Op::IsFloat: { - bool result = get_args(bc)[0]->is_number_float(); - pop_args(bc); - m_stack.emplace_back(result); - break; - } - case Bytecode::Op::IsObject: { - bool result = get_args(bc)[0]->is_object(); - pop_args(bc); - m_stack.emplace_back(result); - break; - } - case Bytecode::Op::IsArray: { - bool result = get_args(bc)[0]->is_array(); - pop_args(bc); - m_stack.emplace_back(result); - break; - } - case Bytecode::Op::IsString: { - bool result = get_args(bc)[0]->is_string(); - pop_args(bc); - m_stack.emplace_back(result); - break; - } - case Bytecode::Op::Default: { - // default needs to be a bit "magic"; we can't evaluate the first - // argument during the push operation, so we swap the arguments during - // the parse phase so the second argument is pushed on the stack and - // the first argument is in the immediate - try { - const json* imm = get_imm(bc); - // if no exception was raised, replace the stack value with it - m_stack.back() = *imm; - } catch (std::exception&) { - // couldn't read immediate, just leave the stack as is - } - break; - } - case Bytecode::Op::Include: - Renderer(m_included_templates, m_callbacks).render_to(os, m_included_templates.find(get_imm(bc)->get_ref())->second, *m_data); - break; - case Bytecode::Op::Callback: { - auto callback = m_callbacks.find_callback(bc.str, bc.args); - if (!callback) { - inja_throw("render_error", "function '" + static_cast(bc.str) + "' (" + std::to_string(static_cast(bc.args)) + ") not found"); - } - json result = callback(get_args(bc)); - pop_args(bc); - m_stack.emplace_back(std::move(result)); - break; - } - case Bytecode::Op::Jump: { - i = bc.args - 1; // -1 due to ++i in loop - break; - } - case Bytecode::Op::ConditionalJump: { - if (!truthy(m_stack.back())) { - i = bc.args - 1; // -1 due to ++i in loop - } - m_stack.pop_back(); - break; - } - case Bytecode::Op::StartLoop: { - // jump past loop body if empty - if (m_stack.back().empty()) { - m_stack.pop_back(); - i = bc.args; // ++i in loop will take it past EndLoop - break; - } - - m_loop_stack.emplace_back(); - LoopLevel& level = m_loop_stack.back(); - level.value_name = bc.str; - level.values = std::move(m_stack.back()); - level.data = (*m_data); - m_stack.pop_back(); - - if (bc.value.is_string()) { - // map iterator - if (!level.values.is_object()) { - m_loop_stack.pop_back(); - inja_throw("render_error", "for key, value requires object"); - } - level.loop_type = LoopLevel::Type::Map; - level.key_name = bc.value.get_ref(); - - // sort by key - for (auto it = level.values.begin(), end = level.values.end(); it != end; ++it) { - level.map_values.emplace_back(it.key(), &it.value()); - } - std::sort(level.map_values.begin(), level.map_values.end(), [](const LoopLevel::KeyValue& a, const LoopLevel::KeyValue& b) { return a.first < b.first; }); - level.map_it = level.map_values.begin(); - } else { - if (!level.values.is_array()) { - m_loop_stack.pop_back(); - inja_throw("render_error", "type must be array"); - } - - // list iterator - level.loop_type = LoopLevel::Type::Array; - level.index = 0; - level.size = level.values.size(); - } - - // provide parent access in nested loop - auto parent_loop_it = level.data.find("loop"); - if (parent_loop_it != level.data.end()) { - json loop_copy = *parent_loop_it; - (*parent_loop_it)["parent"] = std::move(loop_copy); - } - - // set "current" data to loop data - m_data = &level.data; - update_loop_data(); - break; - } - case Bytecode::Op::EndLoop: { - if (m_loop_stack.empty()) { - inja_throw("render_error", "unexpected state in renderer"); - } - LoopLevel& level = m_loop_stack.back(); - - bool done; - if (level.loop_type == LoopLevel::Type::Array) { - level.index += 1; - done = (level.index == level.values.size()); - } else { - level.map_it += 1; - done = (level.map_it == level.map_values.end()); - } - - if (done) { - m_loop_stack.pop_back(); - // set "current" data to outer loop data or main data as appropriate - if (!m_loop_stack.empty()) { - m_data = &m_loop_stack.back().data; - } else { - m_data = &data; - } - break; - } - - update_loop_data(); - - // jump back to start of loop - i = bc.args - 1; // -1 due to ++i in loop - break; - } - default: { - inja_throw("render_error", "unknown op in renderer: " + std::to_string(static_cast(bc.op))); - } - } - } - } -}; - -} // namespace inja - -#endif // PANTOR_INJA_RENDERER_HPP - -// #include "string_view.hpp" - -// #include "template.hpp" - -// #include "utils.hpp" - - - -namespace inja { - -using namespace nlohmann; - -/*! - * \brief Class for changing the configuration. - */ -class Environment { - class Impl { - public: - std::string input_path; - std::string output_path; - - LexerConfig lexer_config; - ParserConfig parser_config; - - FunctionStorage callbacks; - TemplateStorage included_templates; - }; - - std::unique_ptr m_impl; - - public: - Environment(): Environment("") { } - - explicit Environment(const std::string& global_path): m_impl(stdinja::make_unique()) { - m_impl->input_path = global_path; - m_impl->output_path = global_path; - } - - explicit Environment(const std::string& input_path, const std::string& output_path): m_impl(stdinja::make_unique()) { - m_impl->input_path = input_path; - m_impl->output_path = output_path; - } - - /// Sets the opener and closer for template statements - void set_statement(const std::string& open, const std::string& close) { - m_impl->lexer_config.statement_open = open; - m_impl->lexer_config.statement_close = close; - m_impl->lexer_config.update_open_chars(); - } - - /// Sets the opener for template line statements - void set_line_statement(const std::string& open) { - m_impl->lexer_config.line_statement = open; - m_impl->lexer_config.update_open_chars(); - } - - /// Sets the opener and closer for template expressions - void set_expression(const std::string& open, const std::string& close) { - m_impl->lexer_config.expression_open = open; - m_impl->lexer_config.expression_close = close; - m_impl->lexer_config.update_open_chars(); - } - - /// Sets the opener and closer for template comments - void set_comment(const std::string& open, const std::string& close) { - m_impl->lexer_config.comment_open = open; - m_impl->lexer_config.comment_close = close; - m_impl->lexer_config.update_open_chars(); - } - - /// Sets whether to remove the first newline after a block - void set_trim_blocks(bool trim_blocks) { - m_impl->lexer_config.trim_blocks = trim_blocks; - } - - /// Sets whether to strip the spaces and tabs from the start of a line to a block - void set_lstrip_blocks(bool lstrip_blocks) { - m_impl->lexer_config.lstrip_blocks = lstrip_blocks; - } - - /// Sets the element notation syntax - void set_element_notation(ElementNotation notation) { - m_impl->parser_config.notation = notation; - } - - - Template parse(nonstd::string_view input) { - Parser parser(m_impl->parser_config, m_impl->lexer_config, m_impl->included_templates); - return parser.parse(input); - } - - Template parse_template(const std::string& filename) { - Parser parser(m_impl->parser_config, m_impl->lexer_config, m_impl->included_templates); - return parser.parse_template(m_impl->input_path + static_cast(filename)); - } - - std::string render(nonstd::string_view input, const json& data) { - return render(parse(input), data); - } - - std::string render(const Template& tmpl, const json& data) { - std::stringstream os; - render_to(os, tmpl, data); - return os.str(); - } - - std::string render_file(const std::string& filename, const json& data) { - return render(parse_template(filename), data); - } - - std::string render_file_with_json_file(const std::string& filename, const std::string& filename_data) { - const json data = load_json(filename_data); - return render_file(filename, data); - } - - void write(const std::string& filename, const json& data, const std::string& filename_out) { - std::ofstream file(m_impl->output_path + filename_out); - file << render_file(filename, data); - file.close(); - } - - void write(const Template& temp, const json& data, const std::string& filename_out) { - std::ofstream file(m_impl->output_path + filename_out); - file << render(temp, data); - file.close(); - } - - void write_with_json_file(const std::string& filename, const std::string& filename_data, const std::string& filename_out) { - const json data = load_json(filename_data); - write(filename, data, filename_out); - } - - void write_with_json_file(const Template& temp, const std::string& filename_data, const std::string& filename_out) { - const json data = load_json(filename_data); - write(temp, data, filename_out); - } - - std::ostream& render_to(std::ostream& os, const Template& tmpl, const json& data) { - Renderer(m_impl->included_templates, m_impl->callbacks).render_to(os, tmpl, data); - return os; - } - - std::string load_file(const std::string& filename) { - Parser parser(m_impl->parser_config, m_impl->lexer_config, m_impl->included_templates); - return parser.load_file(m_impl->input_path + filename); - } - - json load_json(const std::string& filename) { - std::ifstream file = open_file_or_throw(m_impl->input_path + filename); - json j; - file >> j; - return j; - } - - void add_callback(const std::string& name, unsigned int numArgs, const CallbackFunction& callback) { - m_impl->callbacks.add_callback(name, numArgs, callback); - } - - /** Includes a template with a given name into the environment. - * Then, a template can be rendered in another template using the - * include "" syntax. - */ - void include_template(const std::string& name, const Template& tmpl) { - m_impl->included_templates[name] = tmpl; - } -}; - -/*! -@brief render with default settings to a string -*/ -inline std::string render(nonstd::string_view input, const json& data) { - return Environment().render(input, data); -} - -/*! -@brief render with default settings to the given output stream -*/ -inline void render_to(std::ostream& os, nonstd::string_view input, const json& data) { - Environment env; - env.render_to(os, env.parse(input), data); -} - -} - -#endif // PANTOR_INJA_ENVIRONMENT_HPP - -// #include "string_view.hpp" - -// #include "template.hpp" - -// #include "parser.hpp" - -// #include "renderer.hpp" - - - -#endif // PANTOR_INJA_HPP +// MIT License + +// Copyright (c) 2018 lbersch + +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: + +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. + +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. + + +// --- + + +// Copyright (c) 2009-2018 FIRST +// All rights reserved. + +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are met: +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// * Neither the name of the FIRST nor the +// names of its contributors may be used to endorse or promote products +// derived from this software without specific prior written permission. + +// THIS SOFTWARE IS PROVIDED BY FIRST AND CONTRIBUTORS``AS IS'' AND ANY +// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +// WARRANTIES OF MERCHANTABILITY NONINFRINGEMENT AND FITNESS FOR A PARTICULAR +// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL FIRST OR CONTRIBUTORS BE LIABLE FOR +// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +// ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +#ifndef PANTOR_INJA_HPP +#define PANTOR_INJA_HPP + +#include +#include +#include +#include +#include +#include +#include + +#include + +// #include "environment.hpp" +#ifndef PANTOR_INJA_ENVIRONMENT_HPP +#define PANTOR_INJA_ENVIRONMENT_HPP + +#include +#include +#include +#include + +#include + +// #include "config.hpp" +#ifndef PANTOR_INJA_CONFIG_HPP +#define PANTOR_INJA_CONFIG_HPP + +#include +#include + +// #include "string_view.hpp" +// Copyright 2017-2019 by Martin Moene +// +// string-view lite, a C++17-like string_view for C++98 and later. +// For more information see https://github.com/martinmoene/string-view-lite +// +// Distributed under the Boost Software License, Version 1.0. +// (See accompanying file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt) + + + +#ifndef NONSTD_SV_LITE_H_INCLUDED +#define NONSTD_SV_LITE_H_INCLUDED + +#define string_view_lite_MAJOR 1 +#define string_view_lite_MINOR 1 +#define string_view_lite_PATCH 0 + +#define string_view_lite_VERSION nssv_STRINGIFY(string_view_lite_MAJOR) "." nssv_STRINGIFY(string_view_lite_MINOR) "." nssv_STRINGIFY(string_view_lite_PATCH) + +#define nssv_STRINGIFY( x ) nssv_STRINGIFY_( x ) +#define nssv_STRINGIFY_( x ) #x + +// string-view lite configuration: + +#define nssv_STRING_VIEW_DEFAULT 0 +#define nssv_STRING_VIEW_NONSTD 1 +#define nssv_STRING_VIEW_STD 2 + +#if !defined( nssv_CONFIG_SELECT_STRING_VIEW ) +# define nssv_CONFIG_SELECT_STRING_VIEW ( nssv_HAVE_STD_STRING_VIEW ? nssv_STRING_VIEW_STD : nssv_STRING_VIEW_NONSTD ) +#endif + +#if defined( nssv_CONFIG_SELECT_STD_STRING_VIEW ) || defined( nssv_CONFIG_SELECT_NONSTD_STRING_VIEW ) +# error nssv_CONFIG_SELECT_STD_STRING_VIEW and nssv_CONFIG_SELECT_NONSTD_STRING_VIEW are deprecated and removed, please use nssv_CONFIG_SELECT_STRING_VIEW=nssv_STRING_VIEW_... +#endif + +#ifndef nssv_CONFIG_STD_SV_OPERATOR +# define nssv_CONFIG_STD_SV_OPERATOR 0 +#endif + +#ifndef nssv_CONFIG_USR_SV_OPERATOR +# define nssv_CONFIG_USR_SV_OPERATOR 1 +#endif + +#ifdef nssv_CONFIG_CONVERSION_STD_STRING +# define nssv_CONFIG_CONVERSION_STD_STRING_CLASS_METHODS nssv_CONFIG_CONVERSION_STD_STRING +# define nssv_CONFIG_CONVERSION_STD_STRING_FREE_FUNCTIONS nssv_CONFIG_CONVERSION_STD_STRING +#endif + +#ifndef nssv_CONFIG_CONVERSION_STD_STRING_CLASS_METHODS +# define nssv_CONFIG_CONVERSION_STD_STRING_CLASS_METHODS 1 +#endif + +#ifndef nssv_CONFIG_CONVERSION_STD_STRING_FREE_FUNCTIONS +# define nssv_CONFIG_CONVERSION_STD_STRING_FREE_FUNCTIONS 1 +#endif + +// Control presence of exception handling (try and auto discover): + +#ifndef nssv_CONFIG_NO_EXCEPTIONS +# if defined(__cpp_exceptions) || defined(__EXCEPTIONS) || defined(_CPPUNWIND) +# define nssv_CONFIG_NO_EXCEPTIONS 0 +# else +# define nssv_CONFIG_NO_EXCEPTIONS 1 +# endif +#endif + +// C++ language version detection (C++20 is speculative): +// Note: VC14.0/1900 (VS2015) lacks too much from C++14. + +#ifndef nssv_CPLUSPLUS +# if defined(_MSVC_LANG ) && !defined(__clang__) +# define nssv_CPLUSPLUS (_MSC_VER == 1900 ? 201103L : _MSVC_LANG ) +# else +# define nssv_CPLUSPLUS __cplusplus +# endif +#endif + +#define nssv_CPP98_OR_GREATER ( nssv_CPLUSPLUS >= 199711L ) +#define nssv_CPP11_OR_GREATER ( nssv_CPLUSPLUS >= 201103L ) +#define nssv_CPP11_OR_GREATER_ ( nssv_CPLUSPLUS >= 201103L ) +#define nssv_CPP14_OR_GREATER ( nssv_CPLUSPLUS >= 201402L ) +#define nssv_CPP17_OR_GREATER ( nssv_CPLUSPLUS >= 201703L ) +#define nssv_CPP20_OR_GREATER ( nssv_CPLUSPLUS >= 202000L ) + +// use C++17 std::string_view if available and requested: + +#if nssv_CPP17_OR_GREATER && defined(__has_include ) +# if __has_include( ) +# define nssv_HAVE_STD_STRING_VIEW 1 +# else +# define nssv_HAVE_STD_STRING_VIEW 0 +# endif +#else +# define nssv_HAVE_STD_STRING_VIEW 0 +#endif + +#define nssv_USES_STD_STRING_VIEW ( (nssv_CONFIG_SELECT_STRING_VIEW == nssv_STRING_VIEW_STD) || ((nssv_CONFIG_SELECT_STRING_VIEW == nssv_STRING_VIEW_DEFAULT) && nssv_HAVE_STD_STRING_VIEW) ) + +#define nssv_HAVE_STARTS_WITH ( nssv_CPP20_OR_GREATER || !nssv_USES_STD_STRING_VIEW ) +#define nssv_HAVE_ENDS_WITH nssv_HAVE_STARTS_WITH + +// +// Use C++17 std::string_view: +// + +#if nssv_USES_STD_STRING_VIEW + +#include + +// Extensions for std::string: + +#if nssv_CONFIG_CONVERSION_STD_STRING_FREE_FUNCTIONS + +namespace nonstd { + +template< class CharT, class Traits, class Allocator = std::allocator > +std::basic_string +to_string( std::basic_string_view v, Allocator const & a = Allocator() ) +{ + return std::basic_string( v.begin(), v.end(), a ); +} + +template< class CharT, class Traits, class Allocator > +std::basic_string_view +to_string_view( std::basic_string const & s ) +{ + return std::basic_string_view( s.data(), s.size() ); +} + +// Literal operators sv and _sv: + +#if nssv_CONFIG_STD_SV_OPERATOR + +using namespace std::literals::string_view_literals; + +#endif + +#if nssv_CONFIG_USR_SV_OPERATOR + +inline namespace literals { +inline namespace string_view_literals { + + +constexpr std::string_view operator "" _sv( const char* str, size_t len ) noexcept // (1) +{ + return std::string_view{ str, len }; +} + +constexpr std::u16string_view operator "" _sv( const char16_t* str, size_t len ) noexcept // (2) +{ + return std::u16string_view{ str, len }; +} + +constexpr std::u32string_view operator "" _sv( const char32_t* str, size_t len ) noexcept // (3) +{ + return std::u32string_view{ str, len }; +} + +constexpr std::wstring_view operator "" _sv( const wchar_t* str, size_t len ) noexcept // (4) +{ + return std::wstring_view{ str, len }; +} + +}} // namespace literals::string_view_literals + +#endif // nssv_CONFIG_USR_SV_OPERATOR + +} // namespace nonstd + +#endif // nssv_CONFIG_CONVERSION_STD_STRING_FREE_FUNCTIONS + +namespace nonstd { + +using std::string_view; +using std::wstring_view; +using std::u16string_view; +using std::u32string_view; +using std::basic_string_view; + +// literal "sv" and "_sv", see above + +using std::operator==; +using std::operator!=; +using std::operator<; +using std::operator<=; +using std::operator>; +using std::operator>=; + +using std::operator<<; + +} // namespace nonstd + +#else // nssv_HAVE_STD_STRING_VIEW + +// +// Before C++17: use string_view lite: +// + +// Compiler versions: +// +// MSVC++ 6.0 _MSC_VER == 1200 (Visual Studio 6.0) +// MSVC++ 7.0 _MSC_VER == 1300 (Visual Studio .NET 2002) +// MSVC++ 7.1 _MSC_VER == 1310 (Visual Studio .NET 2003) +// MSVC++ 8.0 _MSC_VER == 1400 (Visual Studio 2005) +// MSVC++ 9.0 _MSC_VER == 1500 (Visual Studio 2008) +// MSVC++ 10.0 _MSC_VER == 1600 (Visual Studio 2010) +// MSVC++ 11.0 _MSC_VER == 1700 (Visual Studio 2012) +// MSVC++ 12.0 _MSC_VER == 1800 (Visual Studio 2013) +// MSVC++ 14.0 _MSC_VER == 1900 (Visual Studio 2015) +// MSVC++ 14.1 _MSC_VER >= 1910 (Visual Studio 2017) + +#if defined(_MSC_VER ) && !defined(__clang__) +# define nssv_COMPILER_MSVC_VER (_MSC_VER ) +# define nssv_COMPILER_MSVC_VERSION (_MSC_VER / 10 - 10 * ( 5 + (_MSC_VER < 1900 ) ) ) +#else +# define nssv_COMPILER_MSVC_VER 0 +# define nssv_COMPILER_MSVC_VERSION 0 +#endif + +#define nssv_COMPILER_VERSION( major, minor, patch ) (10 * ( 10 * major + minor) + patch) + +#if defined(__clang__) +# define nssv_COMPILER_CLANG_VERSION nssv_COMPILER_VERSION(__clang_major__, __clang_minor__, __clang_patchlevel__) +#else +# define nssv_COMPILER_CLANG_VERSION 0 +#endif + +#if defined(__GNUC__) && !defined(__clang__) +# define nssv_COMPILER_GNUC_VERSION nssv_COMPILER_VERSION(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__) +#else +# define nssv_COMPILER_GNUC_VERSION 0 +#endif + +// half-open range [lo..hi): +#define nssv_BETWEEN( v, lo, hi ) ( (lo) <= (v) && (v) < (hi) ) + +// Presence of language and library features: + +#ifdef _HAS_CPP0X +# define nssv_HAS_CPP0X _HAS_CPP0X +#else +# define nssv_HAS_CPP0X 0 +#endif + +// Unless defined otherwise below, consider VC14 as C++11 for variant-lite: + +#if nssv_COMPILER_MSVC_VER >= 1900 +# undef nssv_CPP11_OR_GREATER +# define nssv_CPP11_OR_GREATER 1 +#endif + +#define nssv_CPP11_90 (nssv_CPP11_OR_GREATER_ || nssv_COMPILER_MSVC_VER >= 1500) +#define nssv_CPP11_100 (nssv_CPP11_OR_GREATER_ || nssv_COMPILER_MSVC_VER >= 1600) +#define nssv_CPP11_110 (nssv_CPP11_OR_GREATER_ || nssv_COMPILER_MSVC_VER >= 1700) +#define nssv_CPP11_120 (nssv_CPP11_OR_GREATER_ || nssv_COMPILER_MSVC_VER >= 1800) +#define nssv_CPP11_140 (nssv_CPP11_OR_GREATER_ || nssv_COMPILER_MSVC_VER >= 1900) +#define nssv_CPP11_141 (nssv_CPP11_OR_GREATER_ || nssv_COMPILER_MSVC_VER >= 1910) + +#define nssv_CPP14_000 (nssv_CPP14_OR_GREATER) +#define nssv_CPP17_000 (nssv_CPP17_OR_GREATER) + +// Presence of C++11 language features: + +#define nssv_HAVE_CONSTEXPR_11 nssv_CPP11_140 +#define nssv_HAVE_EXPLICIT_CONVERSION nssv_CPP11_140 +#define nssv_HAVE_INLINE_NAMESPACE nssv_CPP11_140 +#define nssv_HAVE_NOEXCEPT nssv_CPP11_140 +#define nssv_HAVE_NULLPTR nssv_CPP11_100 +#define nssv_HAVE_REF_QUALIFIER nssv_CPP11_140 +#define nssv_HAVE_UNICODE_LITERALS nssv_CPP11_140 +#define nssv_HAVE_USER_DEFINED_LITERALS nssv_CPP11_140 +#define nssv_HAVE_WCHAR16_T nssv_CPP11_100 +#define nssv_HAVE_WCHAR32_T nssv_CPP11_100 + +#if ! ( ( nssv_CPP11 && nssv_COMPILER_CLANG_VERSION ) || nssv_BETWEEN( nssv_COMPILER_CLANG_VERSION, 300, 400 ) ) +# define nssv_HAVE_STD_DEFINED_LITERALS nssv_CPP11_140 +#endif + +// Presence of C++14 language features: + +#define nssv_HAVE_CONSTEXPR_14 nssv_CPP14_000 + +// Presence of C++17 language features: + +#define nssv_HAVE_NODISCARD nssv_CPP17_000 + +// Presence of C++ library features: + +#define nssv_HAVE_STD_HASH nssv_CPP11_120 + +// C++ feature usage: + +#if nssv_HAVE_CONSTEXPR_11 +# define nssv_constexpr constexpr +#else +# define nssv_constexpr /*constexpr*/ +#endif + +#if nssv_HAVE_CONSTEXPR_14 +# define nssv_constexpr14 constexpr +#else +# define nssv_constexpr14 /*constexpr*/ +#endif + +#if nssv_HAVE_EXPLICIT_CONVERSION +# define nssv_explicit explicit +#else +# define nssv_explicit /*explicit*/ +#endif + +#if nssv_HAVE_INLINE_NAMESPACE +# define nssv_inline_ns inline +#else +# define nssv_inline_ns /*inline*/ +#endif + +#if nssv_HAVE_NOEXCEPT +# define nssv_noexcept noexcept +#else +# define nssv_noexcept /*noexcept*/ +#endif + +//#if nssv_HAVE_REF_QUALIFIER +//# define nssv_ref_qual & +//# define nssv_refref_qual && +//#else +//# define nssv_ref_qual /*&*/ +//# define nssv_refref_qual /*&&*/ +//#endif + +#if nssv_HAVE_NULLPTR +# define nssv_nullptr nullptr +#else +# define nssv_nullptr NULL +#endif + +#if nssv_HAVE_NODISCARD +# define nssv_nodiscard [[nodiscard]] +#else +# define nssv_nodiscard /*[[nodiscard]]*/ +#endif + +// Additional includes: + +#include +#include +#include +#include +#include +#include // std::char_traits<> + +#if ! nssv_CONFIG_NO_EXCEPTIONS +# include +#endif + +#if nssv_CPP11_OR_GREATER +# include +#endif + +// Clang, GNUC, MSVC warning suppression macros: + +#if defined(__clang__) +# pragma clang diagnostic ignored "-Wreserved-user-defined-literal" +# pragma clang diagnostic push +# pragma clang diagnostic ignored "-Wuser-defined-literals" +#elif defined(__GNUC__) +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wliteral-suffix" +#endif // __clang__ + +#if nssv_COMPILER_MSVC_VERSION >= 140 +# define nssv_SUPPRESS_MSGSL_WARNING(expr) [[gsl::suppress(expr)]] +# define nssv_SUPPRESS_MSVC_WARNING(code, descr) __pragma(warning(suppress: code) ) +# define nssv_DISABLE_MSVC_WARNINGS(codes) __pragma(warning(push)) __pragma(warning(disable: codes)) +#else +# define nssv_SUPPRESS_MSGSL_WARNING(expr) +# define nssv_SUPPRESS_MSVC_WARNING(code, descr) +# define nssv_DISABLE_MSVC_WARNINGS(codes) +#endif + +#if defined(__clang__) +# define nssv_RESTORE_WARNINGS() _Pragma("clang diagnostic pop") +#elif defined(__GNUC__) +# define nssv_RESTORE_WARNINGS() _Pragma("GCC diagnostic pop") +#elif nssv_COMPILER_MSVC_VERSION >= 140 +# define nssv_RESTORE_WARNINGS() __pragma(warning(pop )) +#else +# define nssv_RESTORE_WARNINGS() +#endif + +// Suppress the following MSVC (GSL) warnings: +// - C4455, non-gsl : 'operator ""sv': literal suffix identifiers that do not +// start with an underscore are reserved +// - C26472, gsl::t.1 : don't use a static_cast for arithmetic conversions; +// use brace initialization, gsl::narrow_cast or gsl::narow +// - C26481: gsl::b.1 : don't use pointer arithmetic. Use span instead + +nssv_DISABLE_MSVC_WARNINGS( 4455 26481 26472 ) +//nssv_DISABLE_CLANG_WARNINGS( "-Wuser-defined-literals" ) +//nssv_DISABLE_GNUC_WARNINGS( -Wliteral-suffix ) + +namespace nonstd { namespace sv_lite { + +template +< + class CharT, + class Traits = std::char_traits +> +class basic_string_view; + +// +// basic_string_view: +// + +template +< + class CharT, + class Traits /* = std::char_traits */ +> +class basic_string_view +{ +public: + // Member types: + + typedef Traits traits_type; + typedef CharT value_type; + + typedef CharT * pointer; + typedef CharT const * const_pointer; + typedef CharT & reference; + typedef CharT const & const_reference; + + typedef const_pointer iterator; + typedef const_pointer const_iterator; + typedef std::reverse_iterator< const_iterator > reverse_iterator; + typedef std::reverse_iterator< const_iterator > const_reverse_iterator; + + typedef std::size_t size_type; + typedef std::ptrdiff_t difference_type; + + // 24.4.2.1 Construction and assignment: + + nssv_constexpr basic_string_view() nssv_noexcept + : data_( nssv_nullptr ) + , size_( 0 ) + {} + +#if nssv_CPP11_OR_GREATER + nssv_constexpr basic_string_view( basic_string_view const & other ) nssv_noexcept = default; +#else + nssv_constexpr basic_string_view( basic_string_view const & other ) nssv_noexcept + : data_( other.data_) + , size_( other.size_) + {} +#endif + + nssv_constexpr basic_string_view( CharT const * s, size_type count ) + : data_( s ) + , size_( count ) + {} + + nssv_constexpr basic_string_view( CharT const * s) + : data_( s ) + , size_( Traits::length(s) ) + {} + + // Assignment: + +#if nssv_CPP11_OR_GREATER + nssv_constexpr14 basic_string_view & operator=( basic_string_view const & other ) nssv_noexcept = default; +#else + nssv_constexpr14 basic_string_view & operator=( basic_string_view const & other ) nssv_noexcept + { + data_ = other.data_; + size_ = other.size_; + return *this; + } +#endif + + // 24.4.2.2 Iterator support: + + nssv_constexpr const_iterator begin() const nssv_noexcept { return data_; } + nssv_constexpr const_iterator end() const nssv_noexcept { return data_ + size_; } + + nssv_constexpr const_iterator cbegin() const nssv_noexcept { return begin(); } + nssv_constexpr const_iterator cend() const nssv_noexcept { return end(); } + + nssv_constexpr const_reverse_iterator rbegin() const nssv_noexcept { return const_reverse_iterator( end() ); } + nssv_constexpr const_reverse_iterator rend() const nssv_noexcept { return const_reverse_iterator( begin() ); } + + nssv_constexpr const_reverse_iterator crbegin() const nssv_noexcept { return rbegin(); } + nssv_constexpr const_reverse_iterator crend() const nssv_noexcept { return rend(); } + + // 24.4.2.3 Capacity: + + nssv_constexpr size_type size() const nssv_noexcept { return size_; } + nssv_constexpr size_type length() const nssv_noexcept { return size_; } + nssv_constexpr size_type max_size() const nssv_noexcept { return (std::numeric_limits< size_type >::max)(); } + + // since C++20 + nssv_nodiscard nssv_constexpr bool empty() const nssv_noexcept + { + return 0 == size_; + } + + // 24.4.2.4 Element access: + + nssv_constexpr const_reference operator[]( size_type pos ) const + { + return data_at( pos ); + } + + nssv_constexpr14 const_reference at( size_type pos ) const + { +#if nssv_CONFIG_NO_EXCEPTIONS + assert( pos < size() ); +#else + if ( pos >= size() ) + { + throw std::out_of_range("nonst::string_view::at()"); + } +#endif + return data_at( pos ); + } + + nssv_constexpr const_reference front() const { return data_at( 0 ); } + nssv_constexpr const_reference back() const { return data_at( size() - 1 ); } + + nssv_constexpr const_pointer data() const nssv_noexcept { return data_; } + + // 24.4.2.5 Modifiers: + + nssv_constexpr14 void remove_prefix( size_type n ) + { + assert( n <= size() ); + data_ += n; + size_ -= n; + } + + nssv_constexpr14 void remove_suffix( size_type n ) + { + assert( n <= size() ); + size_ -= n; + } + + nssv_constexpr14 void swap( basic_string_view & other ) nssv_noexcept + { + using std::swap; + swap( data_, other.data_ ); + swap( size_, other.size_ ); + } + + // 24.4.2.6 String operations: + + size_type copy( CharT * dest, size_type n, size_type pos = 0 ) const + { +#if nssv_CONFIG_NO_EXCEPTIONS + assert( pos <= size() ); +#else + if ( pos > size() ) + { + throw std::out_of_range("nonst::string_view::copy()"); + } +#endif + const size_type rlen = (std::min)( n, size() - pos ); + + (void) Traits::copy( dest, data() + pos, rlen ); + + return rlen; + } + + nssv_constexpr14 basic_string_view substr( size_type pos = 0, size_type n = npos ) const + { +#if nssv_CONFIG_NO_EXCEPTIONS + assert( pos <= size() ); +#else + if ( pos > size() ) + { + throw std::out_of_range("nonst::string_view::substr()"); + } +#endif + return basic_string_view( data() + pos, (std::min)( n, size() - pos ) ); + } + + // compare(), 6x: + + nssv_constexpr14 int compare( basic_string_view other ) const nssv_noexcept // (1) + { + if ( const int result = Traits::compare( data(), other.data(), (std::min)( size(), other.size() ) ) ) + return result; + + return size() == other.size() ? 0 : size() < other.size() ? -1 : 1; + } + + nssv_constexpr int compare( size_type pos1, size_type n1, basic_string_view other ) const // (2) + { + return substr( pos1, n1 ).compare( other ); + } + + nssv_constexpr int compare( size_type pos1, size_type n1, basic_string_view other, size_type pos2, size_type n2 ) const // (3) + { + return substr( pos1, n1 ).compare( other.substr( pos2, n2 ) ); + } + + nssv_constexpr int compare( CharT const * s ) const // (4) + { + return compare( basic_string_view( s ) ); + } + + nssv_constexpr int compare( size_type pos1, size_type n1, CharT const * s ) const // (5) + { + return substr( pos1, n1 ).compare( basic_string_view( s ) ); + } + + nssv_constexpr int compare( size_type pos1, size_type n1, CharT const * s, size_type n2 ) const // (6) + { + return substr( pos1, n1 ).compare( basic_string_view( s, n2 ) ); + } + + // 24.4.2.7 Searching: + + // starts_with(), 3x, since C++20: + + nssv_constexpr bool starts_with( basic_string_view v ) const nssv_noexcept // (1) + { + return size() >= v.size() && compare( 0, v.size(), v ) == 0; + } + + nssv_constexpr bool starts_with( CharT c ) const nssv_noexcept // (2) + { + return starts_with( basic_string_view( &c, 1 ) ); + } + + nssv_constexpr bool starts_with( CharT const * s ) const // (3) + { + return starts_with( basic_string_view( s ) ); + } + + // ends_with(), 3x, since C++20: + + nssv_constexpr bool ends_with( basic_string_view v ) const nssv_noexcept // (1) + { + return size() >= v.size() && compare( size() - v.size(), npos, v ) == 0; + } + + nssv_constexpr bool ends_with( CharT c ) const nssv_noexcept // (2) + { + return ends_with( basic_string_view( &c, 1 ) ); + } + + nssv_constexpr bool ends_with( CharT const * s ) const // (3) + { + return ends_with( basic_string_view( s ) ); + } + + // find(), 4x: + + nssv_constexpr14 size_type find( basic_string_view v, size_type pos = 0 ) const nssv_noexcept // (1) + { + return assert( v.size() == 0 || v.data() != nssv_nullptr ) + , pos >= size() + ? npos + : to_pos( std::search( cbegin() + pos, cend(), v.cbegin(), v.cend(), Traits::eq ) ); + } + + nssv_constexpr14 size_type find( CharT c, size_type pos = 0 ) const nssv_noexcept // (2) + { + return find( basic_string_view( &c, 1 ), pos ); + } + + nssv_constexpr14 size_type find( CharT const * s, size_type pos, size_type n ) const // (3) + { + return find( basic_string_view( s, n ), pos ); + } + + nssv_constexpr14 size_type find( CharT const * s, size_type pos = 0 ) const // (4) + { + return find( basic_string_view( s ), pos ); + } + + // rfind(), 4x: + + nssv_constexpr14 size_type rfind( basic_string_view v, size_type pos = npos ) const nssv_noexcept // (1) + { + if ( size() < v.size() ) + return npos; + + if ( v.empty() ) + return (std::min)( size(), pos ); + + const_iterator last = cbegin() + (std::min)( size() - v.size(), pos ) + v.size(); + const_iterator result = std::find_end( cbegin(), last, v.cbegin(), v.cend(), Traits::eq ); + + return result != last ? size_type( result - cbegin() ) : npos; + } + + nssv_constexpr14 size_type rfind( CharT c, size_type pos = npos ) const nssv_noexcept // (2) + { + return rfind( basic_string_view( &c, 1 ), pos ); + } + + nssv_constexpr14 size_type rfind( CharT const * s, size_type pos, size_type n ) const // (3) + { + return rfind( basic_string_view( s, n ), pos ); + } + + nssv_constexpr14 size_type rfind( CharT const * s, size_type pos = npos ) const // (4) + { + return rfind( basic_string_view( s ), pos ); + } + + // find_first_of(), 4x: + + nssv_constexpr size_type find_first_of( basic_string_view v, size_type pos = 0 ) const nssv_noexcept // (1) + { + return pos >= size() + ? npos + : to_pos( std::find_first_of( cbegin() + pos, cend(), v.cbegin(), v.cend(), Traits::eq ) ); + } + + nssv_constexpr size_type find_first_of( CharT c, size_type pos = 0 ) const nssv_noexcept // (2) + { + return find_first_of( basic_string_view( &c, 1 ), pos ); + } + + nssv_constexpr size_type find_first_of( CharT const * s, size_type pos, size_type n ) const // (3) + { + return find_first_of( basic_string_view( s, n ), pos ); + } + + nssv_constexpr size_type find_first_of( CharT const * s, size_type pos = 0 ) const // (4) + { + return find_first_of( basic_string_view( s ), pos ); + } + + // find_last_of(), 4x: + + nssv_constexpr size_type find_last_of( basic_string_view v, size_type pos = npos ) const nssv_noexcept // (1) + { + return empty() + ? npos + : pos >= size() + ? find_last_of( v, size() - 1 ) + : to_pos( std::find_first_of( const_reverse_iterator( cbegin() + pos + 1 ), crend(), v.cbegin(), v.cend(), Traits::eq ) ); + } + + nssv_constexpr size_type find_last_of( CharT c, size_type pos = npos ) const nssv_noexcept // (2) + { + return find_last_of( basic_string_view( &c, 1 ), pos ); + } + + nssv_constexpr size_type find_last_of( CharT const * s, size_type pos, size_type count ) const // (3) + { + return find_last_of( basic_string_view( s, count ), pos ); + } + + nssv_constexpr size_type find_last_of( CharT const * s, size_type pos = npos ) const // (4) + { + return find_last_of( basic_string_view( s ), pos ); + } + + // find_first_not_of(), 4x: + + nssv_constexpr size_type find_first_not_of( basic_string_view v, size_type pos = 0 ) const nssv_noexcept // (1) + { + return pos >= size() + ? npos + : to_pos( std::find_if( cbegin() + pos, cend(), not_in_view( v ) ) ); + } + + nssv_constexpr size_type find_first_not_of( CharT c, size_type pos = 0 ) const nssv_noexcept // (2) + { + return find_first_not_of( basic_string_view( &c, 1 ), pos ); + } + + nssv_constexpr size_type find_first_not_of( CharT const * s, size_type pos, size_type count ) const // (3) + { + return find_first_not_of( basic_string_view( s, count ), pos ); + } + + nssv_constexpr size_type find_first_not_of( CharT const * s, size_type pos = 0 ) const // (4) + { + return find_first_not_of( basic_string_view( s ), pos ); + } + + // find_last_not_of(), 4x: + + nssv_constexpr size_type find_last_not_of( basic_string_view v, size_type pos = npos ) const nssv_noexcept // (1) + { + return empty() + ? npos + : pos >= size() + ? find_last_not_of( v, size() - 1 ) + : to_pos( std::find_if( const_reverse_iterator( cbegin() + pos + 1 ), crend(), not_in_view( v ) ) ); + } + + nssv_constexpr size_type find_last_not_of( CharT c, size_type pos = npos ) const nssv_noexcept // (2) + { + return find_last_not_of( basic_string_view( &c, 1 ), pos ); + } + + nssv_constexpr size_type find_last_not_of( CharT const * s, size_type pos, size_type count ) const // (3) + { + return find_last_not_of( basic_string_view( s, count ), pos ); + } + + nssv_constexpr size_type find_last_not_of( CharT const * s, size_type pos = npos ) const // (4) + { + return find_last_not_of( basic_string_view( s ), pos ); + } + + // Constants: + +#if nssv_CPP17_OR_GREATER + static nssv_constexpr size_type npos = size_type(-1); +#elif nssv_CPP11_OR_GREATER + enum : size_type { npos = size_type(-1) }; +#else + enum { npos = size_type(-1) }; +#endif + +private: + struct not_in_view + { + const basic_string_view v; + + nssv_constexpr not_in_view( basic_string_view v ) : v( v ) {} + + nssv_constexpr bool operator()( CharT c ) const + { + return npos == v.find_first_of( c ); + } + }; + + nssv_constexpr size_type to_pos( const_iterator it ) const + { + return it == cend() ? npos : size_type( it - cbegin() ); + } + + nssv_constexpr size_type to_pos( const_reverse_iterator it ) const + { + return it == crend() ? npos : size_type( crend() - it - 1 ); + } + + nssv_constexpr const_reference data_at( size_type pos ) const + { +#if nssv_BETWEEN( nssv_COMPILER_GNUC_VERSION, 1, 500 ) + return data_[pos]; +#else + return assert( pos < size() ), data_[pos]; +#endif + } + +private: + const_pointer data_; + size_type size_; + +public: +#if nssv_CONFIG_CONVERSION_STD_STRING_CLASS_METHODS + + template< class Allocator > + basic_string_view( std::basic_string const & s ) nssv_noexcept + : data_( s.data() ) + , size_( s.size() ) + {} + +#if nssv_HAVE_EXPLICIT_CONVERSION + + template< class Allocator > + explicit operator std::basic_string() const + { + return to_string( Allocator() ); + } + +#endif // nssv_HAVE_EXPLICIT_CONVERSION + +#if nssv_CPP11_OR_GREATER + + template< class Allocator = std::allocator > + std::basic_string + to_string( Allocator const & a = Allocator() ) const + { + return std::basic_string( begin(), end(), a ); + } + +#else + + std::basic_string + to_string() const + { + return std::basic_string( begin(), end() ); + } + + template< class Allocator > + std::basic_string + to_string( Allocator const & a ) const + { + return std::basic_string( begin(), end(), a ); + } + +#endif // nssv_CPP11_OR_GREATER + +#endif // nssv_CONFIG_CONVERSION_STD_STRING_CLASS_METHODS +}; + +// +// Non-member functions: +// + +// 24.4.3 Non-member comparison functions: +// lexicographically compare two string views (function template): + +template< class CharT, class Traits > +nssv_constexpr bool operator== ( + basic_string_view lhs, + basic_string_view rhs ) nssv_noexcept +{ return lhs.compare( rhs ) == 0 ; } + +template< class CharT, class Traits > +nssv_constexpr bool operator!= ( + basic_string_view lhs, + basic_string_view rhs ) nssv_noexcept +{ return lhs.compare( rhs ) != 0 ; } + +template< class CharT, class Traits > +nssv_constexpr bool operator< ( + basic_string_view lhs, + basic_string_view rhs ) nssv_noexcept +{ return lhs.compare( rhs ) < 0 ; } + +template< class CharT, class Traits > +nssv_constexpr bool operator<= ( + basic_string_view lhs, + basic_string_view rhs ) nssv_noexcept +{ return lhs.compare( rhs ) <= 0 ; } + +template< class CharT, class Traits > +nssv_constexpr bool operator> ( + basic_string_view lhs, + basic_string_view rhs ) nssv_noexcept +{ return lhs.compare( rhs ) > 0 ; } + +template< class CharT, class Traits > +nssv_constexpr bool operator>= ( + basic_string_view lhs, + basic_string_view rhs ) nssv_noexcept +{ return lhs.compare( rhs ) >= 0 ; } + +// Let S be basic_string_view, and sv be an instance of S. +// Implementations shall provide sufficient additional overloads marked +// constexpr and noexcept so that an object t with an implicit conversion +// to S can be compared according to Table 67. + +#if nssv_CPP11_OR_GREATER && ! nssv_BETWEEN( nssv_COMPILER_MSVC_VERSION, 100, 141 ) + +#define nssv_BASIC_STRING_VIEW_I(T,U) typename std::decay< basic_string_view >::type + +#if nssv_BETWEEN( nssv_COMPILER_MSVC_VERSION, 140, 150 ) +# define nssv_MSVC_ORDER(x) , int=x +#else +# define nssv_MSVC_ORDER(x) /*, int=x*/ +#endif + +// == + +template< class CharT, class Traits nssv_MSVC_ORDER(1) > +nssv_constexpr bool operator==( + basic_string_view lhs, + nssv_BASIC_STRING_VIEW_I(CharT, Traits) rhs ) nssv_noexcept +{ return lhs.compare( rhs ) == 0; } + +template< class CharT, class Traits nssv_MSVC_ORDER(2) > +nssv_constexpr bool operator==( + nssv_BASIC_STRING_VIEW_I(CharT, Traits) lhs, + basic_string_view rhs ) nssv_noexcept +{ return lhs.size() == rhs.size() && lhs.compare( rhs ) == 0; } + +// != + +template< class CharT, class Traits nssv_MSVC_ORDER(1) > +nssv_constexpr bool operator!= ( + basic_string_view < CharT, Traits > lhs, + nssv_BASIC_STRING_VIEW_I( CharT, Traits ) rhs ) nssv_noexcept +{ return lhs.size() != rhs.size() || lhs.compare( rhs ) != 0 ; } + +template< class CharT, class Traits nssv_MSVC_ORDER(2) > +nssv_constexpr bool operator!= ( + nssv_BASIC_STRING_VIEW_I( CharT, Traits ) lhs, + basic_string_view < CharT, Traits > rhs ) nssv_noexcept +{ return lhs.compare( rhs ) != 0 ; } + +// < + +template< class CharT, class Traits nssv_MSVC_ORDER(1) > +nssv_constexpr bool operator< ( + basic_string_view < CharT, Traits > lhs, + nssv_BASIC_STRING_VIEW_I( CharT, Traits ) rhs ) nssv_noexcept +{ return lhs.compare( rhs ) < 0 ; } + +template< class CharT, class Traits nssv_MSVC_ORDER(2) > +nssv_constexpr bool operator< ( + nssv_BASIC_STRING_VIEW_I( CharT, Traits ) lhs, + basic_string_view < CharT, Traits > rhs ) nssv_noexcept +{ return lhs.compare( rhs ) < 0 ; } + +// <= + +template< class CharT, class Traits nssv_MSVC_ORDER(1) > +nssv_constexpr bool operator<= ( + basic_string_view < CharT, Traits > lhs, + nssv_BASIC_STRING_VIEW_I( CharT, Traits ) rhs ) nssv_noexcept +{ return lhs.compare( rhs ) <= 0 ; } + +template< class CharT, class Traits nssv_MSVC_ORDER(2) > +nssv_constexpr bool operator<= ( + nssv_BASIC_STRING_VIEW_I( CharT, Traits ) lhs, + basic_string_view < CharT, Traits > rhs ) nssv_noexcept +{ return lhs.compare( rhs ) <= 0 ; } + +// > + +template< class CharT, class Traits nssv_MSVC_ORDER(1) > +nssv_constexpr bool operator> ( + basic_string_view < CharT, Traits > lhs, + nssv_BASIC_STRING_VIEW_I( CharT, Traits ) rhs ) nssv_noexcept +{ return lhs.compare( rhs ) > 0 ; } + +template< class CharT, class Traits nssv_MSVC_ORDER(2) > +nssv_constexpr bool operator> ( + nssv_BASIC_STRING_VIEW_I( CharT, Traits ) lhs, + basic_string_view < CharT, Traits > rhs ) nssv_noexcept +{ return lhs.compare( rhs ) > 0 ; } + +// >= + +template< class CharT, class Traits nssv_MSVC_ORDER(1) > +nssv_constexpr bool operator>= ( + basic_string_view < CharT, Traits > lhs, + nssv_BASIC_STRING_VIEW_I( CharT, Traits ) rhs ) nssv_noexcept +{ return lhs.compare( rhs ) >= 0 ; } + +template< class CharT, class Traits nssv_MSVC_ORDER(2) > +nssv_constexpr bool operator>= ( + nssv_BASIC_STRING_VIEW_I( CharT, Traits ) lhs, + basic_string_view < CharT, Traits > rhs ) nssv_noexcept +{ return lhs.compare( rhs ) >= 0 ; } + +#undef nssv_MSVC_ORDER +#undef nssv_BASIC_STRING_VIEW_I + +#endif // nssv_CPP11_OR_GREATER + +// 24.4.4 Inserters and extractors: + +namespace detail { + +template< class Stream > +void write_padding( Stream & os, std::streamsize n ) +{ + for ( std::streamsize i = 0; i < n; ++i ) + os.rdbuf()->sputc( os.fill() ); +} + +template< class Stream, class View > +Stream & write_to_stream( Stream & os, View const & sv ) +{ + typename Stream::sentry sentry( os ); + + if ( !os ) + return os; + + const std::streamsize length = static_cast( sv.length() ); + + // Whether, and how, to pad: + const bool pad = ( length < os.width() ); + const bool left_pad = pad && ( os.flags() & std::ios_base::adjustfield ) == std::ios_base::right; + + if ( left_pad ) + write_padding( os, os.width() - length ); + + // Write span characters: + os.rdbuf()->sputn( sv.begin(), length ); + + if ( pad && !left_pad ) + write_padding( os, os.width() - length ); + + // Reset output stream width: + os.width( 0 ); + + return os; +} + +} // namespace detail + +template< class CharT, class Traits > +std::basic_ostream & +operator<<( + std::basic_ostream& os, + basic_string_view sv ) +{ + return detail::write_to_stream( os, sv ); +} + +// Several typedefs for common character types are provided: + +typedef basic_string_view string_view; +typedef basic_string_view wstring_view; +#if nssv_HAVE_WCHAR16_T +typedef basic_string_view u16string_view; +typedef basic_string_view u32string_view; +#endif + +}} // namespace nonstd::sv_lite + +// +// 24.4.6 Suffix for basic_string_view literals: +// + +#if nssv_HAVE_USER_DEFINED_LITERALS + +namespace nonstd { +nssv_inline_ns namespace literals { +nssv_inline_ns namespace string_view_literals { + +#if nssv_CONFIG_STD_SV_OPERATOR && nssv_HAVE_STD_DEFINED_LITERALS + +nssv_constexpr nonstd::sv_lite::string_view operator "" sv( const char* str, size_t len ) nssv_noexcept // (1) +{ + return nonstd::sv_lite::string_view{ str, len }; +} + +nssv_constexpr nonstd::sv_lite::u16string_view operator "" sv( const char16_t* str, size_t len ) nssv_noexcept // (2) +{ + return nonstd::sv_lite::u16string_view{ str, len }; +} + +nssv_constexpr nonstd::sv_lite::u32string_view operator "" sv( const char32_t* str, size_t len ) nssv_noexcept // (3) +{ + return nonstd::sv_lite::u32string_view{ str, len }; +} + +nssv_constexpr nonstd::sv_lite::wstring_view operator "" sv( const wchar_t* str, size_t len ) nssv_noexcept // (4) +{ + return nonstd::sv_lite::wstring_view{ str, len }; +} + +#endif // nssv_CONFIG_STD_SV_OPERATOR && nssv_HAVE_STD_DEFINED_LITERALS + +#if nssv_CONFIG_USR_SV_OPERATOR + +nssv_constexpr nonstd::sv_lite::string_view operator "" _sv( const char* str, size_t len ) nssv_noexcept // (1) +{ + return nonstd::sv_lite::string_view{ str, len }; +} + +nssv_constexpr nonstd::sv_lite::u16string_view operator "" _sv( const char16_t* str, size_t len ) nssv_noexcept // (2) +{ + return nonstd::sv_lite::u16string_view{ str, len }; +} + +nssv_constexpr nonstd::sv_lite::u32string_view operator "" _sv( const char32_t* str, size_t len ) nssv_noexcept // (3) +{ + return nonstd::sv_lite::u32string_view{ str, len }; +} + +nssv_constexpr nonstd::sv_lite::wstring_view operator "" _sv( const wchar_t* str, size_t len ) nssv_noexcept // (4) +{ + return nonstd::sv_lite::wstring_view{ str, len }; +} + +#endif // nssv_CONFIG_USR_SV_OPERATOR + +}}} // namespace nonstd::literals::string_view_literals + +#endif + +// +// Extensions for std::string: +// + +#if nssv_CONFIG_CONVERSION_STD_STRING_FREE_FUNCTIONS + +namespace nonstd { +namespace sv_lite { + +// Exclude MSVC 14 (19.00): it yields ambiguous to_string(): + +#if nssv_CPP11_OR_GREATER && nssv_COMPILER_MSVC_VERSION != 140 + +template< class CharT, class Traits, class Allocator = std::allocator > +std::basic_string +to_string( basic_string_view v, Allocator const & a = Allocator() ) +{ + return std::basic_string( v.begin(), v.end(), a ); +} + +#else + +template< class CharT, class Traits > +std::basic_string +to_string( basic_string_view v ) +{ + return std::basic_string( v.begin(), v.end() ); +} + +template< class CharT, class Traits, class Allocator > +std::basic_string +to_string( basic_string_view v, Allocator const & a ) +{ + return std::basic_string( v.begin(), v.end(), a ); +} + +#endif // nssv_CPP11_OR_GREATER + +template< class CharT, class Traits, class Allocator > +basic_string_view +to_string_view( std::basic_string const & s ) +{ + return basic_string_view( s.data(), s.size() ); +} + +}} // namespace nonstd::sv_lite + +#endif // nssv_CONFIG_CONVERSION_STD_STRING_FREE_FUNCTIONS + +// +// make types and algorithms available in namespace nonstd: +// + +namespace nonstd { + +using sv_lite::basic_string_view; +using sv_lite::string_view; +using sv_lite::wstring_view; + +#if nssv_HAVE_WCHAR16_T +using sv_lite::u16string_view; +#endif +#if nssv_HAVE_WCHAR32_T +using sv_lite::u32string_view; +#endif + +// literal "sv" + +using sv_lite::operator==; +using sv_lite::operator!=; +using sv_lite::operator<; +using sv_lite::operator<=; +using sv_lite::operator>; +using sv_lite::operator>=; + +using sv_lite::operator<<; + +#if nssv_CONFIG_CONVERSION_STD_STRING_FREE_FUNCTIONS +using sv_lite::to_string; +using sv_lite::to_string_view; +#endif + +} // namespace nonstd + +// 24.4.5 Hash support (C++11): + +// Note: The hash value of a string view object is equal to the hash value of +// the corresponding string object. + +#if nssv_HAVE_STD_HASH + +#include + +namespace std { + +template<> +struct hash< nonstd::string_view > +{ +public: + std::size_t operator()( nonstd::string_view v ) const nssv_noexcept + { + return std::hash()( std::string( v.data(), v.size() ) ); + } +}; + +template<> +struct hash< nonstd::wstring_view > +{ +public: + std::size_t operator()( nonstd::wstring_view v ) const nssv_noexcept + { + return std::hash()( std::wstring( v.data(), v.size() ) ); + } +}; + +template<> +struct hash< nonstd::u16string_view > +{ +public: + std::size_t operator()( nonstd::u16string_view v ) const nssv_noexcept + { + return std::hash()( std::u16string( v.data(), v.size() ) ); + } +}; + +template<> +struct hash< nonstd::u32string_view > +{ +public: + std::size_t operator()( nonstd::u32string_view v ) const nssv_noexcept + { + return std::hash()( std::u32string( v.data(), v.size() ) ); + } +}; + +} // namespace std + +#endif // nssv_HAVE_STD_HASH + +nssv_RESTORE_WARNINGS() + +#endif // nssv_HAVE_STD_STRING_VIEW +#endif // NONSTD_SV_LITE_H_INCLUDED + + + +namespace inja { + +enum class ElementNotation { + Dot, + Pointer +}; + +/*! + * \brief Class for lexer configuration. + */ +struct LexerConfig { + std::string statement_open {"{%"}; + std::string statement_close {"%}"}; + std::string line_statement {"##"}; + std::string expression_open {"{{"}; + std::string expression_close {"}}"}; + std::string comment_open {"{#"}; + std::string comment_close {"#}"}; + std::string open_chars {"#{"}; + + bool trim_blocks {false}; + bool lstrip_blocks {false}; + + void update_open_chars() { + open_chars = ""; + if (open_chars.find(line_statement[0]) == std::string::npos) { + open_chars += line_statement[0]; + } + if (open_chars.find(statement_open[0]) == std::string::npos) { + open_chars += statement_open[0]; + } + if (open_chars.find(expression_open[0]) == std::string::npos) { + open_chars += expression_open[0]; + } + if (open_chars.find(comment_open[0]) == std::string::npos) { + open_chars += comment_open[0]; + } + } +}; + +/*! + * \brief Class for parser configuration. + */ +struct ParserConfig { + ElementNotation notation {ElementNotation::Dot}; +}; + +} + +#endif // PANTOR_INJA_CONFIG_HPP + +// #include "function_storage.hpp" +#ifndef PANTOR_INJA_FUNCTION_STORAGE_HPP +#define PANTOR_INJA_FUNCTION_STORAGE_HPP + +#include + +// #include "bytecode.hpp" +#ifndef PANTOR_INJA_BYTECODE_HPP +#define PANTOR_INJA_BYTECODE_HPP + +#include +#include + +#include + +// #include "string_view.hpp" + + + +namespace inja { + +using json = nlohmann::json; + + +struct Bytecode { + enum class Op : uint8_t { + Nop, + // print StringRef (always immediate) + PrintText, + // print value + PrintValue, + // push value onto stack (always immediate) + Push, + + // builtin functions + // result is pushed to stack + // args specify number of arguments + // all functions can take their "last" argument either immediate + // or popped off stack (e.g. if immediate, it's like the immediate was + // just pushed to the stack) + Not, + And, + Or, + In, + Equal, + Greater, + GreaterEqual, + Less, + LessEqual, + At, + Different, + DivisibleBy, + Even, + First, + Float, + Int, + Last, + Length, + Lower, + Max, + Min, + Odd, + Range, + Result, + Round, + Sort, + Upper, + Exists, + ExistsInObject, + IsBoolean, + IsNumber, + IsInteger, + IsFloat, + IsObject, + IsArray, + IsString, + Default, + + // include another template + // value is the template name + Include, + + // callback function + // str is the function name (this means it cannot be a lookup) + // args specify number of arguments + // as with builtin functions, "last" argument can be immediate + Callback, + + // unconditional jump + // args is the index of the bytecode to jump to. + Jump, + + // conditional jump + // value popped off stack is checked for truthyness + // if false, args is the index of the bytecode to jump to. + // if true, no action is taken (falls through) + ConditionalJump, + + // start loop + // value popped off stack is what is iterated over + // args is index of bytecode after end loop (jumped to if iterable is + // empty) + // immediate value is key name (for maps) + // str is value name + StartLoop, + + // end a loop + // args is index of the first bytecode in the loop body + EndLoop, + }; + + enum Flag { + // location of value for value-taking ops (mask) + ValueMask = 0x03, + // pop value off stack + ValuePop = 0x00, + // value is immediate rather than on stack + ValueImmediate = 0x01, + // lookup immediate str (dot notation) + ValueLookupDot = 0x02, + // lookup immediate str (json pointer notation) + ValueLookupPointer = 0x03, + }; + + Op op {Op::Nop}; + uint32_t args: 30; + uint32_t flags: 2; + + json value; + std::string str; + + Bytecode(): args(0), flags(0) {} + explicit Bytecode(Op op, unsigned int args = 0): op(op), args(args), flags(0) {} + explicit Bytecode(Op op, nonstd::string_view str, unsigned int flags): op(op), args(0), flags(flags), str(str) {} + explicit Bytecode(Op op, json&& value, unsigned int flags): op(op), args(0), flags(flags), value(std::move(value)) {} +}; + +} // namespace inja + +#endif // PANTOR_INJA_BYTECODE_HPP + +// #include "string_view.hpp" + + + +namespace inja { + +using namespace nlohmann; + +using Arguments = std::vector; +using CallbackFunction = std::function; + +/*! + * \brief Class for builtin functions and user-defined callbacks. + */ +class FunctionStorage { + public: + void add_builtin(nonstd::string_view name, unsigned int num_args, Bytecode::Op op) { + auto& data = get_or_new(name, num_args); + data.op = op; + } + + void add_callback(nonstd::string_view name, unsigned int num_args, const CallbackFunction& function) { + auto& data = get_or_new(name, num_args); + data.function = function; + } + + Bytecode::Op find_builtin(nonstd::string_view name, unsigned int num_args) const { + if (auto ptr = get(name, num_args)) { + return ptr->op; + } + return Bytecode::Op::Nop; + } + + CallbackFunction find_callback(nonstd::string_view name, unsigned int num_args) const { + if (auto ptr = get(name, num_args)) { + return ptr->function; + } + return nullptr; + } + + private: + struct FunctionData { + unsigned int num_args {0}; + Bytecode::Op op {Bytecode::Op::Nop}; // for builtins + CallbackFunction function; // for callbacks + }; + + FunctionData& get_or_new(nonstd::string_view name, unsigned int num_args) { + auto &vec = m_map[static_cast(name)]; + for (auto &i: vec) { + if (i.num_args == num_args) return i; + } + vec.emplace_back(); + vec.back().num_args = num_args; + return vec.back(); + } + + const FunctionData* get(nonstd::string_view name, unsigned int num_args) const { + auto it = m_map.find(static_cast(name)); + if (it == m_map.end()) return nullptr; + for (auto &&i: it->second) { + if (i.num_args == num_args) return &i; + } + return nullptr; + } + + std::map> m_map; +}; + +} + +#endif // PANTOR_INJA_FUNCTION_STORAGE_HPP + +// #include "parser.hpp" +#ifndef PANTOR_INJA_PARSER_HPP +#define PANTOR_INJA_PARSER_HPP + +#include +#include +#include +#include + +// #include "bytecode.hpp" + +// #include "config.hpp" + +// #include "function_storage.hpp" + +// #include "lexer.hpp" +#ifndef PANTOR_INJA_LEXER_HPP +#define PANTOR_INJA_LEXER_HPP + +#include +#include + +// #include "config.hpp" + +// #include "token.hpp" +#ifndef PANTOR_INJA_TOKEN_HPP +#define PANTOR_INJA_TOKEN_HPP + +#include + +// #include "string_view.hpp" + + + +namespace inja { + +/*! + * \brief Helper-class for the inja Parser. + */ +struct Token { + enum class Kind { + Text, + ExpressionOpen, // {{ + ExpressionClose, // }} + LineStatementOpen, // ## + LineStatementClose, // \n + StatementOpen, // {% + StatementClose, // %} + CommentOpen, // {# + CommentClose, // #} + Id, // this, this.foo + Number, // 1, 2, -1, 5.2, -5.3 + String, // "this" + Comma, // , + Colon, // : + LeftParen, // ( + RightParen, // ) + LeftBracket, // [ + RightBracket, // ] + LeftBrace, // { + RightBrace, // } + Equal, // == + GreaterThan, // > + GreaterEqual, // >= + LessThan, // < + LessEqual, // <= + NotEqual, // != + Unknown, + Eof + } kind {Kind::Unknown}; + + nonstd::string_view text; + + constexpr Token() = default; + constexpr Token(Kind kind, nonstd::string_view text): kind(kind), text(text) {} + + std::string describe() const { + switch (kind) { + case Kind::Text: + return ""; + case Kind::LineStatementClose: + return ""; + case Kind::Eof: + return ""; + default: + return static_cast(text); + } + } +}; + +} + +#endif // PANTOR_INJA_TOKEN_HPP + +// #include "utils.hpp" +#ifndef PANTOR_INJA_UTILS_HPP +#define PANTOR_INJA_UTILS_HPP + +#include +#include +#include +#include +#include + +// #include "string_view.hpp" + + + +namespace inja { + +inline void inja_throw(const std::string& type, const std::string& message) { + throw std::runtime_error("[inja.exception." + type + "] " + message); +} + +inline std::ifstream open_file_or_throw(const std::string& path) { + std::ifstream file; + file.exceptions(std::ifstream::failbit | std::ifstream::badbit); + try { + file.open(path); + } catch(const std::ios_base::failure& e) { + inja_throw("file_error", "failed accessing file at '" + path + "'"); + } + return file; +} + +namespace string_view { + inline nonstd::string_view slice(nonstd::string_view view, size_t start, size_t end) { + start = std::min(start, view.size()); + end = std::min(std::max(start, end), view.size()); + return view.substr(start, end - start); // StringRef(Data + Start, End - Start); + } + + inline std::pair split(nonstd::string_view view, char Separator) { + size_t idx = view.find(Separator); + if (idx == nonstd::string_view::npos) { + return std::make_pair(view, nonstd::string_view()); + } + return std::make_pair(slice(view, 0, idx), slice(view, idx + 1, nonstd::string_view::npos)); + } + + inline bool starts_with(nonstd::string_view view, nonstd::string_view prefix) { + return (view.size() >= prefix.size() && view.compare(0, prefix.size(), prefix) == 0); + } +} // namespace string + +} // namespace inja + +#endif // PANTOR_INJA_UTILS_HPP + + + +namespace inja { + +/*! + * \brief Class for lexing an inja Template. + */ +class Lexer { + enum class State { + Text, + ExpressionStart, + ExpressionBody, + LineStart, + LineBody, + StatementStart, + StatementBody, + CommentStart, + CommentBody + } m_state; + + const LexerConfig& m_config; + nonstd::string_view m_in; + size_t m_tok_start; + size_t m_pos; + + public: + explicit Lexer(const LexerConfig& config) : m_config(config) {} + + void start(nonstd::string_view in) { + m_in = in; + m_tok_start = 0; + m_pos = 0; + m_state = State::Text; + } + + Token scan() { + m_tok_start = m_pos; + + again: + if (m_tok_start >= m_in.size()) return make_token(Token::Kind::Eof); + + switch (m_state) { + default: + case State::Text: { + // fast-scan to first open character + size_t open_start = m_in.substr(m_pos).find_first_of(m_config.open_chars); + if (open_start == nonstd::string_view::npos) { + // didn't find open, return remaining text as text token + m_pos = m_in.size(); + return make_token(Token::Kind::Text); + } + m_pos += open_start; + + // try to match one of the opening sequences, and get the close + nonstd::string_view open_str = m_in.substr(m_pos); + bool must_lstrip = false; + if (inja::string_view::starts_with(open_str, m_config.expression_open)) { + m_state = State::ExpressionStart; + } else if (inja::string_view::starts_with(open_str, m_config.statement_open)) { + m_state = State::StatementStart; + must_lstrip = m_config.lstrip_blocks; + } else if (inja::string_view::starts_with(open_str, m_config.comment_open)) { + m_state = State::CommentStart; + must_lstrip = m_config.lstrip_blocks; + } else if ((m_pos == 0 || m_in[m_pos - 1] == '\n') && + inja::string_view::starts_with(open_str, m_config.line_statement)) { + m_state = State::LineStart; + } else { + m_pos += 1; // wasn't actually an opening sequence + goto again; + } + + nonstd::string_view text = string_view::slice(m_in, m_tok_start, m_pos); + if (must_lstrip) + text = clear_final_line_if_whitespace(text); + + if (text.empty()) goto again; // don't generate empty token + return Token(Token::Kind::Text, text); + } + case State::ExpressionStart: { + m_state = State::ExpressionBody; + m_pos += m_config.expression_open.size(); + return make_token(Token::Kind::ExpressionOpen); + } + case State::LineStart: { + m_state = State::LineBody; + m_pos += m_config.line_statement.size(); + return make_token(Token::Kind::LineStatementOpen); + } + case State::StatementStart: { + m_state = State::StatementBody; + m_pos += m_config.statement_open.size(); + return make_token(Token::Kind::StatementOpen); + } + case State::CommentStart: { + m_state = State::CommentBody; + m_pos += m_config.comment_open.size(); + return make_token(Token::Kind::CommentOpen); + } + case State::ExpressionBody: + return scan_body(m_config.expression_close, Token::Kind::ExpressionClose); + case State::LineBody: + return scan_body("\n", Token::Kind::LineStatementClose); + case State::StatementBody: + return scan_body(m_config.statement_close, Token::Kind::StatementClose, m_config.trim_blocks); + case State::CommentBody: { + // fast-scan to comment close + size_t end = m_in.substr(m_pos).find(m_config.comment_close); + if (end == nonstd::string_view::npos) { + m_pos = m_in.size(); + return make_token(Token::Kind::Eof); + } + // return the entire comment in the close token + m_state = State::Text; + m_pos += end + m_config.comment_close.size(); + Token tok = make_token(Token::Kind::CommentClose); + if (m_config.trim_blocks) + skip_newline(); + return tok; + } + } + } + + const LexerConfig& get_config() const { return m_config; } + + private: + Token scan_body(nonstd::string_view close, Token::Kind closeKind, bool trim = false) { + again: + // skip whitespace (except for \n as it might be a close) + if (m_tok_start >= m_in.size()) return make_token(Token::Kind::Eof); + char ch = m_in[m_tok_start]; + if (ch == ' ' || ch == '\t' || ch == '\r') { + m_tok_start += 1; + goto again; + } + + // check for close + if (inja::string_view::starts_with(m_in.substr(m_tok_start), close)) { + m_state = State::Text; + m_pos = m_tok_start + close.size(); + Token tok = make_token(closeKind); + if (trim) + skip_newline(); + return tok; + } + + // skip \n + if (ch == '\n') { + m_tok_start += 1; + goto again; + } + + m_pos = m_tok_start + 1; + if (std::isalpha(ch)) return scan_id(); + switch (ch) { + case ',': + return make_token(Token::Kind::Comma); + case ':': + return make_token(Token::Kind::Colon); + case '(': + return make_token(Token::Kind::LeftParen); + case ')': + return make_token(Token::Kind::RightParen); + case '[': + return make_token(Token::Kind::LeftBracket); + case ']': + return make_token(Token::Kind::RightBracket); + case '{': + return make_token(Token::Kind::LeftBrace); + case '}': + return make_token(Token::Kind::RightBrace); + case '>': + if (m_pos < m_in.size() && m_in[m_pos] == '=') { + m_pos += 1; + return make_token(Token::Kind::GreaterEqual); + } + return make_token(Token::Kind::GreaterThan); + case '<': + if (m_pos < m_in.size() && m_in[m_pos] == '=') { + m_pos += 1; + return make_token(Token::Kind::LessEqual); + } + return make_token(Token::Kind::LessThan); + case '=': + if (m_pos < m_in.size() && m_in[m_pos] == '=') { + m_pos += 1; + return make_token(Token::Kind::Equal); + } + return make_token(Token::Kind::Unknown); + case '!': + if (m_pos < m_in.size() && m_in[m_pos] == '=') { + m_pos += 1; + return make_token(Token::Kind::NotEqual); + } + return make_token(Token::Kind::Unknown); + case '\"': + return scan_string(); + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + case '-': + return scan_number(); + case '_': + return scan_id(); + default: + return make_token(Token::Kind::Unknown); + } + } + + Token scan_id() { + for (;;) { + if (m_pos >= m_in.size()) { + break; + } + char ch = m_in[m_pos]; + if (!std::isalnum(ch) && ch != '.' && ch != '/' && ch != '_' && ch != '-') { + break; + } + m_pos += 1; + } + return make_token(Token::Kind::Id); + } + + Token scan_number() { + for (;;) { + if (m_pos >= m_in.size()) { + break; + } + char ch = m_in[m_pos]; + // be very permissive in lexer (we'll catch errors when conversion happens) + if (!std::isdigit(ch) && ch != '.' && ch != 'e' && ch != 'E' && ch != '+' && ch != '-') { + break; + } + m_pos += 1; + } + return make_token(Token::Kind::Number); + } + + Token scan_string() { + bool escape {false}; + for (;;) { + if (m_pos >= m_in.size()) break; + char ch = m_in[m_pos++]; + if (ch == '\\') { + escape = true; + } else if (!escape && ch == m_in[m_tok_start]) { + break; + } else { + escape = false; + } + } + return make_token(Token::Kind::String); + } + + Token make_token(Token::Kind kind) const { + return Token(kind, string_view::slice(m_in, m_tok_start, m_pos)); + } + + void skip_newline() { + if (m_pos < m_in.size()) { + char ch = m_in[m_pos]; + if (ch == '\n') + m_pos += 1; + else if (ch == '\r') { + m_pos += 1; + if (m_pos < m_in.size() && m_in[m_pos] == '\n') + m_pos += 1; + } + } + } + + static nonstd::string_view clear_final_line_if_whitespace(nonstd::string_view text) + { + nonstd::string_view result = text; + while (!result.empty()) { + char ch = result.back(); + if (ch == ' ' || ch == '\t') + result.remove_suffix(1); + else if (ch == '\n' || ch == '\r') + break; + else + return text; + } + return result; + } +}; + +} + +#endif // PANTOR_INJA_LEXER_HPP + +// #include "template.hpp" +#ifndef PANTOR_INJA_TEMPLATE_HPP +#define PANTOR_INJA_TEMPLATE_HPP + +#include +#include +#include + +// #include "bytecode.hpp" + + + +namespace inja { + +/*! + * \brief The main inja Template. + */ +struct Template { + std::vector bytecodes; + std::string content; +}; + +using TemplateStorage = std::map; + +} + +#endif // PANTOR_INJA_TEMPLATE_HPP + +// #include "token.hpp" + +// #include "utils.hpp" + + +#include + + +namespace inja { + +class ParserStatic { + ParserStatic() { + functions.add_builtin("at", 2, Bytecode::Op::At); + functions.add_builtin("default", 2, Bytecode::Op::Default); + functions.add_builtin("divisibleBy", 2, Bytecode::Op::DivisibleBy); + functions.add_builtin("even", 1, Bytecode::Op::Even); + functions.add_builtin("first", 1, Bytecode::Op::First); + functions.add_builtin("float", 1, Bytecode::Op::Float); + functions.add_builtin("int", 1, Bytecode::Op::Int); + functions.add_builtin("last", 1, Bytecode::Op::Last); + functions.add_builtin("length", 1, Bytecode::Op::Length); + functions.add_builtin("lower", 1, Bytecode::Op::Lower); + functions.add_builtin("max", 1, Bytecode::Op::Max); + functions.add_builtin("min", 1, Bytecode::Op::Min); + functions.add_builtin("odd", 1, Bytecode::Op::Odd); + functions.add_builtin("range", 1, Bytecode::Op::Range); + functions.add_builtin("round", 2, Bytecode::Op::Round); + functions.add_builtin("sort", 1, Bytecode::Op::Sort); + functions.add_builtin("upper", 1, Bytecode::Op::Upper); + functions.add_builtin("exists", 1, Bytecode::Op::Exists); + functions.add_builtin("existsIn", 2, Bytecode::Op::ExistsInObject); + functions.add_builtin("isBoolean", 1, Bytecode::Op::IsBoolean); + functions.add_builtin("isNumber", 1, Bytecode::Op::IsNumber); + functions.add_builtin("isInteger", 1, Bytecode::Op::IsInteger); + functions.add_builtin("isFloat", 1, Bytecode::Op::IsFloat); + functions.add_builtin("isObject", 1, Bytecode::Op::IsObject); + functions.add_builtin("isArray", 1, Bytecode::Op::IsArray); + functions.add_builtin("isString", 1, Bytecode::Op::IsString); + } + + public: + ParserStatic(const ParserStatic&) = delete; + ParserStatic& operator=(const ParserStatic&) = delete; + + static const ParserStatic& get_instance() { + static ParserStatic inst; + return inst; + } + + FunctionStorage functions; +}; + +/*! + * \brief Class for parsing an inja Template. + */ +class Parser { + public: + explicit Parser(const ParserConfig& parser_config, const LexerConfig& lexer_config, TemplateStorage& included_templates): m_config(parser_config), m_lexer(lexer_config), m_included_templates(included_templates), m_static(ParserStatic::get_instance()) { } + + bool parse_expression(Template& tmpl) { + if (!parse_expression_and(tmpl)) return false; + if (m_tok.kind != Token::Kind::Id || m_tok.text != static_cast("or")) return true; + get_next_token(); + if (!parse_expression_and(tmpl)) return false; + append_function(tmpl, Bytecode::Op::Or, 2); + return true; + } + + bool parse_expression_and(Template& tmpl) { + if (!parse_expression_not(tmpl)) return false; + if (m_tok.kind != Token::Kind::Id || m_tok.text != static_cast("and")) return true; + get_next_token(); + if (!parse_expression_not(tmpl)) return false; + append_function(tmpl, Bytecode::Op::And, 2); + return true; + } + + bool parse_expression_not(Template& tmpl) { + if (m_tok.kind == Token::Kind::Id && m_tok.text == static_cast("not")) { + get_next_token(); + if (!parse_expression_not(tmpl)) return false; + append_function(tmpl, Bytecode::Op::Not, 1); + return true; + } else { + return parse_expression_comparison(tmpl); + } + } + + bool parse_expression_comparison(Template& tmpl) { + if (!parse_expression_datum(tmpl)) return false; + Bytecode::Op op; + switch (m_tok.kind) { + case Token::Kind::Id: + if (m_tok.text == static_cast("in")) + op = Bytecode::Op::In; + else + return true; + break; + case Token::Kind::Equal: + op = Bytecode::Op::Equal; + break; + case Token::Kind::GreaterThan: + op = Bytecode::Op::Greater; + break; + case Token::Kind::LessThan: + op = Bytecode::Op::Less; + break; + case Token::Kind::LessEqual: + op = Bytecode::Op::LessEqual; + break; + case Token::Kind::GreaterEqual: + op = Bytecode::Op::GreaterEqual; + break; + case Token::Kind::NotEqual: + op = Bytecode::Op::Different; + break; + default: + return true; + } + get_next_token(); + if (!parse_expression_datum(tmpl)) return false; + append_function(tmpl, op, 2); + return true; + } + + bool parse_expression_datum(Template& tmpl) { + nonstd::string_view json_first; + size_t bracket_level = 0; + size_t brace_level = 0; + + for (;;) { + switch (m_tok.kind) { + case Token::Kind::LeftParen: { + get_next_token(); + if (!parse_expression(tmpl)) return false; + if (m_tok.kind != Token::Kind::RightParen) { + inja_throw("parser_error", "unmatched '('"); + } + get_next_token(); + return true; + } + case Token::Kind::Id: + get_peek_token(); + if (m_peek_tok.kind == Token::Kind::LeftParen) { + // function call, parse arguments + Token func_token = m_tok; + get_next_token(); // id + get_next_token(); // leftParen + unsigned int num_args = 0; + if (m_tok.kind == Token::Kind::RightParen) { + // no args + get_next_token(); + } else { + for (;;) { + if (!parse_expression(tmpl)) { + inja_throw("parser_error", "expected expression, got '" + m_tok.describe() + "'"); + } + num_args += 1; + if (m_tok.kind == Token::Kind::RightParen) { + get_next_token(); + break; + } + if (m_tok.kind != Token::Kind::Comma) { + inja_throw("parser_error", "expected ')' or ',', got '" + m_tok.describe() + "'"); + } + get_next_token(); + } + } + + auto op = m_static.functions.find_builtin(func_token.text, num_args); + + if (op != Bytecode::Op::Nop) { + // swap arguments for default(); see comment in RenderTo() + if (op == Bytecode::Op::Default) + std::swap(tmpl.bytecodes.back(), *(tmpl.bytecodes.rbegin() + 1)); + append_function(tmpl, op, num_args); + return true; + } else { + append_callback(tmpl, func_token.text, num_args); + return true; + } + } else if (m_tok.text == static_cast("true") || + m_tok.text == static_cast("false") || + m_tok.text == static_cast("null")) { + // true, false, null are json literals + if (brace_level == 0 && bracket_level == 0) { + json_first = m_tok.text; + goto returnJson; + } + break; + } else { + // normal literal (json read) + tmpl.bytecodes.emplace_back( + Bytecode::Op::Push, m_tok.text, + m_config.notation == ElementNotation::Pointer ? Bytecode::Flag::ValueLookupPointer : Bytecode::Flag::ValueLookupDot); + get_next_token(); + return true; + } + // json passthrough + case Token::Kind::Number: + case Token::Kind::String: + if (brace_level == 0 && bracket_level == 0) { + json_first = m_tok.text; + goto returnJson; + } + break; + case Token::Kind::Comma: + case Token::Kind::Colon: + if (brace_level == 0 && bracket_level == 0) { + inja_throw("parser_error", "unexpected token '" + m_tok.describe() + "'"); + } + break; + case Token::Kind::LeftBracket: + if (brace_level == 0 && bracket_level == 0) { + json_first = m_tok.text; + } + bracket_level += 1; + break; + case Token::Kind::LeftBrace: + if (brace_level == 0 && bracket_level == 0) { + json_first = m_tok.text; + } + brace_level += 1; + break; + case Token::Kind::RightBracket: + if (bracket_level == 0) { + inja_throw("parser_error", "unexpected ']'"); + } + --bracket_level; + if (brace_level == 0 && bracket_level == 0) goto returnJson; + break; + case Token::Kind::RightBrace: + if (brace_level == 0) { + inja_throw("parser_error", "unexpected '}'"); + } + --brace_level; + if (brace_level == 0 && bracket_level == 0) goto returnJson; + break; + default: + if (brace_level != 0) { + inja_throw("parser_error", "unmatched '{'"); + } + if (bracket_level != 0) { + inja_throw("parser_error", "unmatched '['"); + } + return false; + } + + get_next_token(); + } + + returnJson: + // bridge across all intermediate tokens + nonstd::string_view json_text(json_first.data(), m_tok.text.data() - json_first.data() + m_tok.text.size()); + tmpl.bytecodes.emplace_back(Bytecode::Op::Push, json::parse(json_text), Bytecode::Flag::ValueImmediate); + get_next_token(); + return true; + } + + bool parse_statement(Template& tmpl, nonstd::string_view path) { + if (m_tok.kind != Token::Kind::Id) return false; + + if (m_tok.text == static_cast("if")) { + get_next_token(); + + // evaluate expression + if (!parse_expression(tmpl)) return false; + + // start a new if block on if stack + m_if_stack.emplace_back(tmpl.bytecodes.size()); + + // conditional jump; destination will be filled in by else or endif + tmpl.bytecodes.emplace_back(Bytecode::Op::ConditionalJump); + } else if (m_tok.text == static_cast("endif")) { + if (m_if_stack.empty()) { + inja_throw("parser_error", "endif without matching if"); + } + auto& if_data = m_if_stack.back(); + get_next_token(); + + // previous conditional jump jumps here + if (if_data.prev_cond_jump != std::numeric_limits::max()) { + tmpl.bytecodes[if_data.prev_cond_jump].args = tmpl.bytecodes.size(); + } + + // update all previous unconditional jumps to here + for (unsigned int i: if_data.uncond_jumps) { + tmpl.bytecodes[i].args = tmpl.bytecodes.size(); + } + + // pop if stack + m_if_stack.pop_back(); + } else if (m_tok.text == static_cast("else")) { + if (m_if_stack.empty()) + inja_throw("parser_error", "else without matching if"); + auto& if_data = m_if_stack.back(); + get_next_token(); + + // end previous block with unconditional jump to endif; destination will be + // filled in by endif + if_data.uncond_jumps.push_back(tmpl.bytecodes.size()); + tmpl.bytecodes.emplace_back(Bytecode::Op::Jump); + + // previous conditional jump jumps here + tmpl.bytecodes[if_data.prev_cond_jump].args = tmpl.bytecodes.size(); + if_data.prev_cond_jump = std::numeric_limits::max(); + + // chained else if + if (m_tok.kind == Token::Kind::Id && m_tok.text == static_cast("if")) { + get_next_token(); + + // evaluate expression + if (!parse_expression(tmpl)) return false; + + // update "previous jump" + if_data.prev_cond_jump = tmpl.bytecodes.size(); + + // conditional jump; destination will be filled in by else or endif + tmpl.bytecodes.emplace_back(Bytecode::Op::ConditionalJump); + } + } else if (m_tok.text == static_cast("for")) { + get_next_token(); + + // options: for a in arr; for a, b in obj + if (m_tok.kind != Token::Kind::Id) + inja_throw("parser_error", "expected id, got '" + m_tok.describe() + "'"); + Token value_token = m_tok; + get_next_token(); + + Token key_token; + if (m_tok.kind == Token::Kind::Comma) { + get_next_token(); + if (m_tok.kind != Token::Kind::Id) + inja_throw("parser_error", "expected id, got '" + m_tok.describe() + "'"); + key_token = std::move(value_token); + value_token = m_tok; + get_next_token(); + } + + if (m_tok.kind != Token::Kind::Id || m_tok.text != static_cast("in")) + inja_throw("parser_error", + "expected 'in', got '" + m_tok.describe() + "'"); + get_next_token(); + + if (!parse_expression(tmpl)) return false; + + m_loop_stack.push_back(tmpl.bytecodes.size()); + + tmpl.bytecodes.emplace_back(Bytecode::Op::StartLoop); + if (!key_token.text.empty()) { + tmpl.bytecodes.back().value = key_token.text; + } + tmpl.bytecodes.back().str = static_cast(value_token.text); + } else if (m_tok.text == static_cast("endfor")) { + get_next_token(); + if (m_loop_stack.empty()) { + inja_throw("parser_error", "endfor without matching for"); + } + + // update loop with EndLoop index (for empty case) + tmpl.bytecodes[m_loop_stack.back()].args = tmpl.bytecodes.size(); + + tmpl.bytecodes.emplace_back(Bytecode::Op::EndLoop); + tmpl.bytecodes.back().args = m_loop_stack.back() + 1; // loop body + m_loop_stack.pop_back(); + } else if (m_tok.text == static_cast("include")) { + get_next_token(); + + if (m_tok.kind != Token::Kind::String) { + inja_throw("parser_error", "expected string, got '" + m_tok.describe() + "'"); + } + + // build the relative path + json json_name = json::parse(m_tok.text); + std::string pathname = static_cast(path); + pathname += json_name.get_ref(); + if (pathname.compare(0, 2, "./") == 0) { + pathname.erase(0, 2); + } + // sys::path::remove_dots(pathname, true, sys::path::Style::posix); + + if (m_included_templates.find(pathname) == m_included_templates.end()) { + Template include_template = parse_template(pathname); + m_included_templates.emplace(pathname, include_template); + } + + // generate a reference bytecode + tmpl.bytecodes.emplace_back(Bytecode::Op::Include, json(pathname), Bytecode::Flag::ValueImmediate); + + get_next_token(); + } else { + return false; + } + return true; + } + + void append_function(Template& tmpl, Bytecode::Op op, unsigned int num_args) { + // we can merge with back-to-back push + if (!tmpl.bytecodes.empty()) { + Bytecode& last = tmpl.bytecodes.back(); + if (last.op == Bytecode::Op::Push) { + last.op = op; + last.args = num_args; + return; + } + } + + // otherwise just add it to the end + tmpl.bytecodes.emplace_back(op, num_args); + } + + void append_callback(Template& tmpl, nonstd::string_view name, unsigned int num_args) { + // we can merge with back-to-back push value (not lookup) + if (!tmpl.bytecodes.empty()) { + Bytecode& last = tmpl.bytecodes.back(); + if (last.op == Bytecode::Op::Push && + (last.flags & Bytecode::Flag::ValueMask) == Bytecode::Flag::ValueImmediate) { + last.op = Bytecode::Op::Callback; + last.args = num_args; + last.str = static_cast(name); + return; + } + } + + // otherwise just add it to the end + tmpl.bytecodes.emplace_back(Bytecode::Op::Callback, num_args); + tmpl.bytecodes.back().str = static_cast(name); + } + + void parse_into(Template& tmpl, nonstd::string_view path) { + m_lexer.start(tmpl.content); + + for (;;) { + get_next_token(); + switch (m_tok.kind) { + case Token::Kind::Eof: + if (!m_if_stack.empty()) inja_throw("parser_error", "unmatched if"); + if (!m_loop_stack.empty()) inja_throw("parser_error", "unmatched for"); + return; + case Token::Kind::Text: + tmpl.bytecodes.emplace_back(Bytecode::Op::PrintText, m_tok.text, 0u); + break; + case Token::Kind::StatementOpen: + get_next_token(); + if (!parse_statement(tmpl, path)) { + inja_throw("parser_error", "expected statement, got '" + m_tok.describe() + "'"); + } + if (m_tok.kind != Token::Kind::StatementClose) { + inja_throw("parser_error", "expected statement close, got '" + m_tok.describe() + "'"); + } + break; + case Token::Kind::LineStatementOpen: + get_next_token(); + parse_statement(tmpl, path); + if (m_tok.kind != Token::Kind::LineStatementClose && + m_tok.kind != Token::Kind::Eof) { + inja_throw("parser_error", "expected line statement close, got '" + m_tok.describe() + "'"); + } + break; + case Token::Kind::ExpressionOpen: + get_next_token(); + if (!parse_expression(tmpl)) { + inja_throw("parser_error", "expected expression, got '" + m_tok.describe() + "'"); + } + append_function(tmpl, Bytecode::Op::PrintValue, 1); + if (m_tok.kind != Token::Kind::ExpressionClose) { + inja_throw("parser_error", "expected expression close, got '" + m_tok.describe() + "'"); + } + break; + case Token::Kind::CommentOpen: + get_next_token(); + if (m_tok.kind != Token::Kind::CommentClose) { + inja_throw("parser_error", "expected comment close, got '" + m_tok.describe() + "'"); + } + break; + default: + inja_throw("parser_error", "unexpected token '" + m_tok.describe() + "'"); + break; + } + } + } + + Template parse(nonstd::string_view input, nonstd::string_view path) { + Template result; + result.content = static_cast(input); + parse_into(result, path); + return result; + } + + Template parse(nonstd::string_view input) { + return parse(input, "./"); + } + + Template parse_template(nonstd::string_view filename) { + Template result; + result.content = load_file(filename); + + nonstd::string_view path = filename.substr(0, filename.find_last_of("/\\") + 1); + // StringRef path = sys::path::parent_path(filename); + Parser(m_config, m_lexer.get_config(), m_included_templates).parse_into(result, path); + return result; + } + + std::string load_file(nonstd::string_view filename) { + std::ifstream file = open_file_or_throw(static_cast(filename)); + std::string text((std::istreambuf_iterator(file)), std::istreambuf_iterator()); + return text; + } + + private: + const ParserConfig& m_config; + Lexer m_lexer; + Token m_tok; + Token m_peek_tok; + bool m_have_peek_tok {false}; + TemplateStorage& m_included_templates; + const ParserStatic& m_static; + + struct IfData { + unsigned int prev_cond_jump; + std::vector uncond_jumps; + + explicit IfData(unsigned int condJump): prev_cond_jump(condJump) {} + }; + + std::vector m_if_stack; + std::vector m_loop_stack; + + void get_next_token() { + if (m_have_peek_tok) { + m_tok = m_peek_tok; + m_have_peek_tok = false; + } else { + m_tok = m_lexer.scan(); + } + } + + void get_peek_token() { + if (!m_have_peek_tok) { + m_peek_tok = m_lexer.scan(); + m_have_peek_tok = true; + } + } +}; + +} // namespace inja + +#endif // PANTOR_INJA_PARSER_HPP + +// #include "polyfill.hpp" +#ifndef PANTOR_INJA_POLYFILL_HPP +#define PANTOR_INJA_POLYFILL_HPP + + +#if __cplusplus < 201402L + +#include +#include +#include +#include + + +namespace stdinja { + template struct _Unique_if { + typedef std::unique_ptr _Single_object; + }; + + template struct _Unique_if { + typedef std::unique_ptr _Unknown_bound; + }; + + template struct _Unique_if { + typedef void _Known_bound; + }; + + template + typename _Unique_if::_Single_object + make_unique(Args&&... args) { + return std::unique_ptr(new T(std::forward(args)...)); + } + + template + typename _Unique_if::_Unknown_bound + make_unique(size_t n) { + typedef typename std::remove_extent::type U; + return std::unique_ptr(new U[n]()); + } + + template + typename _Unique_if::_Known_bound + make_unique(Args&&...) = delete; +} + +#else + +namespace stdinja = std; + +#endif // memory */ + + +#endif // PANTOR_INJA_POLYFILL_HPP + +// #include "renderer.hpp" +#ifndef PANTOR_INJA_RENDERER_HPP +#define PANTOR_INJA_RENDERER_HPP + +#include +#include +#include +#include +#include + +#include + +// #include "bytecode.hpp" + +// #include "template.hpp" + +// #include "utils.hpp" + + + +namespace inja { + +inline nonstd::string_view convert_dot_to_json_pointer(nonstd::string_view dot, std::string& out) { + out.clear(); + do { + nonstd::string_view part; + std::tie(part, dot) = string_view::split(dot, '.'); + out.push_back('/'); + out.append(part.begin(), part.end()); + } while (!dot.empty()); + return nonstd::string_view(out.data(), out.size()); +} + +/*! + * \brief Class for rendering a Template with data. + */ +class Renderer { + std::vector& get_args(const Bytecode& bc) { + m_tmp_args.clear(); + + bool has_imm = ((bc.flags & Bytecode::Flag::ValueMask) != Bytecode::Flag::ValuePop); + + // get args from stack + unsigned int pop_args = bc.args; + if (has_imm) { + pop_args -= 1; + } + + for (auto i = std::prev(m_stack.end(), pop_args); i != m_stack.end(); i++) { + m_tmp_args.push_back(&(*i)); + } + + // get immediate arg + if (has_imm) { + m_tmp_args.push_back(get_imm(bc)); + } + + return m_tmp_args; + } + + void pop_args(const Bytecode& bc) { + unsigned int popArgs = bc.args; + if ((bc.flags & Bytecode::Flag::ValueMask) != Bytecode::Flag::ValuePop) { + popArgs -= 1; + } + for (unsigned int i = 0; i < popArgs; ++i) { + m_stack.pop_back(); + } + } + + const json* get_imm(const Bytecode& bc) { + std::string ptr_buffer; + nonstd::string_view ptr; + switch (bc.flags & Bytecode::Flag::ValueMask) { + case Bytecode::Flag::ValuePop: + return nullptr; + case Bytecode::Flag::ValueImmediate: + return &bc.value; + case Bytecode::Flag::ValueLookupDot: + ptr = convert_dot_to_json_pointer(bc.str, ptr_buffer); + break; + case Bytecode::Flag::ValueLookupPointer: + ptr_buffer += '/'; + ptr_buffer += bc.str; + ptr = ptr_buffer; + break; + } + try { + return &m_data->at(json::json_pointer(ptr.data())); + } catch (std::exception&) { + // try to evaluate as a no-argument callback + if (auto callback = m_callbacks.find_callback(bc.str, 0)) { + std::vector arguments {}; + m_tmp_val = callback(arguments); + return &m_tmp_val; + } + inja_throw("render_error", "variable '" + static_cast(bc.str) + "' not found"); + return nullptr; + } + } + + bool truthy(const json& var) const { + if (var.empty()) { + return false; + } else if (var.is_number()) { + return (var != 0); + } else if (var.is_string()) { + return !var.empty(); + } + + try { + return var.get(); + } catch (json::type_error& e) { + inja_throw("json_error", e.what()); + throw; + } + } + + void update_loop_data() { + LoopLevel& level = m_loop_stack.back(); + + if (level.loop_type == LoopLevel::Type::Array) { + level.data[static_cast(level.value_name)] = level.values.at(level.index); // *level.it; + auto& loopData = level.data["loop"]; + loopData["index"] = level.index; + loopData["index1"] = level.index + 1; + loopData["is_first"] = (level.index == 0); + loopData["is_last"] = (level.index == level.size - 1); + } else { + level.data[static_cast(level.key_name)] = level.map_it->first; + level.data[static_cast(level.value_name)] = *level.map_it->second; + } + } + + const TemplateStorage& m_included_templates; + const FunctionStorage& m_callbacks; + + std::vector m_stack; + + + struct LoopLevel { + enum class Type { Map, Array }; + + Type loop_type; + nonstd::string_view key_name; // variable name for keys + nonstd::string_view value_name; // variable name for values + json data; // data with loop info added + + json values; // values to iterate over + + // loop over list + size_t index; // current list index + size_t size; // length of list + + // loop over map + using KeyValue = std::pair; + using MapValues = std::vector; + MapValues map_values; // values to iterate over + MapValues::iterator map_it; // iterator over values + + }; + + std::vector m_loop_stack; + const json* m_data; + + std::vector m_tmp_args; + json m_tmp_val; + + + public: + Renderer(const TemplateStorage& included_templates, const FunctionStorage& callbacks): m_included_templates(included_templates), m_callbacks(callbacks) { + m_stack.reserve(16); + m_tmp_args.reserve(4); + m_loop_stack.reserve(16); + } + + void render_to(std::ostream& os, const Template& tmpl, const json& data) { + m_data = &data; + + for (size_t i = 0; i < tmpl.bytecodes.size(); ++i) { + const auto& bc = tmpl.bytecodes[i]; + + switch (bc.op) { + case Bytecode::Op::Nop: { + break; + } + case Bytecode::Op::PrintText: { + os << bc.str; + break; + } + case Bytecode::Op::PrintValue: { + const json& val = *get_args(bc)[0]; + if (val.is_string()) { + os << val.get_ref(); + } else { + os << val.dump(); + } + pop_args(bc); + break; + } + case Bytecode::Op::Push: { + m_stack.emplace_back(*get_imm(bc)); + break; + } + case Bytecode::Op::Upper: { + auto result = get_args(bc)[0]->get(); + std::transform(result.begin(), result.end(), result.begin(), ::toupper); + pop_args(bc); + m_stack.emplace_back(std::move(result)); + break; + } + case Bytecode::Op::Lower: { + auto result = get_args(bc)[0]->get(); + std::transform(result.begin(), result.end(), result.begin(), ::tolower); + pop_args(bc); + m_stack.emplace_back(std::move(result)); + break; + } + case Bytecode::Op::Range: { + int number = get_args(bc)[0]->get(); + std::vector result(number); + std::iota(std::begin(result), std::end(result), 0); + pop_args(bc); + m_stack.emplace_back(std::move(result)); + break; + } + case Bytecode::Op::Length: { + const json& val = *get_args(bc)[0]; + + int result; + if (val.is_string()) { + result = val.get_ref().length(); + } else { + result = val.size(); + } + + pop_args(bc); + m_stack.emplace_back(result); + break; + } + case Bytecode::Op::Sort: { + auto result = get_args(bc)[0]->get>(); + std::sort(result.begin(), result.end()); + pop_args(bc); + m_stack.emplace_back(std::move(result)); + break; + } + case Bytecode::Op::At: { + auto args = get_args(bc); + auto result = args[0]->at(args[1]->get()); + pop_args(bc); + m_stack.emplace_back(result); + break; + } + case Bytecode::Op::First: { + auto result = get_args(bc)[0]->front(); + pop_args(bc); + m_stack.emplace_back(result); + break; + } + case Bytecode::Op::Last: { + auto result = get_args(bc)[0]->back(); + pop_args(bc); + m_stack.emplace_back(result); + break; + } + case Bytecode::Op::Round: { + auto args = get_args(bc); + double number = args[0]->get(); + int precision = args[1]->get(); + pop_args(bc); + m_stack.emplace_back(std::round(number * std::pow(10.0, precision)) / std::pow(10.0, precision)); + break; + } + case Bytecode::Op::DivisibleBy: { + auto args = get_args(bc); + int number = args[0]->get(); + int divisor = args[1]->get(); + pop_args(bc); + m_stack.emplace_back((divisor != 0) && (number % divisor == 0)); + break; + } + case Bytecode::Op::Odd: { + int number = get_args(bc)[0]->get(); + pop_args(bc); + m_stack.emplace_back(number % 2 != 0); + break; + } + case Bytecode::Op::Even: { + int number = get_args(bc)[0]->get(); + pop_args(bc); + m_stack.emplace_back(number % 2 == 0); + break; + } + case Bytecode::Op::Max: { + auto args = get_args(bc); + auto result = *std::max_element(args[0]->begin(), args[0]->end()); + pop_args(bc); + m_stack.emplace_back(std::move(result)); + break; + } + case Bytecode::Op::Min: { + auto args = get_args(bc); + auto result = *std::min_element(args[0]->begin(), args[0]->end()); + pop_args(bc); + m_stack.emplace_back(std::move(result)); + break; + } + case Bytecode::Op::Not: { + bool result = !truthy(*get_args(bc)[0]); + pop_args(bc); + m_stack.emplace_back(result); + break; + } + case Bytecode::Op::And: { + auto args = get_args(bc); + bool result = truthy(*args[0]) && truthy(*args[1]); + pop_args(bc); + m_stack.emplace_back(result); + break; + } + case Bytecode::Op::Or: { + auto args = get_args(bc); + bool result = truthy(*args[0]) || truthy(*args[1]); + pop_args(bc); + m_stack.emplace_back(result); + break; + } + case Bytecode::Op::In: { + auto args = get_args(bc); + bool result = std::find(args[1]->begin(), args[1]->end(), *args[0]) != + args[1]->end(); + pop_args(bc); + m_stack.emplace_back(result); + break; + } + case Bytecode::Op::Equal: { + auto args = get_args(bc); + bool result = (*args[0] == *args[1]); + pop_args(bc); + m_stack.emplace_back(result); + break; + } + case Bytecode::Op::Greater: { + auto args = get_args(bc); + bool result = (*args[0] > *args[1]); + pop_args(bc); + m_stack.emplace_back(result); + break; + } + case Bytecode::Op::Less: { + auto args = get_args(bc); + bool result = (*args[0] < *args[1]); + pop_args(bc); + m_stack.emplace_back(result); + break; + } + case Bytecode::Op::GreaterEqual: { + auto args = get_args(bc); + bool result = (*args[0] >= *args[1]); + pop_args(bc); + m_stack.emplace_back(result); + break; + } + case Bytecode::Op::LessEqual: { + auto args = get_args(bc); + bool result = (*args[0] <= *args[1]); + pop_args(bc); + m_stack.emplace_back(result); + break; + } + case Bytecode::Op::Different: { + auto args = get_args(bc); + bool result = (*args[0] != *args[1]); + pop_args(bc); + m_stack.emplace_back(result); + break; + } + case Bytecode::Op::Float: { + double result = + std::stod(get_args(bc)[0]->get_ref()); + pop_args(bc); + m_stack.emplace_back(result); + break; + } + case Bytecode::Op::Int: { + int result = std::stoi(get_args(bc)[0]->get_ref()); + pop_args(bc); + m_stack.emplace_back(result); + break; + } + case Bytecode::Op::Exists: { + auto&& name = get_args(bc)[0]->get_ref(); + bool result = (data.find(name) != data.end()); + pop_args(bc); + m_stack.emplace_back(result); + break; + } + case Bytecode::Op::ExistsInObject: { + auto args = get_args(bc); + auto&& name = args[1]->get_ref(); + bool result = (args[0]->find(name) != args[0]->end()); + pop_args(bc); + m_stack.emplace_back(result); + break; + } + case Bytecode::Op::IsBoolean: { + bool result = get_args(bc)[0]->is_boolean(); + pop_args(bc); + m_stack.emplace_back(result); + break; + } + case Bytecode::Op::IsNumber: { + bool result = get_args(bc)[0]->is_number(); + pop_args(bc); + m_stack.emplace_back(result); + break; + } + case Bytecode::Op::IsInteger: { + bool result = get_args(bc)[0]->is_number_integer(); + pop_args(bc); + m_stack.emplace_back(result); + break; + } + case Bytecode::Op::IsFloat: { + bool result = get_args(bc)[0]->is_number_float(); + pop_args(bc); + m_stack.emplace_back(result); + break; + } + case Bytecode::Op::IsObject: { + bool result = get_args(bc)[0]->is_object(); + pop_args(bc); + m_stack.emplace_back(result); + break; + } + case Bytecode::Op::IsArray: { + bool result = get_args(bc)[0]->is_array(); + pop_args(bc); + m_stack.emplace_back(result); + break; + } + case Bytecode::Op::IsString: { + bool result = get_args(bc)[0]->is_string(); + pop_args(bc); + m_stack.emplace_back(result); + break; + } + case Bytecode::Op::Default: { + // default needs to be a bit "magic"; we can't evaluate the first + // argument during the push operation, so we swap the arguments during + // the parse phase so the second argument is pushed on the stack and + // the first argument is in the immediate + try { + const json* imm = get_imm(bc); + // if no exception was raised, replace the stack value with it + m_stack.back() = *imm; + } catch (std::exception&) { + // couldn't read immediate, just leave the stack as is + } + break; + } + case Bytecode::Op::Include: + Renderer(m_included_templates, m_callbacks).render_to(os, m_included_templates.find(get_imm(bc)->get_ref())->second, *m_data); + break; + case Bytecode::Op::Callback: { + auto callback = m_callbacks.find_callback(bc.str, bc.args); + if (!callback) { + inja_throw("render_error", "function '" + static_cast(bc.str) + "' (" + std::to_string(static_cast(bc.args)) + ") not found"); + } + json result = callback(get_args(bc)); + pop_args(bc); + m_stack.emplace_back(std::move(result)); + break; + } + case Bytecode::Op::Jump: { + i = bc.args - 1; // -1 due to ++i in loop + break; + } + case Bytecode::Op::ConditionalJump: { + if (!truthy(m_stack.back())) { + i = bc.args - 1; // -1 due to ++i in loop + } + m_stack.pop_back(); + break; + } + case Bytecode::Op::StartLoop: { + // jump past loop body if empty + if (m_stack.back().empty()) { + m_stack.pop_back(); + i = bc.args; // ++i in loop will take it past EndLoop + break; + } + + m_loop_stack.emplace_back(); + LoopLevel& level = m_loop_stack.back(); + level.value_name = bc.str; + level.values = std::move(m_stack.back()); + level.data = (*m_data); + m_stack.pop_back(); + + if (bc.value.is_string()) { + // map iterator + if (!level.values.is_object()) { + m_loop_stack.pop_back(); + inja_throw("render_error", "for key, value requires object"); + } + level.loop_type = LoopLevel::Type::Map; + level.key_name = bc.value.get_ref(); + + // sort by key + for (auto it = level.values.begin(), end = level.values.end(); it != end; ++it) { + level.map_values.emplace_back(it.key(), &it.value()); + } + std::sort(level.map_values.begin(), level.map_values.end(), [](const LoopLevel::KeyValue& a, const LoopLevel::KeyValue& b) { return a.first < b.first; }); + level.map_it = level.map_values.begin(); + } else { + if (!level.values.is_array()) { + m_loop_stack.pop_back(); + inja_throw("render_error", "type must be array"); + } + + // list iterator + level.loop_type = LoopLevel::Type::Array; + level.index = 0; + level.size = level.values.size(); + } + + // provide parent access in nested loop + auto parent_loop_it = level.data.find("loop"); + if (parent_loop_it != level.data.end()) { + json loop_copy = *parent_loop_it; + (*parent_loop_it)["parent"] = std::move(loop_copy); + } + + // set "current" data to loop data + m_data = &level.data; + update_loop_data(); + break; + } + case Bytecode::Op::EndLoop: { + if (m_loop_stack.empty()) { + inja_throw("render_error", "unexpected state in renderer"); + } + LoopLevel& level = m_loop_stack.back(); + + bool done; + if (level.loop_type == LoopLevel::Type::Array) { + level.index += 1; + done = (level.index == level.values.size()); + } else { + level.map_it += 1; + done = (level.map_it == level.map_values.end()); + } + + if (done) { + m_loop_stack.pop_back(); + // set "current" data to outer loop data or main data as appropriate + if (!m_loop_stack.empty()) { + m_data = &m_loop_stack.back().data; + } else { + m_data = &data; + } + break; + } + + update_loop_data(); + + // jump back to start of loop + i = bc.args - 1; // -1 due to ++i in loop + break; + } + default: { + inja_throw("render_error", "unknown op in renderer: " + std::to_string(static_cast(bc.op))); + } + } + } + } +}; + +} // namespace inja + +#endif // PANTOR_INJA_RENDERER_HPP + +// #include "string_view.hpp" + +// #include "template.hpp" + +// #include "utils.hpp" + + + +namespace inja { + +using namespace nlohmann; + +/*! + * \brief Class for changing the configuration. + */ +class Environment { + class Impl { + public: + std::string input_path; + std::string output_path; + + LexerConfig lexer_config; + ParserConfig parser_config; + + FunctionStorage callbacks; + TemplateStorage included_templates; + }; + + std::unique_ptr m_impl; + + public: + Environment(): Environment("") { } + + explicit Environment(const std::string& global_path): m_impl(stdinja::make_unique()) { + m_impl->input_path = global_path; + m_impl->output_path = global_path; + } + + explicit Environment(const std::string& input_path, const std::string& output_path): m_impl(stdinja::make_unique()) { + m_impl->input_path = input_path; + m_impl->output_path = output_path; + } + + /// Sets the opener and closer for template statements + void set_statement(const std::string& open, const std::string& close) { + m_impl->lexer_config.statement_open = open; + m_impl->lexer_config.statement_close = close; + m_impl->lexer_config.update_open_chars(); + } + + /// Sets the opener for template line statements + void set_line_statement(const std::string& open) { + m_impl->lexer_config.line_statement = open; + m_impl->lexer_config.update_open_chars(); + } + + /// Sets the opener and closer for template expressions + void set_expression(const std::string& open, const std::string& close) { + m_impl->lexer_config.expression_open = open; + m_impl->lexer_config.expression_close = close; + m_impl->lexer_config.update_open_chars(); + } + + /// Sets the opener and closer for template comments + void set_comment(const std::string& open, const std::string& close) { + m_impl->lexer_config.comment_open = open; + m_impl->lexer_config.comment_close = close; + m_impl->lexer_config.update_open_chars(); + } + + /// Sets whether to remove the first newline after a block + void set_trim_blocks(bool trim_blocks) { + m_impl->lexer_config.trim_blocks = trim_blocks; + } + + /// Sets whether to strip the spaces and tabs from the start of a line to a block + void set_lstrip_blocks(bool lstrip_blocks) { + m_impl->lexer_config.lstrip_blocks = lstrip_blocks; + } + + /// Sets the element notation syntax + void set_element_notation(ElementNotation notation) { + m_impl->parser_config.notation = notation; + } + + + Template parse(nonstd::string_view input) { + Parser parser(m_impl->parser_config, m_impl->lexer_config, m_impl->included_templates); + return parser.parse(input); + } + + Template parse_template(const std::string& filename) { + Parser parser(m_impl->parser_config, m_impl->lexer_config, m_impl->included_templates); + return parser.parse_template(m_impl->input_path + static_cast(filename)); + } + + std::string render(nonstd::string_view input, const json& data) { + return render(parse(input), data); + } + + std::string render(const Template& tmpl, const json& data) { + std::stringstream os; + render_to(os, tmpl, data); + return os.str(); + } + + std::string render_file(const std::string& filename, const json& data) { + return render(parse_template(filename), data); + } + + std::string render_file_with_json_file(const std::string& filename, const std::string& filename_data) { + const json data = load_json(filename_data); + return render_file(filename, data); + } + + void write(const std::string& filename, const json& data, const std::string& filename_out) { + std::ofstream file(m_impl->output_path + filename_out); + file << render_file(filename, data); + file.close(); + } + + void write(const Template& temp, const json& data, const std::string& filename_out) { + std::ofstream file(m_impl->output_path + filename_out); + file << render(temp, data); + file.close(); + } + + void write_with_json_file(const std::string& filename, const std::string& filename_data, const std::string& filename_out) { + const json data = load_json(filename_data); + write(filename, data, filename_out); + } + + void write_with_json_file(const Template& temp, const std::string& filename_data, const std::string& filename_out) { + const json data = load_json(filename_data); + write(temp, data, filename_out); + } + + std::ostream& render_to(std::ostream& os, const Template& tmpl, const json& data) { + Renderer(m_impl->included_templates, m_impl->callbacks).render_to(os, tmpl, data); + return os; + } + + std::string load_file(const std::string& filename) { + Parser parser(m_impl->parser_config, m_impl->lexer_config, m_impl->included_templates); + return parser.load_file(m_impl->input_path + filename); + } + + json load_json(const std::string& filename) { + std::ifstream file = open_file_or_throw(m_impl->input_path + filename); + json j; + file >> j; + return j; + } + + void add_callback(const std::string& name, unsigned int numArgs, const CallbackFunction& callback) { + m_impl->callbacks.add_callback(name, numArgs, callback); + } + + /** Includes a template with a given name into the environment. + * Then, a template can be rendered in another template using the + * include "" syntax. + */ + void include_template(const std::string& name, const Template& tmpl) { + m_impl->included_templates[name] = tmpl; + } +}; + +/*! +@brief render with default settings to a string +*/ +inline std::string render(nonstd::string_view input, const json& data) { + return Environment().render(input, data); +} + +/*! +@brief render with default settings to the given output stream +*/ +inline void render_to(std::ostream& os, nonstd::string_view input, const json& data) { + Environment env; + env.render_to(os, env.parse(input), data); +} + +} + +#endif // PANTOR_INJA_ENVIRONMENT_HPP + +// #include "string_view.hpp" + +// #include "template.hpp" + +// #include "parser.hpp" + +// #include "renderer.hpp" + + + +#endif // PANTOR_INJA_HPP diff --git a/tools/jsonproc/jsonproc.cpp b/tools/jsonproc/jsonproc.cpp index 2ba5fd0..5372194 100644 --- a/tools/jsonproc/jsonproc.cpp +++ b/tools/jsonproc/jsonproc.cpp @@ -1,109 +1,109 @@ -// jsonproc.cpp - -#include "jsonproc.h" - -#include - -#include -using std::string; using std::to_string; - -#include -using namespace inja; -using json = nlohmann::json; - -std::map customVars; - -void set_custom_var(string key, string value) -{ - customVars[key] = value; -} - -string get_custom_var(string key) -{ - return customVars[key]; -} - -int main(int argc, char *argv[]) -{ - if (argc != 4) - FATAL_ERROR("USAGE: jsonproc \n"); - - string jsonfilepath = argv[1]; - string templateFilepath = argv[2]; - string outputFilepath = argv[3]; - - Environment env; - - // Add custom command callbacks. - env.add_callback("doNotModifyHeader", 0, [jsonfilepath, templateFilepath](Arguments& args) { - return "//\n// DO NOT MODIFY THIS FILE! It is auto-generated from " + jsonfilepath +" and Inja template " + templateFilepath + "\n//\n"; - }); - - env.add_callback("subtract", 2, [](Arguments& args) { - int minuend = args.at(0)->get(); - int subtrahend = args.at(1)->get(); - - return minuend - subtrahend; - }); - - env.add_callback("setVar", 2, [=](Arguments& args) { - string key = args.at(0)->get(); - string value = args.at(1)->get(); - set_custom_var(key, value); - return ""; - }); - - env.add_callback("setVarInt", 2, [=](Arguments& args) { - string key = args.at(0)->get(); - string value = to_string(args.at(1)->get()); - set_custom_var(key, value); - return ""; - }); - - env.add_callback("getVar", 1, [=](Arguments& args) { - string key = args.at(0)->get(); - return get_custom_var(key); - }); - - env.add_callback("concat", 2, [](Arguments& args) { - string first = args.at(0)->get(); - string second = args.at(1)->get(); - return first + second; - }); - - env.add_callback("removePrefix", 2, [](Arguments& args) { - string rawValue = args.at(0)->get(); - string prefix = args.at(1)->get(); - string::size_type i = rawValue.find(prefix); - if (i != 0) - return rawValue; - - return rawValue.erase(0, prefix.length()); - }); - - env.add_callback("removeSuffix", 2, [](Arguments& args) { - string rawValue = args.at(0)->get(); - string suffix = args.at(1)->get(); - string::size_type i = rawValue.rfind(suffix); - if (i == string::npos) - return rawValue; - - return rawValue.substr(0, i); - }); - - // single argument is a json object - env.add_callback("isEmpty", 1, [](Arguments& args) { - return args.at(0)->empty(); - }); - - try - { - env.write_with_json_file(templateFilepath, jsonfilepath, outputFilepath); - } - catch (const std::exception& e) - { - FATAL_ERROR("JSONPROC_ERROR: %s\n", e.what()); - } - - return 0; -} +// jsonproc.cpp + +#include "jsonproc.h" + +#include + +#include +using std::string; using std::to_string; + +#include +using namespace inja; +using json = nlohmann::json; + +std::map customVars; + +void set_custom_var(string key, string value) +{ + customVars[key] = value; +} + +string get_custom_var(string key) +{ + return customVars[key]; +} + +int main(int argc, char *argv[]) +{ + if (argc != 4) + FATAL_ERROR("USAGE: jsonproc \n"); + + string jsonfilepath = argv[1]; + string templateFilepath = argv[2]; + string outputFilepath = argv[3]; + + Environment env; + + // Add custom command callbacks. + env.add_callback("doNotModifyHeader", 0, [jsonfilepath, templateFilepath](Arguments& args) { + return "//\n// DO NOT MODIFY THIS FILE! It is auto-generated from " + jsonfilepath +" and Inja template " + templateFilepath + "\n//\n"; + }); + + env.add_callback("subtract", 2, [](Arguments& args) { + int minuend = args.at(0)->get(); + int subtrahend = args.at(1)->get(); + + return minuend - subtrahend; + }); + + env.add_callback("setVar", 2, [=](Arguments& args) { + string key = args.at(0)->get(); + string value = args.at(1)->get(); + set_custom_var(key, value); + return ""; + }); + + env.add_callback("setVarInt", 2, [=](Arguments& args) { + string key = args.at(0)->get(); + string value = to_string(args.at(1)->get()); + set_custom_var(key, value); + return ""; + }); + + env.add_callback("getVar", 1, [=](Arguments& args) { + string key = args.at(0)->get(); + return get_custom_var(key); + }); + + env.add_callback("concat", 2, [](Arguments& args) { + string first = args.at(0)->get(); + string second = args.at(1)->get(); + return first + second; + }); + + env.add_callback("removePrefix", 2, [](Arguments& args) { + string rawValue = args.at(0)->get(); + string prefix = args.at(1)->get(); + string::size_type i = rawValue.find(prefix); + if (i != 0) + return rawValue; + + return rawValue.erase(0, prefix.length()); + }); + + env.add_callback("removeSuffix", 2, [](Arguments& args) { + string rawValue = args.at(0)->get(); + string suffix = args.at(1)->get(); + string::size_type i = rawValue.rfind(suffix); + if (i == string::npos) + return rawValue; + + return rawValue.substr(0, i); + }); + + // single argument is a json object + env.add_callback("isEmpty", 1, [](Arguments& args) { + return args.at(0)->empty(); + }); + + try + { + env.write_with_json_file(templateFilepath, jsonfilepath, outputFilepath); + } + catch (const std::exception& e) + { + FATAL_ERROR("JSONPROC_ERROR: %s\n", e.what()); + } + + return 0; +} diff --git a/tools/jsonproc/nlohmann/json.hpp b/tools/jsonproc/nlohmann/json.hpp index 5003a4f..b9000e7 100644 --- a/tools/jsonproc/nlohmann/json.hpp +++ b/tools/jsonproc/nlohmann/json.hpp @@ -1,20842 +1,20842 @@ -/* - __ _____ _____ _____ - __| | __| | | | JSON for Modern C++ -| | |__ | | | | | | version 3.6.1 -|_____|_____|_____|_|___| https://github.com/nlohmann/json - -Licensed under the MIT License . -SPDX-License-Identifier: MIT -Copyright (c) 2013-2019 Niels Lohmann . - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -*/ - -#ifndef INCLUDE_NLOHMANN_JSON_HPP_ -#define INCLUDE_NLOHMANN_JSON_HPP_ - -#define NLOHMANN_JSON_VERSION_MAJOR 3 -#define NLOHMANN_JSON_VERSION_MINOR 6 -#define NLOHMANN_JSON_VERSION_PATCH 1 - -#include // all_of, find, for_each -#include // assert -#include // and, not, or -#include // nullptr_t, ptrdiff_t, size_t -#include // hash, less -#include // initializer_list -#include // istream, ostream -#include // random_access_iterator_tag -#include // unique_ptr -#include // accumulate -#include // string, stoi, to_string -#include // declval, forward, move, pair, swap -#include // vector - -// #include - - -#include - -// #include - - -#include // transform -#include // array -#include // and, not -#include // forward_list -#include // inserter, front_inserter, end -#include // map -#include // string -#include // tuple, make_tuple -#include // is_arithmetic, is_same, is_enum, underlying_type, is_convertible -#include // unordered_map -#include // pair, declval -#include // valarray - -// #include - - -#include // exception -#include // runtime_error -#include // to_string - -// #include - - -#include // size_t - -namespace nlohmann -{ -namespace detail -{ -/// struct to capture the start position of the current token -struct position_t -{ - /// the total number of characters read - std::size_t chars_read_total = 0; - /// the number of characters read in the current line - std::size_t chars_read_current_line = 0; - /// the number of lines read - std::size_t lines_read = 0; - - /// conversion to size_t to preserve SAX interface - constexpr operator size_t() const - { - return chars_read_total; - } -}; - -} // namespace detail -} // namespace nlohmann - - -namespace nlohmann -{ -namespace detail -{ -//////////////// -// exceptions // -//////////////// - -/*! -@brief general exception of the @ref basic_json class - -This class is an extension of `std::exception` objects with a member @a id for -exception ids. It is used as the base class for all exceptions thrown by the -@ref basic_json class. This class can hence be used as "wildcard" to catch -exceptions. - -Subclasses: -- @ref parse_error for exceptions indicating a parse error -- @ref invalid_iterator for exceptions indicating errors with iterators -- @ref type_error for exceptions indicating executing a member function with - a wrong type -- @ref out_of_range for exceptions indicating access out of the defined range -- @ref other_error for exceptions indicating other library errors - -@internal -@note To have nothrow-copy-constructible exceptions, we internally use - `std::runtime_error` which can cope with arbitrary-length error messages. - Intermediate strings are built with static functions and then passed to - the actual constructor. -@endinternal - -@liveexample{The following code shows how arbitrary library exceptions can be -caught.,exception} - -@since version 3.0.0 -*/ -class exception : public std::exception -{ - public: - /// returns the explanatory string - const char* what() const noexcept override - { - return m.what(); - } - - /// the id of the exception - const int id; - - protected: - exception(int id_, const char* what_arg) : id(id_), m(what_arg) {} - - static std::string name(const std::string& ename, int id_) - { - return "[json.exception." + ename + "." + std::to_string(id_) + "] "; - } - - private: - /// an exception object as storage for error messages - std::runtime_error m; -}; - -/*! -@brief exception indicating a parse error - -This exception is thrown by the library when a parse error occurs. Parse errors -can occur during the deserialization of JSON text, CBOR, MessagePack, as well -as when using JSON Patch. - -Member @a byte holds the byte index of the last read character in the input -file. - -Exceptions have ids 1xx. - -name / id | example message | description ------------------------------- | --------------- | ------------------------- -json.exception.parse_error.101 | parse error at 2: unexpected end of input; expected string literal | This error indicates a syntax error while deserializing a JSON text. The error message describes that an unexpected token (character) was encountered, and the member @a byte indicates the error position. -json.exception.parse_error.102 | parse error at 14: missing or wrong low surrogate | JSON uses the `\uxxxx` format to describe Unicode characters. Code points above above 0xFFFF are split into two `\uxxxx` entries ("surrogate pairs"). This error indicates that the surrogate pair is incomplete or contains an invalid code point. -json.exception.parse_error.103 | parse error: code points above 0x10FFFF are invalid | Unicode supports code points up to 0x10FFFF. Code points above 0x10FFFF are invalid. -json.exception.parse_error.104 | parse error: JSON patch must be an array of objects | [RFC 6902](https://tools.ietf.org/html/rfc6902) requires a JSON Patch document to be a JSON document that represents an array of objects. -json.exception.parse_error.105 | parse error: operation must have string member 'op' | An operation of a JSON Patch document must contain exactly one "op" member, whose value indicates the operation to perform. Its value must be one of "add", "remove", "replace", "move", "copy", or "test"; other values are errors. -json.exception.parse_error.106 | parse error: array index '01' must not begin with '0' | An array index in a JSON Pointer ([RFC 6901](https://tools.ietf.org/html/rfc6901)) may be `0` or any number without a leading `0`. -json.exception.parse_error.107 | parse error: JSON pointer must be empty or begin with '/' - was: 'foo' | A JSON Pointer must be a Unicode string containing a sequence of zero or more reference tokens, each prefixed by a `/` character. -json.exception.parse_error.108 | parse error: escape character '~' must be followed with '0' or '1' | In a JSON Pointer, only `~0` and `~1` are valid escape sequences. -json.exception.parse_error.109 | parse error: array index 'one' is not a number | A JSON Pointer array index must be a number. -json.exception.parse_error.110 | parse error at 1: cannot read 2 bytes from vector | When parsing CBOR or MessagePack, the byte vector ends before the complete value has been read. -json.exception.parse_error.112 | parse error at 1: error reading CBOR; last byte: 0xF8 | Not all types of CBOR or MessagePack are supported. This exception occurs if an unsupported byte was read. -json.exception.parse_error.113 | parse error at 2: expected a CBOR string; last byte: 0x98 | While parsing a map key, a value that is not a string has been read. -json.exception.parse_error.114 | parse error: Unsupported BSON record type 0x0F | The parsing of the corresponding BSON record type is not implemented (yet). - -@note For an input with n bytes, 1 is the index of the first character and n+1 - is the index of the terminating null byte or the end of file. This also - holds true when reading a byte vector (CBOR or MessagePack). - -@liveexample{The following code shows how a `parse_error` exception can be -caught.,parse_error} - -@sa - @ref exception for the base class of the library exceptions -@sa - @ref invalid_iterator for exceptions indicating errors with iterators -@sa - @ref type_error for exceptions indicating executing a member function with - a wrong type -@sa - @ref out_of_range for exceptions indicating access out of the defined range -@sa - @ref other_error for exceptions indicating other library errors - -@since version 3.0.0 -*/ -class parse_error : public exception -{ - public: - /*! - @brief create a parse error exception - @param[in] id_ the id of the exception - @param[in] pos the position where the error occurred (or with - chars_read_total=0 if the position cannot be - determined) - @param[in] what_arg the explanatory string - @return parse_error object - */ - static parse_error create(int id_, const position_t& pos, const std::string& what_arg) - { - std::string w = exception::name("parse_error", id_) + "parse error" + - position_string(pos) + ": " + what_arg; - return parse_error(id_, pos.chars_read_total, w.c_str()); - } - - static parse_error create(int id_, std::size_t byte_, const std::string& what_arg) - { - std::string w = exception::name("parse_error", id_) + "parse error" + - (byte_ != 0 ? (" at byte " + std::to_string(byte_)) : "") + - ": " + what_arg; - return parse_error(id_, byte_, w.c_str()); - } - - /*! - @brief byte index of the parse error - - The byte index of the last read character in the input file. - - @note For an input with n bytes, 1 is the index of the first character and - n+1 is the index of the terminating null byte or the end of file. - This also holds true when reading a byte vector (CBOR or MessagePack). - */ - const std::size_t byte; - - private: - parse_error(int id_, std::size_t byte_, const char* what_arg) - : exception(id_, what_arg), byte(byte_) {} - - static std::string position_string(const position_t& pos) - { - return " at line " + std::to_string(pos.lines_read + 1) + - ", column " + std::to_string(pos.chars_read_current_line); - } -}; - -/*! -@brief exception indicating errors with iterators - -This exception is thrown if iterators passed to a library function do not match -the expected semantics. - -Exceptions have ids 2xx. - -name / id | example message | description ------------------------------------ | --------------- | ------------------------- -json.exception.invalid_iterator.201 | iterators are not compatible | The iterators passed to constructor @ref basic_json(InputIT first, InputIT last) are not compatible, meaning they do not belong to the same container. Therefore, the range (@a first, @a last) is invalid. -json.exception.invalid_iterator.202 | iterator does not fit current value | In an erase or insert function, the passed iterator @a pos does not belong to the JSON value for which the function was called. It hence does not define a valid position for the deletion/insertion. -json.exception.invalid_iterator.203 | iterators do not fit current value | Either iterator passed to function @ref erase(IteratorType first, IteratorType last) does not belong to the JSON value from which values shall be erased. It hence does not define a valid range to delete values from. -json.exception.invalid_iterator.204 | iterators out of range | When an iterator range for a primitive type (number, boolean, or string) is passed to a constructor or an erase function, this range has to be exactly (@ref begin(), @ref end()), because this is the only way the single stored value is expressed. All other ranges are invalid. -json.exception.invalid_iterator.205 | iterator out of range | When an iterator for a primitive type (number, boolean, or string) is passed to an erase function, the iterator has to be the @ref begin() iterator, because it is the only way to address the stored value. All other iterators are invalid. -json.exception.invalid_iterator.206 | cannot construct with iterators from null | The iterators passed to constructor @ref basic_json(InputIT first, InputIT last) belong to a JSON null value and hence to not define a valid range. -json.exception.invalid_iterator.207 | cannot use key() for non-object iterators | The key() member function can only be used on iterators belonging to a JSON object, because other types do not have a concept of a key. -json.exception.invalid_iterator.208 | cannot use operator[] for object iterators | The operator[] to specify a concrete offset cannot be used on iterators belonging to a JSON object, because JSON objects are unordered. -json.exception.invalid_iterator.209 | cannot use offsets with object iterators | The offset operators (+, -, +=, -=) cannot be used on iterators belonging to a JSON object, because JSON objects are unordered. -json.exception.invalid_iterator.210 | iterators do not fit | The iterator range passed to the insert function are not compatible, meaning they do not belong to the same container. Therefore, the range (@a first, @a last) is invalid. -json.exception.invalid_iterator.211 | passed iterators may not belong to container | The iterator range passed to the insert function must not be a subrange of the container to insert to. -json.exception.invalid_iterator.212 | cannot compare iterators of different containers | When two iterators are compared, they must belong to the same container. -json.exception.invalid_iterator.213 | cannot compare order of object iterators | The order of object iterators cannot be compared, because JSON objects are unordered. -json.exception.invalid_iterator.214 | cannot get value | Cannot get value for iterator: Either the iterator belongs to a null value or it is an iterator to a primitive type (number, boolean, or string), but the iterator is different to @ref begin(). - -@liveexample{The following code shows how an `invalid_iterator` exception can be -caught.,invalid_iterator} - -@sa - @ref exception for the base class of the library exceptions -@sa - @ref parse_error for exceptions indicating a parse error -@sa - @ref type_error for exceptions indicating executing a member function with - a wrong type -@sa - @ref out_of_range for exceptions indicating access out of the defined range -@sa - @ref other_error for exceptions indicating other library errors - -@since version 3.0.0 -*/ -class invalid_iterator : public exception -{ - public: - static invalid_iterator create(int id_, const std::string& what_arg) - { - std::string w = exception::name("invalid_iterator", id_) + what_arg; - return invalid_iterator(id_, w.c_str()); - } - - private: - invalid_iterator(int id_, const char* what_arg) - : exception(id_, what_arg) {} -}; - -/*! -@brief exception indicating executing a member function with a wrong type - -This exception is thrown in case of a type error; that is, a library function is -executed on a JSON value whose type does not match the expected semantics. - -Exceptions have ids 3xx. - -name / id | example message | description ------------------------------ | --------------- | ------------------------- -json.exception.type_error.301 | cannot create object from initializer list | To create an object from an initializer list, the initializer list must consist only of a list of pairs whose first element is a string. When this constraint is violated, an array is created instead. -json.exception.type_error.302 | type must be object, but is array | During implicit or explicit value conversion, the JSON type must be compatible to the target type. For instance, a JSON string can only be converted into string types, but not into numbers or boolean types. -json.exception.type_error.303 | incompatible ReferenceType for get_ref, actual type is object | To retrieve a reference to a value stored in a @ref basic_json object with @ref get_ref, the type of the reference must match the value type. For instance, for a JSON array, the @a ReferenceType must be @ref array_t &. -json.exception.type_error.304 | cannot use at() with string | The @ref at() member functions can only be executed for certain JSON types. -json.exception.type_error.305 | cannot use operator[] with string | The @ref operator[] member functions can only be executed for certain JSON types. -json.exception.type_error.306 | cannot use value() with string | The @ref value() member functions can only be executed for certain JSON types. -json.exception.type_error.307 | cannot use erase() with string | The @ref erase() member functions can only be executed for certain JSON types. -json.exception.type_error.308 | cannot use push_back() with string | The @ref push_back() and @ref operator+= member functions can only be executed for certain JSON types. -json.exception.type_error.309 | cannot use insert() with | The @ref insert() member functions can only be executed for certain JSON types. -json.exception.type_error.310 | cannot use swap() with number | The @ref swap() member functions can only be executed for certain JSON types. -json.exception.type_error.311 | cannot use emplace_back() with string | The @ref emplace_back() member function can only be executed for certain JSON types. -json.exception.type_error.312 | cannot use update() with string | The @ref update() member functions can only be executed for certain JSON types. -json.exception.type_error.313 | invalid value to unflatten | The @ref unflatten function converts an object whose keys are JSON Pointers back into an arbitrary nested JSON value. The JSON Pointers must not overlap, because then the resulting value would not be well defined. -json.exception.type_error.314 | only objects can be unflattened | The @ref unflatten function only works for an object whose keys are JSON Pointers. -json.exception.type_error.315 | values in object must be primitive | The @ref unflatten function only works for an object whose keys are JSON Pointers and whose values are primitive. -json.exception.type_error.316 | invalid UTF-8 byte at index 10: 0x7E | The @ref dump function only works with UTF-8 encoded strings; that is, if you assign a `std::string` to a JSON value, make sure it is UTF-8 encoded. | -json.exception.type_error.317 | JSON value cannot be serialized to requested format | The dynamic type of the object cannot be represented in the requested serialization format (e.g. a raw `true` or `null` JSON object cannot be serialized to BSON) | - -@liveexample{The following code shows how a `type_error` exception can be -caught.,type_error} - -@sa - @ref exception for the base class of the library exceptions -@sa - @ref parse_error for exceptions indicating a parse error -@sa - @ref invalid_iterator for exceptions indicating errors with iterators -@sa - @ref out_of_range for exceptions indicating access out of the defined range -@sa - @ref other_error for exceptions indicating other library errors - -@since version 3.0.0 -*/ -class type_error : public exception -{ - public: - static type_error create(int id_, const std::string& what_arg) - { - std::string w = exception::name("type_error", id_) + what_arg; - return type_error(id_, w.c_str()); - } - - private: - type_error(int id_, const char* what_arg) : exception(id_, what_arg) {} -}; - -/*! -@brief exception indicating access out of the defined range - -This exception is thrown in case a library function is called on an input -parameter that exceeds the expected range, for instance in case of array -indices or nonexisting object keys. - -Exceptions have ids 4xx. - -name / id | example message | description -------------------------------- | --------------- | ------------------------- -json.exception.out_of_range.401 | array index 3 is out of range | The provided array index @a i is larger than @a size-1. -json.exception.out_of_range.402 | array index '-' (3) is out of range | The special array index `-` in a JSON Pointer never describes a valid element of the array, but the index past the end. That is, it can only be used to add elements at this position, but not to read it. -json.exception.out_of_range.403 | key 'foo' not found | The provided key was not found in the JSON object. -json.exception.out_of_range.404 | unresolved reference token 'foo' | A reference token in a JSON Pointer could not be resolved. -json.exception.out_of_range.405 | JSON pointer has no parent | The JSON Patch operations 'remove' and 'add' can not be applied to the root element of the JSON value. -json.exception.out_of_range.406 | number overflow parsing '10E1000' | A parsed number could not be stored as without changing it to NaN or INF. -json.exception.out_of_range.407 | number overflow serializing '9223372036854775808' | UBJSON and BSON only support integer numbers up to 9223372036854775807. | -json.exception.out_of_range.408 | excessive array size: 8658170730974374167 | The size (following `#`) of an UBJSON array or object exceeds the maximal capacity. | -json.exception.out_of_range.409 | BSON key cannot contain code point U+0000 (at byte 2) | Key identifiers to be serialized to BSON cannot contain code point U+0000, since the key is stored as zero-terminated c-string | - -@liveexample{The following code shows how an `out_of_range` exception can be -caught.,out_of_range} - -@sa - @ref exception for the base class of the library exceptions -@sa - @ref parse_error for exceptions indicating a parse error -@sa - @ref invalid_iterator for exceptions indicating errors with iterators -@sa - @ref type_error for exceptions indicating executing a member function with - a wrong type -@sa - @ref other_error for exceptions indicating other library errors - -@since version 3.0.0 -*/ -class out_of_range : public exception -{ - public: - static out_of_range create(int id_, const std::string& what_arg) - { - std::string w = exception::name("out_of_range", id_) + what_arg; - return out_of_range(id_, w.c_str()); - } - - private: - out_of_range(int id_, const char* what_arg) : exception(id_, what_arg) {} -}; - -/*! -@brief exception indicating other library errors - -This exception is thrown in case of errors that cannot be classified with the -other exception types. - -Exceptions have ids 5xx. - -name / id | example message | description ------------------------------- | --------------- | ------------------------- -json.exception.other_error.501 | unsuccessful: {"op":"test","path":"/baz", "value":"bar"} | A JSON Patch operation 'test' failed. The unsuccessful operation is also printed. - -@sa - @ref exception for the base class of the library exceptions -@sa - @ref parse_error for exceptions indicating a parse error -@sa - @ref invalid_iterator for exceptions indicating errors with iterators -@sa - @ref type_error for exceptions indicating executing a member function with - a wrong type -@sa - @ref out_of_range for exceptions indicating access out of the defined range - -@liveexample{The following code shows how an `other_error` exception can be -caught.,other_error} - -@since version 3.0.0 -*/ -class other_error : public exception -{ - public: - static other_error create(int id_, const std::string& what_arg) - { - std::string w = exception::name("other_error", id_) + what_arg; - return other_error(id_, w.c_str()); - } - - private: - other_error(int id_, const char* what_arg) : exception(id_, what_arg) {} -}; -} // namespace detail -} // namespace nlohmann - -// #include - - -#include // pair - -// This file contains all internal macro definitions -// You MUST include macro_unscope.hpp at the end of json.hpp to undef all of them - -// exclude unsupported compilers -#if !defined(JSON_SKIP_UNSUPPORTED_COMPILER_CHECK) - #if defined(__clang__) - #if (__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__) < 30400 - #error "unsupported Clang version - see https://github.com/nlohmann/json#supported-compilers" - #endif - #elif defined(__GNUC__) && !(defined(__ICC) || defined(__INTEL_COMPILER)) - #if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) < 40800 - #error "unsupported GCC version - see https://github.com/nlohmann/json#supported-compilers" - #endif - #endif -#endif - -// disable float-equal warnings on GCC/clang -#if defined(__clang__) || defined(__GNUC__) || defined(__GNUG__) - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wfloat-equal" -#endif - -// disable documentation warnings on clang -#if defined(__clang__) - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdocumentation" -#endif - -// allow for portable deprecation warnings -#if defined(__clang__) || defined(__GNUC__) || defined(__GNUG__) - #define JSON_DEPRECATED __attribute__((deprecated)) -#elif defined(_MSC_VER) - #define JSON_DEPRECATED __declspec(deprecated) -#else - #define JSON_DEPRECATED -#endif - -// allow for portable nodiscard warnings -#if defined(__has_cpp_attribute) - #if __has_cpp_attribute(nodiscard) - #define JSON_NODISCARD [[nodiscard]] - #elif __has_cpp_attribute(gnu::warn_unused_result) - #define JSON_NODISCARD [[gnu::warn_unused_result]] - #else - #define JSON_NODISCARD - #endif -#else - #define JSON_NODISCARD -#endif - -// allow to disable exceptions -#if (defined(__cpp_exceptions) || defined(__EXCEPTIONS) || defined(_CPPUNWIND)) && !defined(JSON_NOEXCEPTION) - #define JSON_THROW(exception) throw exception - #define JSON_TRY try - #define JSON_CATCH(exception) catch(exception) - #define JSON_INTERNAL_CATCH(exception) catch(exception) -#else - #include - #define JSON_THROW(exception) std::abort() - #define JSON_TRY if(true) - #define JSON_CATCH(exception) if(false) - #define JSON_INTERNAL_CATCH(exception) if(false) -#endif - -// override exception macros -#if defined(JSON_THROW_USER) - #undef JSON_THROW - #define JSON_THROW JSON_THROW_USER -#endif -#if defined(JSON_TRY_USER) - #undef JSON_TRY - #define JSON_TRY JSON_TRY_USER -#endif -#if defined(JSON_CATCH_USER) - #undef JSON_CATCH - #define JSON_CATCH JSON_CATCH_USER - #undef JSON_INTERNAL_CATCH - #define JSON_INTERNAL_CATCH JSON_CATCH_USER -#endif -#if defined(JSON_INTERNAL_CATCH_USER) - #undef JSON_INTERNAL_CATCH - #define JSON_INTERNAL_CATCH JSON_INTERNAL_CATCH_USER -#endif - -// manual branch prediction -#if defined(__clang__) || defined(__GNUC__) || defined(__GNUG__) - #define JSON_LIKELY(x) __builtin_expect(x, 1) - #define JSON_UNLIKELY(x) __builtin_expect(x, 0) -#else - #define JSON_LIKELY(x) x - #define JSON_UNLIKELY(x) x -#endif - -// C++ language standard detection -#if (defined(__cplusplus) && __cplusplus >= 201703L) || (defined(_HAS_CXX17) && _HAS_CXX17 == 1) // fix for issue #464 - #define JSON_HAS_CPP_17 - #define JSON_HAS_CPP_14 -#elif (defined(__cplusplus) && __cplusplus >= 201402L) || (defined(_HAS_CXX14) && _HAS_CXX14 == 1) - #define JSON_HAS_CPP_14 -#endif - -/*! -@brief macro to briefly define a mapping between an enum and JSON -@def NLOHMANN_JSON_SERIALIZE_ENUM -@since version 3.4.0 -*/ -#define NLOHMANN_JSON_SERIALIZE_ENUM(ENUM_TYPE, ...) \ - template \ - inline void to_json(BasicJsonType& j, const ENUM_TYPE& e) \ - { \ - static_assert(std::is_enum::value, #ENUM_TYPE " must be an enum!"); \ - static const std::pair m[] = __VA_ARGS__; \ - auto it = std::find_if(std::begin(m), std::end(m), \ - [e](const std::pair& ej_pair) -> bool \ - { \ - return ej_pair.first == e; \ - }); \ - j = ((it != std::end(m)) ? it : std::begin(m))->second; \ - } \ - template \ - inline void from_json(const BasicJsonType& j, ENUM_TYPE& e) \ - { \ - static_assert(std::is_enum::value, #ENUM_TYPE " must be an enum!"); \ - static const std::pair m[] = __VA_ARGS__; \ - auto it = std::find_if(std::begin(m), std::end(m), \ - [j](const std::pair& ej_pair) -> bool \ - { \ - return ej_pair.second == j; \ - }); \ - e = ((it != std::end(m)) ? it : std::begin(m))->first; \ - } - -// Ugly macros to avoid uglier copy-paste when specializing basic_json. They -// may be removed in the future once the class is split. - -#define NLOHMANN_BASIC_JSON_TPL_DECLARATION \ - template class ObjectType, \ - template class ArrayType, \ - class StringType, class BooleanType, class NumberIntegerType, \ - class NumberUnsignedType, class NumberFloatType, \ - template class AllocatorType, \ - template class JSONSerializer> - -#define NLOHMANN_BASIC_JSON_TPL \ - basic_json - -// #include - - -#include // not -#include // size_t -#include // conditional, enable_if, false_type, integral_constant, is_constructible, is_integral, is_same, remove_cv, remove_reference, true_type - -namespace nlohmann -{ -namespace detail -{ -// alias templates to reduce boilerplate -template -using enable_if_t = typename std::enable_if::type; - -template -using uncvref_t = typename std::remove_cv::type>::type; - -// implementation of C++14 index_sequence and affiliates -// source: https://stackoverflow.com/a/32223343 -template -struct index_sequence -{ - using type = index_sequence; - using value_type = std::size_t; - static constexpr std::size_t size() noexcept - { - return sizeof...(Ints); - } -}; - -template -struct merge_and_renumber; - -template -struct merge_and_renumber, index_sequence> - : index_sequence < I1..., (sizeof...(I1) + I2)... > {}; - -template -struct make_index_sequence - : merge_and_renumber < typename make_index_sequence < N / 2 >::type, - typename make_index_sequence < N - N / 2 >::type > {}; - -template<> struct make_index_sequence<0> : index_sequence<> {}; -template<> struct make_index_sequence<1> : index_sequence<0> {}; - -template -using index_sequence_for = make_index_sequence; - -// dispatch utility (taken from ranges-v3) -template struct priority_tag : priority_tag < N - 1 > {}; -template<> struct priority_tag<0> {}; - -// taken from ranges-v3 -template -struct static_const -{ - static constexpr T value{}; -}; - -template -constexpr T static_const::value; -} // namespace detail -} // namespace nlohmann - -// #include - - -#include // not -#include // numeric_limits -#include // false_type, is_constructible, is_integral, is_same, true_type -#include // declval - -// #include - - -#include // random_access_iterator_tag - -// #include - - -namespace nlohmann -{ -namespace detail -{ -template struct make_void -{ - using type = void; -}; -template using void_t = typename make_void::type; -} // namespace detail -} // namespace nlohmann - -// #include - - -namespace nlohmann -{ -namespace detail -{ -template -struct iterator_types {}; - -template -struct iterator_types < - It, - void_t> -{ - using difference_type = typename It::difference_type; - using value_type = typename It::value_type; - using pointer = typename It::pointer; - using reference = typename It::reference; - using iterator_category = typename It::iterator_category; -}; - -// This is required as some compilers implement std::iterator_traits in a way that -// doesn't work with SFINAE. See https://github.com/nlohmann/json/issues/1341. -template -struct iterator_traits -{ -}; - -template -struct iterator_traits < T, enable_if_t < !std::is_pointer::value >> - : iterator_types -{ -}; - -template -struct iterator_traits::value>> -{ - using iterator_category = std::random_access_iterator_tag; - using value_type = T; - using difference_type = ptrdiff_t; - using pointer = T*; - using reference = T&; -}; -} // namespace detail -} // namespace nlohmann - -// #include - -// #include - -// #include - - -#include - -// #include - - -// http://en.cppreference.com/w/cpp/experimental/is_detected -namespace nlohmann -{ -namespace detail -{ -struct nonesuch -{ - nonesuch() = delete; - ~nonesuch() = delete; - nonesuch(nonesuch const&) = delete; - nonesuch(nonesuch const&&) = delete; - void operator=(nonesuch const&) = delete; - void operator=(nonesuch&&) = delete; -}; - -template class Op, - class... Args> -struct detector -{ - using value_t = std::false_type; - using type = Default; -}; - -template class Op, class... Args> -struct detector>, Op, Args...> -{ - using value_t = std::true_type; - using type = Op; -}; - -template