diff options
author | Dennis <dhilhorst2000@gmail.com> | 2021-07-10 18:23:20 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-10 11:23:20 -0500 |
commit | 92a8e55fdd348a88a365eb389181d8e29da6dad9 (patch) | |
tree | 2467ef22cb8cf75bdf056143fab3fac4a68ef404 /data/dungeon/LapisCave | |
parent | 386299d1f401cb939e6fe3ea16d0ca57731b2648 (diff) |
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 <seth.barberee@gmail.com>
Diffstat (limited to 'data/dungeon/LapisCave')
-rw-r--r-- | data/dungeon/LapisCave/floor_id.json | 262 | ||||
-rw-r--r-- | data/dungeon/LapisCave/pokemon_found.json | 348 |
2 files changed, 305 insertions, 305 deletions
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
+ }
+ ]
+ }]
+}
|