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/SkyTowerSummit | |
| 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/SkyTowerSummit')
| -rw-r--r-- | data/dungeon/SkyTowerSummit/floor_id.json | 172 | ||||
| -rw-r--r-- | data/dungeon/SkyTowerSummit/pokemon_found.json | 132 |
2 files changed, 152 insertions, 152 deletions
diff --git a/data/dungeon/SkyTowerSummit/floor_id.json b/data/dungeon/SkyTowerSummit/floor_id.json index 88f7042..e3b3769 100644 --- a/data/dungeon/SkyTowerSummit/floor_id.json +++ b/data/dungeon/SkyTowerSummit/floor_id.json @@ -1,86 +1,86 @@ -{ - "name": "SkyTowerSummitFloorID", - "tables": [ - { - "MainData": 178, - "Pokemon": 110, - "Traps": 5, - "Items": 43, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 179, - "Pokemon": 110, - "Traps": 5, - "Items": 43, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 180, - "Pokemon": 110, - "Traps": 5, - "Items": 43, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 181, - "Pokemon": 110, - "Traps": 5, - "Items": 44, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 182, - "Pokemon": 110, - "Traps": 5, - "Items": 44, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 183, - "Pokemon": 110, - "Traps": 5, - "Items": 44, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 184, - "Pokemon": 110, - "Traps": 5, - "Items": 44, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 185, - "Pokemon": 110, - "Traps": 5, - "Items": 44, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 186, - "Pokemon": 111, - "Traps": 5, - "Items": 44, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - } - ] -} +{
+ "name": "SkyTowerSummitFloorID",
+ "tables": [
+ {
+ "MainData": 178,
+ "Pokemon": 110,
+ "Traps": 5,
+ "Items": 43,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 179,
+ "Pokemon": 110,
+ "Traps": 5,
+ "Items": 43,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 180,
+ "Pokemon": 110,
+ "Traps": 5,
+ "Items": 43,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 181,
+ "Pokemon": 110,
+ "Traps": 5,
+ "Items": 44,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 182,
+ "Pokemon": 110,
+ "Traps": 5,
+ "Items": 44,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 183,
+ "Pokemon": 110,
+ "Traps": 5,
+ "Items": 44,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 184,
+ "Pokemon": 110,
+ "Traps": 5,
+ "Items": 44,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 185,
+ "Pokemon": 110,
+ "Traps": 5,
+ "Items": 44,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 186,
+ "Pokemon": 111,
+ "Traps": 5,
+ "Items": 44,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ }
+ ]
+}
diff --git a/data/dungeon/SkyTowerSummit/pokemon_found.json b/data/dungeon/SkyTowerSummit/pokemon_found.json index 75237dc..8146ec3 100644 --- a/data/dungeon/SkyTowerSummit/pokemon_found.json +++ b/data/dungeon/SkyTowerSummit/pokemon_found.json @@ -1,66 +1,66 @@ -{ - "tables": [{ - "name": "SkyTowerSummit_1F_8F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_AERODACTYL", - "level": 25, - "probability": 1667 - }, - { - "species": "SPECIES_FLYGON", - "level": 27, - "probability": 1666 - }, - { - "species": "SPECIES_CLAYDOL", - "level": 26, - "probability": 1667 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_TROPIUS", - "level": 27, - "probability": 1667 - }, - { - "species": "SPECIES_SALAMENCE", - "level": 29, - "probability": 1666 - }, - { - "species": "SPECIES_METAGROSS", - "level": 30, - "probability": 1667 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "SkyTowerSummit_9F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_RAYQUAZA", - "level": 35, - "probability": 10000 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }] -} +{
+ "tables": [{
+ "name": "SkyTowerSummit_1F_8F_Pokemon",
+ "pokemon": [
+ {
+ "species": "SPECIES_AERODACTYL",
+ "level": 25,
+ "probability": 1667
+ },
+ {
+ "species": "SPECIES_FLYGON",
+ "level": 27,
+ "probability": 1666
+ },
+ {
+ "species": "SPECIES_CLAYDOL",
+ "level": 26,
+ "probability": 1667
+ },
+ {
+ "species": "SPECIES_KECLEON",
+ "level": 90,
+ "probability": 0
+ },
+ {
+ "species": "SPECIES_TROPIUS",
+ "level": 27,
+ "probability": 1667
+ },
+ {
+ "species": "SPECIES_SALAMENCE",
+ "level": 29,
+ "probability": 1666
+ },
+ {
+ "species": "SPECIES_METAGROSS",
+ "level": 30,
+ "probability": 1667
+ },
+ {
+ "species": "SPECIES_DECOY",
+ "level": 1,
+ "probability": 0
+ }
+ ]
+ }, {
+ "name": "SkyTowerSummit_9F_Pokemon",
+ "pokemon": [
+ {
+ "species": "SPECIES_KECLEON",
+ "level": 90,
+ "probability": 0
+ },
+ {
+ "species": "SPECIES_RAYQUAZA",
+ "level": 35,
+ "probability": 10000
+ },
+ {
+ "species": "SPECIES_DECOY",
+ "level": 1,
+ "probability": 0
+ }
+ ]
+ }]
+}
|