From 92a8e55fdd348a88a365eb389181d8e29da6dad9 Mon Sep 17 00:00:00 2001 From: Dennis Date: Sat, 10 Jul 2021 18:23:20 +0200 Subject: 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 --- data/dungeon/FantasyStraitAlt/floor_id.json | 352 ++++++++++++++-------------- 1 file changed, 176 insertions(+), 176 deletions(-) (limited to 'data/dungeon/FantasyStraitAlt') diff --git a/data/dungeon/FantasyStraitAlt/floor_id.json b/data/dungeon/FantasyStraitAlt/floor_id.json index b3a4e2d..c7945af 100644 --- a/data/dungeon/FantasyStraitAlt/floor_id.json +++ b/data/dungeon/FantasyStraitAlt/floor_id.json @@ -1,176 +1,176 @@ -{ - "name": "FantasyStraitAltFloorID", - "tables": [ - { - "MainData": 1302, - "Pokemon": 526, - "Traps": 87, - "Items": 87, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1303, - "Pokemon": 526, - "Traps": 87, - "Items": 87, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1304, - "Pokemon": 527, - "Traps": 87, - "Items": 87, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1305, - "Pokemon": 528, - "Traps": 87, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1306, - "Pokemon": 529, - "Traps": 87, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1307, - "Pokemon": 529, - "Traps": 87, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1308, - "Pokemon": 530, - "Traps": 87, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1309, - "Pokemon": 530, - "Traps": 87, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1310, - "Pokemon": 530, - "Traps": 87, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1311, - "Pokemon": 531, - "Traps": 87, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1312, - "Pokemon": 531, - "Traps": 87, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1313, - "Pokemon": 531, - "Traps": 87, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1314, - "Pokemon": 531, - "Traps": 87, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1315, - "Pokemon": 534, - "Traps": 87, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1316, - "Pokemon": 534, - "Traps": 87, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1317, - "Pokemon": 535, - "Traps": 87, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1318, - "Pokemon": 535, - "Traps": 87, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1319, - "Pokemon": 535, - "Traps": 87, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 1320, - "Pokemon": 535, - "Traps": 92, - "Items": 88, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - } - ] -} +{ + "name": "FantasyStraitAltFloorID", + "tables": [ + { + "MainData": 1302, + "Pokemon": 526, + "Traps": 87, + "Items": 87, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1303, + "Pokemon": 526, + "Traps": 87, + "Items": 87, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1304, + "Pokemon": 527, + "Traps": 87, + "Items": 87, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1305, + "Pokemon": 528, + "Traps": 87, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1306, + "Pokemon": 529, + "Traps": 87, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1307, + "Pokemon": 529, + "Traps": 87, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1308, + "Pokemon": 530, + "Traps": 87, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1309, + "Pokemon": 530, + "Traps": 87, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1310, + "Pokemon": 530, + "Traps": 87, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1311, + "Pokemon": 531, + "Traps": 87, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1312, + "Pokemon": 531, + "Traps": 87, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1313, + "Pokemon": 531, + "Traps": 87, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1314, + "Pokemon": 531, + "Traps": 87, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1315, + "Pokemon": 534, + "Traps": 87, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1316, + "Pokemon": 534, + "Traps": 87, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1317, + "Pokemon": 535, + "Traps": 87, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1318, + "Pokemon": 535, + "Traps": 87, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1319, + "Pokemon": 535, + "Traps": 87, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1320, + "Pokemon": 535, + "Traps": 92, + "Items": 88, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + } + ] +} -- cgit v1.2.3