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/PitfallValley | |
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/PitfallValley')
-rw-r--r-- | data/dungeon/PitfallValley/floor_id.json | 460 |
1 files changed, 230 insertions, 230 deletions
diff --git a/data/dungeon/PitfallValley/floor_id.json b/data/dungeon/PitfallValley/floor_id.json index 0b06593..1a52a7e 100644 --- a/data/dungeon/PitfallValley/floor_id.json +++ b/data/dungeon/PitfallValley/floor_id.json @@ -1,230 +1,230 @@ -{ - "name": "PitfallValleyFloorID", - "tables": [ - { - "MainData": 678, - "Pokemon": 317, - "Traps": 59, - "Items": 84, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 679, - "Pokemon": 317, - "Traps": 59, - "Items": 84, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 680, - "Pokemon": 317, - "Traps": 59, - "Items": 84, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 681, - "Pokemon": 318, - "Traps": 59, - "Items": 85, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 682, - "Pokemon": 318, - "Traps": 59, - "Items": 85, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 683, - "Pokemon": 318, - "Traps": 59, - "Items": 85, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 684, - "Pokemon": 319, - "Traps": 59, - "Items": 85, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 685, - "Pokemon": 319, - "Traps": 59, - "Items": 85, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 686, - "Pokemon": 320, - "Traps": 59, - "Items": 85, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 687, - "Pokemon": 321, - "Traps": 59, - "Items": 85, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 688, - "Pokemon": 321, - "Traps": 59, - "Items": 85, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 689, - "Pokemon": 321, - "Traps": 59, - "Items": 85, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 690, - "Pokemon": 322, - "Traps": 59, - "Items": 85, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 691, - "Pokemon": 322, - "Traps": 59, - "Items": 85, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 692, - "Pokemon": 323, - "Traps": 59, - "Items": 85, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 693, - "Pokemon": 324, - "Traps": 59, - "Items": 85, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 694, - "Pokemon": 324, - "Traps": 59, - "Items": 85, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 695, - "Pokemon": 324, - "Traps": 59, - "Items": 85, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 696, - "Pokemon": 325, - "Traps": 59, - "Items": 85, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 697, - "Pokemon": 325, - "Traps": 59, - "Items": 85, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 698, - "Pokemon": 326, - "Traps": 60, - "Items": 85, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 699, - "Pokemon": 326, - "Traps": 60, - "Items": 85, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 700, - "Pokemon": 326, - "Traps": 60, - "Items": 86, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 701, - "Pokemon": 326, - "Traps": 60, - "Items": 86, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 702, - "Pokemon": 326, - "Traps": 61, - "Items": 86, - "KecleonShop": 37, - "MonsterRoomItems": 2, - "BuriedItems": 3 - } - ] -} +{
+ "name": "PitfallValleyFloorID",
+ "tables": [
+ {
+ "MainData": 678,
+ "Pokemon": 317,
+ "Traps": 59,
+ "Items": 84,
+ "KecleonShop": 37,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 679,
+ "Pokemon": 317,
+ "Traps": 59,
+ "Items": 84,
+ "KecleonShop": 37,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 680,
+ "Pokemon": 317,
+ "Traps": 59,
+ "Items": 84,
+ "KecleonShop": 37,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 681,
+ "Pokemon": 318,
+ "Traps": 59,
+ "Items": 85,
+ "KecleonShop": 37,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 682,
+ "Pokemon": 318,
+ "Traps": 59,
+ "Items": 85,
+ "KecleonShop": 37,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 683,
+ "Pokemon": 318,
+ "Traps": 59,
+ "Items": 85,
+ "KecleonShop": 37,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 684,
+ "Pokemon": 319,
+ "Traps": 59,
+ "Items": 85,
+ "KecleonShop": 37,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 685,
+ "Pokemon": 319,
+ "Traps": 59,
+ "Items": 85,
+ "KecleonShop": 37,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 686,
+ "Pokemon": 320,
+ "Traps": 59,
+ "Items": 85,
+ "KecleonShop": 37,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 687,
+ "Pokemon": 321,
+ "Traps": 59,
+ "Items": 85,
+ "KecleonShop": 37,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 688,
+ "Pokemon": 321,
+ "Traps": 59,
+ "Items": 85,
+ "KecleonShop": 37,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 689,
+ "Pokemon": 321,
+ "Traps": 59,
+ "Items": 85,
+ "KecleonShop": 37,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 690,
+ "Pokemon": 322,
+ "Traps": 59,
+ "Items": 85,
+ "KecleonShop": 37,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 691,
+ "Pokemon": 322,
+ "Traps": 59,
+ "Items": 85,
+ "KecleonShop": 37,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 692,
+ "Pokemon": 323,
+ "Traps": 59,
+ "Items": 85,
+ "KecleonShop": 37,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 693,
+ "Pokemon": 324,
+ "Traps": 59,
+ "Items": 85,
+ "KecleonShop": 37,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 694,
+ "Pokemon": 324,
+ "Traps": 59,
+ "Items": 85,
+ "KecleonShop": 37,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 695,
+ "Pokemon": 324,
+ "Traps": 59,
+ "Items": 85,
+ "KecleonShop": 37,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 696,
+ "Pokemon": 325,
+ "Traps": 59,
+ "Items": 85,
+ "KecleonShop": 37,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 697,
+ "Pokemon": 325,
+ "Traps": 59,
+ "Items": 85,
+ "KecleonShop": 37,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 698,
+ "Pokemon": 326,
+ "Traps": 60,
+ "Items": 85,
+ "KecleonShop": 37,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 699,
+ "Pokemon": 326,
+ "Traps": 60,
+ "Items": 85,
+ "KecleonShop": 37,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 700,
+ "Pokemon": 326,
+ "Traps": 60,
+ "Items": 86,
+ "KecleonShop": 37,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 701,
+ "Pokemon": 326,
+ "Traps": 60,
+ "Items": 86,
+ "KecleonShop": 37,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 702,
+ "Pokemon": 326,
+ "Traps": 61,
+ "Items": 86,
+ "KecleonShop": 37,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ }
+ ]
+}
|