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