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/ThunderwaveCave | |
| 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/ThunderwaveCave')
| -rw-r--r-- | data/dungeon/ThunderwaveCave/floor_id.json | 100 | ||||
| -rw-r--r-- | data/dungeon/ThunderwaveCave/pokemon_found.json | 200 |
2 files changed, 150 insertions, 150 deletions
diff --git a/data/dungeon/ThunderwaveCave/floor_id.json b/data/dungeon/ThunderwaveCave/floor_id.json index a90b7cb..1a5898b 100644 --- a/data/dungeon/ThunderwaveCave/floor_id.json +++ b/data/dungeon/ThunderwaveCave/floor_id.json @@ -1,50 +1,50 @@ -{ - "name": "ThunderwaveCaveFloorID", - "tables": [ - { - "MainData": 3, - "Pokemon": 2, - "Traps": 1, - "Items": 6, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 4, - "Pokemon": 2, - "Traps": 1, - "Items": 6, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 5, - "Pokemon": 3, - "Traps": 1, - "Items": 6, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 6, - "Pokemon": 4, - "Traps": 1, - "Items": 7, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 7, - "Pokemon": 4, - "Traps": 1, - "Items": 7, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - } - ] -} +{
+ "name": "ThunderwaveCaveFloorID",
+ "tables": [
+ {
+ "MainData": 3,
+ "Pokemon": 2,
+ "Traps": 1,
+ "Items": 6,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 4,
+ "Pokemon": 2,
+ "Traps": 1,
+ "Items": 6,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 5,
+ "Pokemon": 3,
+ "Traps": 1,
+ "Items": 6,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 6,
+ "Pokemon": 4,
+ "Traps": 1,
+ "Items": 7,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 7,
+ "Pokemon": 4,
+ "Traps": 1,
+ "Items": 7,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ }
+ ]
+}
diff --git a/data/dungeon/ThunderwaveCave/pokemon_found.json b/data/dungeon/ThunderwaveCave/pokemon_found.json index 676857b..e22ea7b 100644 --- a/data/dungeon/ThunderwaveCave/pokemon_found.json +++ b/data/dungeon/ThunderwaveCave/pokemon_found.json @@ -1,100 +1,100 @@ -{ - "tables": [{ - "name": "ThunderwaveCave_1F_2F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_RATTATA", - "level": 3, - "probability": 5000 - }, - { - "species": "SPECIES_NIDORAN_F", - "level": 4, - "probability": 2500 - }, - { - "species": "SPECIES_POOCHYENA", - "level": 3, - "probability": 2500 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "ThunderwaveCave_3F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_RATTATA", - "level": 3, - "probability": 4167 - }, - { - "species": "SPECIES_NIDORAN_F", - "level": 4, - "probability": 2083 - }, - { - "species": "SPECIES_VOLTORB", - "level": 3, - "probability": 1667 - }, - { - "species": "SPECIES_POOCHYENA", - "level": 3, - "probability": 2083 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "ThunderwaveCave_4F_5F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_VOLTORB", - "level": 3, - "probability": 3846 - }, - { - "species": "SPECIES_ELEKID", - "level": 4, - "probability": 3077 - }, - { - "species": "SPECIES_PLUSLE", - "level": 3, - "probability": 1539 - }, - { - "species": "SPECIES_MINUN", - "level": 3, - "probability": 1538 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }] -} +{
+ "tables": [{
+ "name": "ThunderwaveCave_1F_2F_Pokemon",
+ "pokemon": [
+ {
+ "species": "SPECIES_RATTATA",
+ "level": 3,
+ "probability": 5000
+ },
+ {
+ "species": "SPECIES_NIDORAN_F",
+ "level": 4,
+ "probability": 2500
+ },
+ {
+ "species": "SPECIES_POOCHYENA",
+ "level": 3,
+ "probability": 2500
+ },
+ {
+ "species": "SPECIES_KECLEON",
+ "level": 90,
+ "probability": 0
+ },
+ {
+ "species": "SPECIES_DECOY",
+ "level": 1,
+ "probability": 0
+ }
+ ]
+ }, {
+ "name": "ThunderwaveCave_3F_Pokemon",
+ "pokemon": [
+ {
+ "species": "SPECIES_RATTATA",
+ "level": 3,
+ "probability": 4167
+ },
+ {
+ "species": "SPECIES_NIDORAN_F",
+ "level": 4,
+ "probability": 2083
+ },
+ {
+ "species": "SPECIES_VOLTORB",
+ "level": 3,
+ "probability": 1667
+ },
+ {
+ "species": "SPECIES_POOCHYENA",
+ "level": 3,
+ "probability": 2083
+ },
+ {
+ "species": "SPECIES_KECLEON",
+ "level": 90,
+ "probability": 0
+ },
+ {
+ "species": "SPECIES_DECOY",
+ "level": 1,
+ "probability": 0
+ }
+ ]
+ }, {
+ "name": "ThunderwaveCave_4F_5F_Pokemon",
+ "pokemon": [
+ {
+ "species": "SPECIES_VOLTORB",
+ "level": 3,
+ "probability": 3846
+ },
+ {
+ "species": "SPECIES_ELEKID",
+ "level": 4,
+ "probability": 3077
+ },
+ {
+ "species": "SPECIES_PLUSLE",
+ "level": 3,
+ "probability": 1539
+ },
+ {
+ "species": "SPECIES_MINUN",
+ "level": 3,
+ "probability": 1538
+ },
+ {
+ "species": "SPECIES_KECLEON",
+ "level": 90,
+ "probability": 0
+ },
+ {
+ "species": "SPECIES_DECOY",
+ "level": 1,
+ "probability": 0
+ }
+ ]
+ }]
+}
|