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/DesertRegion | |
| 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/DesertRegion')
| -rw-r--r-- | data/dungeon/DesertRegion/floor_id.json | 370 |
1 files changed, 185 insertions, 185 deletions
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
+ }
+ ]
+}
|