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