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/MarvelousSea | |
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/MarvelousSea')
-rw-r--r-- | data/dungeon/MarvelousSea/floor_id.json | 370 |
1 files changed, 185 insertions, 185 deletions
diff --git a/data/dungeon/MarvelousSea/floor_id.json b/data/dungeon/MarvelousSea/floor_id.json index ffd84e4..a0660cf 100644 --- a/data/dungeon/MarvelousSea/floor_id.json +++ b/data/dungeon/MarvelousSea/floor_id.json @@ -1,185 +1,185 @@ -{ - "name": "MarvelousSeaFloorID", - "tables": [ - { - "MainData": 1071, - "Pokemon": 502, - "Traps": 86, - "Items": 121, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1072, - "Pokemon": 502, - "Traps": 86, - "Items": 121, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1073, - "Pokemon": 502, - "Traps": 86, - "Items": 121, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1074, - "Pokemon": 502, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1075, - "Pokemon": 502, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1076, - "Pokemon": 503, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1077, - "Pokemon": 503, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1078, - "Pokemon": 503, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1079, - "Pokemon": 504, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1080, - "Pokemon": 505, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1081, - "Pokemon": 505, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1082, - "Pokemon": 505, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1083, - "Pokemon": 505, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1084, - "Pokemon": 506, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1085, - "Pokemon": 507, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1086, - "Pokemon": 507, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1087, - "Pokemon": 507, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1088, - "Pokemon": 507, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1089, - "Pokemon": 507, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - }, - { - "MainData": 1090, - "Pokemon": 508, - "Traps": 86, - "Items": 122, - "KecleonShop": 1, - "MonsterRoomItems": 46, - "BuriedItems": 3 - } - ] -} +{
+ "name": "MarvelousSeaFloorID",
+ "tables": [
+ {
+ "MainData": 1071,
+ "Pokemon": 502,
+ "Traps": 86,
+ "Items": 121,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 46,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1072,
+ "Pokemon": 502,
+ "Traps": 86,
+ "Items": 121,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 46,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1073,
+ "Pokemon": 502,
+ "Traps": 86,
+ "Items": 121,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 46,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1074,
+ "Pokemon": 502,
+ "Traps": 86,
+ "Items": 122,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 46,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1075,
+ "Pokemon": 502,
+ "Traps": 86,
+ "Items": 122,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 46,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1076,
+ "Pokemon": 503,
+ "Traps": 86,
+ "Items": 122,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 46,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1077,
+ "Pokemon": 503,
+ "Traps": 86,
+ "Items": 122,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 46,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1078,
+ "Pokemon": 503,
+ "Traps": 86,
+ "Items": 122,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 46,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1079,
+ "Pokemon": 504,
+ "Traps": 86,
+ "Items": 122,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 46,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1080,
+ "Pokemon": 505,
+ "Traps": 86,
+ "Items": 122,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 46,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1081,
+ "Pokemon": 505,
+ "Traps": 86,
+ "Items": 122,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 46,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1082,
+ "Pokemon": 505,
+ "Traps": 86,
+ "Items": 122,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 46,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1083,
+ "Pokemon": 505,
+ "Traps": 86,
+ "Items": 122,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 46,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1084,
+ "Pokemon": 506,
+ "Traps": 86,
+ "Items": 122,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 46,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1085,
+ "Pokemon": 507,
+ "Traps": 86,
+ "Items": 122,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 46,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1086,
+ "Pokemon": 507,
+ "Traps": 86,
+ "Items": 122,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 46,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1087,
+ "Pokemon": 507,
+ "Traps": 86,
+ "Items": 122,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 46,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1088,
+ "Pokemon": 507,
+ "Traps": 86,
+ "Items": 122,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 46,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1089,
+ "Pokemon": 507,
+ "Traps": 86,
+ "Items": 122,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 46,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1090,
+ "Pokemon": 508,
+ "Traps": 86,
+ "Items": 122,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 46,
+ "BuriedItems": 3
+ }
+ ]
+}
|