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/D54 | |
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/D54')
-rw-r--r-- | data/dungeon/D54/floor_id.json | 550 |
1 files changed, 275 insertions, 275 deletions
diff --git a/data/dungeon/D54/floor_id.json b/data/dungeon/D54/floor_id.json index df03c60..8c217eb 100644 --- a/data/dungeon/D54/floor_id.json +++ b/data/dungeon/D54/floor_id.json @@ -1,275 +1,275 @@ -{ - "name": "D54FloorID", - "tables": [ - { - "MainData": 1272, - "Pokemon": 526, - "Traps": 10, - "Items": 87, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1273, - "Pokemon": 526, - "Traps": 10, - "Items": 87, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1274, - "Pokemon": 527, - "Traps": 10, - "Items": 87, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1275, - "Pokemon": 528, - "Traps": 10, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1276, - "Pokemon": 529, - "Traps": 10, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1277, - "Pokemon": 529, - "Traps": 10, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1278, - "Pokemon": 530, - "Traps": 10, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1279, - "Pokemon": 530, - "Traps": 10, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1280, - "Pokemon": 530, - "Traps": 10, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1281, - "Pokemon": 531, - "Traps": 10, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1282, - "Pokemon": 531, - "Traps": 10, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1283, - "Pokemon": 531, - "Traps": 10, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1284, - "Pokemon": 531, - "Traps": 10, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1285, - "Pokemon": 534, - "Traps": 10, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1286, - "Pokemon": 534, - "Traps": 10, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1287, - "Pokemon": 535, - "Traps": 10, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1288, - "Pokemon": 535, - "Traps": 10, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1289, - "Pokemon": 535, - "Traps": 10, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1290, - "Pokemon": 535, - "Traps": 10, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1291, - "Pokemon": 536, - "Traps": 10, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1292, - "Pokemon": 536, - "Traps": 10, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1293, - "Pokemon": 537, - "Traps": 10, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1294, - "Pokemon": 537, - "Traps": 10, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1295, - "Pokemon": 537, - "Traps": 10, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1296, - "Pokemon": 537, - "Traps": 10, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1297, - "Pokemon": 538, - "Traps": 10, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1298, - "Pokemon": 538, - "Traps": 10, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1299, - "Pokemon": 538, - "Traps": 10, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1300, - "Pokemon": 538, - "Traps": 10, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1301, - "Pokemon": 538, - "Traps": 10, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - } - ] -} +{
+ "name": "D54FloorID",
+ "tables": [
+ {
+ "MainData": 1272,
+ "Pokemon": 526,
+ "Traps": 10,
+ "Items": 87,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1273,
+ "Pokemon": 526,
+ "Traps": 10,
+ "Items": 87,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1274,
+ "Pokemon": 527,
+ "Traps": 10,
+ "Items": 87,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1275,
+ "Pokemon": 528,
+ "Traps": 10,
+ "Items": 88,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1276,
+ "Pokemon": 529,
+ "Traps": 10,
+ "Items": 88,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1277,
+ "Pokemon": 529,
+ "Traps": 10,
+ "Items": 88,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1278,
+ "Pokemon": 530,
+ "Traps": 10,
+ "Items": 88,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1279,
+ "Pokemon": 530,
+ "Traps": 10,
+ "Items": 88,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1280,
+ "Pokemon": 530,
+ "Traps": 10,
+ "Items": 88,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1281,
+ "Pokemon": 531,
+ "Traps": 10,
+ "Items": 88,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1282,
+ "Pokemon": 531,
+ "Traps": 10,
+ "Items": 88,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1283,
+ "Pokemon": 531,
+ "Traps": 10,
+ "Items": 88,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1284,
+ "Pokemon": 531,
+ "Traps": 10,
+ "Items": 88,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1285,
+ "Pokemon": 534,
+ "Traps": 10,
+ "Items": 88,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1286,
+ "Pokemon": 534,
+ "Traps": 10,
+ "Items": 88,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1287,
+ "Pokemon": 535,
+ "Traps": 10,
+ "Items": 88,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1288,
+ "Pokemon": 535,
+ "Traps": 10,
+ "Items": 88,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1289,
+ "Pokemon": 535,
+ "Traps": 10,
+ "Items": 88,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1290,
+ "Pokemon": 535,
+ "Traps": 10,
+ "Items": 88,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1291,
+ "Pokemon": 536,
+ "Traps": 10,
+ "Items": 88,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1292,
+ "Pokemon": 536,
+ "Traps": 10,
+ "Items": 88,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1293,
+ "Pokemon": 537,
+ "Traps": 10,
+ "Items": 88,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1294,
+ "Pokemon": 537,
+ "Traps": 10,
+ "Items": 88,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1295,
+ "Pokemon": 537,
+ "Traps": 10,
+ "Items": 88,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1296,
+ "Pokemon": 537,
+ "Traps": 10,
+ "Items": 88,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1297,
+ "Pokemon": 538,
+ "Traps": 10,
+ "Items": 88,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1298,
+ "Pokemon": 538,
+ "Traps": 10,
+ "Items": 88,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1299,
+ "Pokemon": 538,
+ "Traps": 10,
+ "Items": 88,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1300,
+ "Pokemon": 538,
+ "Traps": 10,
+ "Items": 88,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1301,
+ "Pokemon": 538,
+ "Traps": 10,
+ "Items": 88,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ }
+ ]
+}
|