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/WaterfallPond | |
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/WaterfallPond')
-rw-r--r-- | data/dungeon/WaterfallPond/floor_id.json | 352 |
1 files changed, 176 insertions, 176 deletions
diff --git a/data/dungeon/WaterfallPond/floor_id.json b/data/dungeon/WaterfallPond/floor_id.json index 7c039c8..f8994f8 100644 --- a/data/dungeon/WaterfallPond/floor_id.json +++ b/data/dungeon/WaterfallPond/floor_id.json @@ -1,176 +1,176 @@ -{ - "name": "WaterfallPondFloorID", - "tables": [ - { - "MainData": 1321, - "Pokemon": 585, - "Traps": 93, - "Items": 151, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1322, - "Pokemon": 585, - "Traps": 93, - "Items": 151, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1323, - "Pokemon": 586, - "Traps": 93, - "Items": 151, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1324, - "Pokemon": 587, - "Traps": 93, - "Items": 152, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1325, - "Pokemon": 587, - "Traps": 93, - "Items": 152, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1326, - "Pokemon": 588, - "Traps": 93, - "Items": 152, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1327, - "Pokemon": 589, - "Traps": 93, - "Items": 152, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1328, - "Pokemon": 590, - "Traps": 93, - "Items": 152, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1329, - "Pokemon": 591, - "Traps": 93, - "Items": 152, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1330, - "Pokemon": 591, - "Traps": 93, - "Items": 152, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1331, - "Pokemon": 592, - "Traps": 93, - "Items": 152, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1332, - "Pokemon": 593, - "Traps": 93, - "Items": 152, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1333, - "Pokemon": 594, - "Traps": 93, - "Items": 152, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1334, - "Pokemon": 595, - "Traps": 93, - "Items": 152, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1335, - "Pokemon": 596, - "Traps": 93, - "Items": 152, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1336, - "Pokemon": 597, - "Traps": 93, - "Items": 152, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1337, - "Pokemon": 598, - "Traps": 93, - "Items": 152, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1338, - "Pokemon": 598, - "Traps": 93, - "Items": 153, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1339, - "Pokemon": 599, - "Traps": 93, - "Items": 153, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - } - ] -} +{
+ "name": "WaterfallPondFloorID",
+ "tables": [
+ {
+ "MainData": 1321,
+ "Pokemon": 585,
+ "Traps": 93,
+ "Items": 151,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1322,
+ "Pokemon": 585,
+ "Traps": 93,
+ "Items": 151,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1323,
+ "Pokemon": 586,
+ "Traps": 93,
+ "Items": 151,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1324,
+ "Pokemon": 587,
+ "Traps": 93,
+ "Items": 152,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1325,
+ "Pokemon": 587,
+ "Traps": 93,
+ "Items": 152,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1326,
+ "Pokemon": 588,
+ "Traps": 93,
+ "Items": 152,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1327,
+ "Pokemon": 589,
+ "Traps": 93,
+ "Items": 152,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1328,
+ "Pokemon": 590,
+ "Traps": 93,
+ "Items": 152,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1329,
+ "Pokemon": 591,
+ "Traps": 93,
+ "Items": 152,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1330,
+ "Pokemon": 591,
+ "Traps": 93,
+ "Items": 152,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1331,
+ "Pokemon": 592,
+ "Traps": 93,
+ "Items": 152,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1332,
+ "Pokemon": 593,
+ "Traps": 93,
+ "Items": 152,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1333,
+ "Pokemon": 594,
+ "Traps": 93,
+ "Items": 152,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1334,
+ "Pokemon": 595,
+ "Traps": 93,
+ "Items": 152,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1335,
+ "Pokemon": 596,
+ "Traps": 93,
+ "Items": 152,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1336,
+ "Pokemon": 597,
+ "Traps": 93,
+ "Items": 152,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1337,
+ "Pokemon": 598,
+ "Traps": 93,
+ "Items": 152,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1338,
+ "Pokemon": 598,
+ "Traps": 93,
+ "Items": 153,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1339,
+ "Pokemon": 599,
+ "Traps": 93,
+ "Items": 153,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ }
+ ]
+}
|