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/SilentChasm | |
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/SilentChasm')
-rw-r--r-- | data/dungeon/SilentChasm/floor_id.json | 172 | ||||
-rw-r--r-- | data/dungeon/SilentChasm/pokemon_found.json | 632 |
2 files changed, 402 insertions, 402 deletions
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
+ }
+ ]
+ }]
+}
|