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/MeteorCave | |
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/MeteorCave')
-rw-r--r-- | data/dungeon/MeteorCave/floor_id.json | 370 |
1 files changed, 185 insertions, 185 deletions
diff --git a/data/dungeon/MeteorCave/floor_id.json b/data/dungeon/MeteorCave/floor_id.json index 7a5dc81..6d25001 100644 --- a/data/dungeon/MeteorCave/floor_id.json +++ b/data/dungeon/MeteorCave/floor_id.json @@ -1,185 +1,185 @@ -{ - "name": "MeteorCaveFloorID", - "tables": [ - { - "MainData": 326, - "Pokemon": 161, - "Traps": 7, - "Items": 56, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 327, - "Pokemon": 161, - "Traps": 7, - "Items": 56, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 328, - "Pokemon": 161, - "Traps": 7, - "Items": 56, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 329, - "Pokemon": 161, - "Traps": 7, - "Items": 58, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 330, - "Pokemon": 161, - "Traps": 7, - "Items": 58, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 331, - "Pokemon": 161, - "Traps": 7, - "Items": 58, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 332, - "Pokemon": 161, - "Traps": 7, - "Items": 59, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 333, - "Pokemon": 161, - "Traps": 7, - "Items": 59, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 334, - "Pokemon": 161, - "Traps": 7, - "Items": 59, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 335, - "Pokemon": 161, - "Traps": 8, - "Items": 59, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 336, - "Pokemon": 161, - "Traps": 8, - "Items": 59, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 337, - "Pokemon": 161, - "Traps": 8, - "Items": 59, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 338, - "Pokemon": 161, - "Traps": 8, - "Items": 59, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 339, - "Pokemon": 161, - "Traps": 8, - "Items": 59, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 340, - "Pokemon": 161, - "Traps": 8, - "Items": 59, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 341, - "Pokemon": 161, - "Traps": 8, - "Items": 59, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 342, - "Pokemon": 161, - "Traps": 8, - "Items": 59, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 343, - "Pokemon": 161, - "Traps": 8, - "Items": 59, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 344, - "Pokemon": 161, - "Traps": 8, - "Items": 59, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 57 - }, - { - "MainData": 345, - "Pokemon": 162, - "Traps": 9, - "Items": 59, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 57 - } - ] -} +{
+ "name": "MeteorCaveFloorID",
+ "tables": [
+ {
+ "MainData": 326,
+ "Pokemon": 161,
+ "Traps": 7,
+ "Items": 56,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 46,
+ "BuriedItems": 57
+ },
+ {
+ "MainData": 327,
+ "Pokemon": 161,
+ "Traps": 7,
+ "Items": 56,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 46,
+ "BuriedItems": 57
+ },
+ {
+ "MainData": 328,
+ "Pokemon": 161,
+ "Traps": 7,
+ "Items": 56,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 46,
+ "BuriedItems": 57
+ },
+ {
+ "MainData": 329,
+ "Pokemon": 161,
+ "Traps": 7,
+ "Items": 58,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 46,
+ "BuriedItems": 57
+ },
+ {
+ "MainData": 330,
+ "Pokemon": 161,
+ "Traps": 7,
+ "Items": 58,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 46,
+ "BuriedItems": 57
+ },
+ {
+ "MainData": 331,
+ "Pokemon": 161,
+ "Traps": 7,
+ "Items": 58,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 46,
+ "BuriedItems": 57
+ },
+ {
+ "MainData": 332,
+ "Pokemon": 161,
+ "Traps": 7,
+ "Items": 59,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 46,
+ "BuriedItems": 57
+ },
+ {
+ "MainData": 333,
+ "Pokemon": 161,
+ "Traps": 7,
+ "Items": 59,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 46,
+ "BuriedItems": 57
+ },
+ {
+ "MainData": 334,
+ "Pokemon": 161,
+ "Traps": 7,
+ "Items": 59,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 46,
+ "BuriedItems": 57
+ },
+ {
+ "MainData": 335,
+ "Pokemon": 161,
+ "Traps": 8,
+ "Items": 59,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 46,
+ "BuriedItems": 57
+ },
+ {
+ "MainData": 336,
+ "Pokemon": 161,
+ "Traps": 8,
+ "Items": 59,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 46,
+ "BuriedItems": 57
+ },
+ {
+ "MainData": 337,
+ "Pokemon": 161,
+ "Traps": 8,
+ "Items": 59,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 46,
+ "BuriedItems": 57
+ },
+ {
+ "MainData": 338,
+ "Pokemon": 161,
+ "Traps": 8,
+ "Items": 59,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 46,
+ "BuriedItems": 57
+ },
+ {
+ "MainData": 339,
+ "Pokemon": 161,
+ "Traps": 8,
+ "Items": 59,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 46,
+ "BuriedItems": 57
+ },
+ {
+ "MainData": 340,
+ "Pokemon": 161,
+ "Traps": 8,
+ "Items": 59,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 46,
+ "BuriedItems": 57
+ },
+ {
+ "MainData": 341,
+ "Pokemon": 161,
+ "Traps": 8,
+ "Items": 59,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 46,
+ "BuriedItems": 57
+ },
+ {
+ "MainData": 342,
+ "Pokemon": 161,
+ "Traps": 8,
+ "Items": 59,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 46,
+ "BuriedItems": 57
+ },
+ {
+ "MainData": 343,
+ "Pokemon": 161,
+ "Traps": 8,
+ "Items": 59,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 46,
+ "BuriedItems": 57
+ },
+ {
+ "MainData": 344,
+ "Pokemon": 161,
+ "Traps": 8,
+ "Items": 59,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 46,
+ "BuriedItems": 57
+ },
+ {
+ "MainData": 345,
+ "Pokemon": 162,
+ "Traps": 9,
+ "Items": 59,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 46,
+ "BuriedItems": 57
+ }
+ ]
+}
|