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/MtThunder | |
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/MtThunder')
-rw-r--r-- | data/dungeon/MtThunder/floor_id.json | 190 | ||||
-rw-r--r-- | data/dungeon/MtThunder/pokemon_found.json | 600 |
2 files changed, 395 insertions, 395 deletions
diff --git a/data/dungeon/MtThunder/floor_id.json b/data/dungeon/MtThunder/floor_id.json index db52745..0af734b 100644 --- a/data/dungeon/MtThunder/floor_id.json +++ b/data/dungeon/MtThunder/floor_id.json @@ -1,95 +1,95 @@ -{ - "name": "MtThunderFloorID", - "tables": [ - { - "MainData": 39, - "Pokemon": 29, - "Traps": 1, - "Items": 15, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 40, - "Pokemon": 30, - "Traps": 1, - "Items": 15, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 41, - "Pokemon": 30, - "Traps": 1, - "Items": 15, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 42, - "Pokemon": 30, - "Traps": 1, - "Items": 16, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 43, - "Pokemon": 31, - "Traps": 1, - "Items": 16, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 44, - "Pokemon": 32, - "Traps": 1, - "Items": 16, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 45, - "Pokemon": 33, - "Traps": 1, - "Items": 16, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 46, - "Pokemon": 34, - "Traps": 1, - "Items": 16, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 47, - "Pokemon": 35, - "Traps": 1, - "Items": 16, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 48, - "Pokemon": 36, - "Traps": 1, - "Items": 16, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - } - ] -} +{
+ "name": "MtThunderFloorID",
+ "tables": [
+ {
+ "MainData": 39,
+ "Pokemon": 29,
+ "Traps": 1,
+ "Items": 15,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 40,
+ "Pokemon": 30,
+ "Traps": 1,
+ "Items": 15,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 41,
+ "Pokemon": 30,
+ "Traps": 1,
+ "Items": 15,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 42,
+ "Pokemon": 30,
+ "Traps": 1,
+ "Items": 16,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 43,
+ "Pokemon": 31,
+ "Traps": 1,
+ "Items": 16,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 44,
+ "Pokemon": 32,
+ "Traps": 1,
+ "Items": 16,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 45,
+ "Pokemon": 33,
+ "Traps": 1,
+ "Items": 16,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 46,
+ "Pokemon": 34,
+ "Traps": 1,
+ "Items": 16,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 47,
+ "Pokemon": 35,
+ "Traps": 1,
+ "Items": 16,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 48,
+ "Pokemon": 36,
+ "Traps": 1,
+ "Items": 16,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ }
+ ]
+}
diff --git a/data/dungeon/MtThunder/pokemon_found.json b/data/dungeon/MtThunder/pokemon_found.json index 731f4ac..f6c5c76 100644 --- a/data/dungeon/MtThunder/pokemon_found.json +++ b/data/dungeon/MtThunder/pokemon_found.json @@ -1,300 +1,300 @@ -{ - "tables": [{ - "name": "MtThunder_1F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_WEEDLE", - "level": 8, - "probability": 1875 - }, - { - "species": "SPECIES_NIDORAN_M", - "level": 12, - "probability": 3125 - }, - { - "species": "SPECIES_ELECTRIKE", - "level": 12, - "probability": 3125 - }, - { - "species": "SPECIES_CACNEA", - "level": 11, - "probability": 1875 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "MtThunder_2F_4F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_WEEDLE", - "level": 8, - "probability": 1429 - }, - { - "species": "SPECIES_PIDGEOTTO", - "level": 11, - "probability": 2381 - }, - { - "species": "SPECIES_NIDORAN_M", - "level": 12, - "probability": 2380 - }, - { - "species": "SPECIES_ELECTRIKE", - "level": 12, - "probability": 2381 - }, - { - "species": "SPECIES_CACNEA", - "level": 11, - "probability": 1429 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "MtThunder_5F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_BEEDRILL", - "level": 10, - "probability": 1333 - }, - { - "species": "SPECIES_PIDGEOTTO", - "level": 11, - "probability": 3334 - }, - { - "species": "SPECIES_ELECTABUZZ", - "level": 12, - "probability": 2666 - }, - { - "species": "SPECIES_STANTLER", - "level": 9, - "probability": 2667 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "MtThunder_6F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_BEEDRILL", - "level": 10, - "probability": 1538 - }, - { - "species": "SPECIES_ELECTABUZZ", - "level": 12, - "probability": 3077 - }, - { - "species": "SPECIES_AMPHAROS", - "level": 12, - "probability": 2308 - }, - { - "species": "SPECIES_STANTLER", - "level": 9, - "probability": 3077 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "MtThunder_7F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_BEEDRILL", - "level": 10, - "probability": 1111 - }, - { - "species": "SPECIES_ELECTABUZZ", - "level": 12, - "probability": 2222 - }, - { - "species": "SPECIES_AMPHAROS", - "level": 12, - "probability": 1667 - }, - { - "species": "SPECIES_GLIGAR", - "level": 12, - "probability": 2778 - }, - { - "species": "SPECIES_STANTLER", - "level": 9, - "probability": 2222 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "MtThunder_8F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_BEEDRILL", - "level": 10, - "probability": 870 - }, - { - "species": "SPECIES_ELECTABUZZ", - "level": 12, - "probability": 1739 - }, - { - "species": "SPECIES_AMPHAROS", - "level": 12, - "probability": 1304 - }, - { - "species": "SPECIES_GLIGAR", - "level": 12, - "probability": 2174 - }, - { - "species": "SPECIES_STANTLER", - "level": 9, - "probability": 1739 - }, - { - "species": "SPECIES_MANECTRIC", - "level": 9, - "probability": 2174 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "MtThunder_9F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_GROWLITHE", - "level": 10, - "probability": 1905 - }, - { - "species": "SPECIES_AMPHAROS", - "level": 12, - "probability": 1428 - }, - { - "species": "SPECIES_GLIGAR", - "level": 12, - "probability": 2381 - }, - { - "species": "SPECIES_STANTLER", - "level": 9, - "probability": 1905 - }, - { - "species": "SPECIES_MANECTRIC", - "level": 9, - "probability": 2381 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "MtThunder_10F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_GROWLITHE", - "level": 10, - "probability": 2353 - }, - { - "species": "SPECIES_AMPHAROS", - "level": 12, - "probability": 1765 - }, - { - "species": "SPECIES_GLIGAR", - "level": 12, - "probability": 2941 - }, - { - "species": "SPECIES_MANECTRIC", - "level": 9, - "probability": 2941 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }] -} +{
+ "tables": [{
+ "name": "MtThunder_1F_Pokemon",
+ "pokemon": [
+ {
+ "species": "SPECIES_WEEDLE",
+ "level": 8,
+ "probability": 1875
+ },
+ {
+ "species": "SPECIES_NIDORAN_M",
+ "level": 12,
+ "probability": 3125
+ },
+ {
+ "species": "SPECIES_ELECTRIKE",
+ "level": 12,
+ "probability": 3125
+ },
+ {
+ "species": "SPECIES_CACNEA",
+ "level": 11,
+ "probability": 1875
+ },
+ {
+ "species": "SPECIES_KECLEON",
+ "level": 90,
+ "probability": 0
+ },
+ {
+ "species": "SPECIES_DECOY",
+ "level": 1,
+ "probability": 0
+ }
+ ]
+ }, {
+ "name": "MtThunder_2F_4F_Pokemon",
+ "pokemon": [
+ {
+ "species": "SPECIES_WEEDLE",
+ "level": 8,
+ "probability": 1429
+ },
+ {
+ "species": "SPECIES_PIDGEOTTO",
+ "level": 11,
+ "probability": 2381
+ },
+ {
+ "species": "SPECIES_NIDORAN_M",
+ "level": 12,
+ "probability": 2380
+ },
+ {
+ "species": "SPECIES_ELECTRIKE",
+ "level": 12,
+ "probability": 2381
+ },
+ {
+ "species": "SPECIES_CACNEA",
+ "level": 11,
+ "probability": 1429
+ },
+ {
+ "species": "SPECIES_KECLEON",
+ "level": 90,
+ "probability": 0
+ },
+ {
+ "species": "SPECIES_DECOY",
+ "level": 1,
+ "probability": 0
+ }
+ ]
+ }, {
+ "name": "MtThunder_5F_Pokemon",
+ "pokemon": [
+ {
+ "species": "SPECIES_BEEDRILL",
+ "level": 10,
+ "probability": 1333
+ },
+ {
+ "species": "SPECIES_PIDGEOTTO",
+ "level": 11,
+ "probability": 3334
+ },
+ {
+ "species": "SPECIES_ELECTABUZZ",
+ "level": 12,
+ "probability": 2666
+ },
+ {
+ "species": "SPECIES_STANTLER",
+ "level": 9,
+ "probability": 2667
+ },
+ {
+ "species": "SPECIES_KECLEON",
+ "level": 90,
+ "probability": 0
+ },
+ {
+ "species": "SPECIES_DECOY",
+ "level": 1,
+ "probability": 0
+ }
+ ]
+ }, {
+ "name": "MtThunder_6F_Pokemon",
+ "pokemon": [
+ {
+ "species": "SPECIES_BEEDRILL",
+ "level": 10,
+ "probability": 1538
+ },
+ {
+ "species": "SPECIES_ELECTABUZZ",
+ "level": 12,
+ "probability": 3077
+ },
+ {
+ "species": "SPECIES_AMPHAROS",
+ "level": 12,
+ "probability": 2308
+ },
+ {
+ "species": "SPECIES_STANTLER",
+ "level": 9,
+ "probability": 3077
+ },
+ {
+ "species": "SPECIES_KECLEON",
+ "level": 90,
+ "probability": 0
+ },
+ {
+ "species": "SPECIES_DECOY",
+ "level": 1,
+ "probability": 0
+ }
+ ]
+ }, {
+ "name": "MtThunder_7F_Pokemon",
+ "pokemon": [
+ {
+ "species": "SPECIES_BEEDRILL",
+ "level": 10,
+ "probability": 1111
+ },
+ {
+ "species": "SPECIES_ELECTABUZZ",
+ "level": 12,
+ "probability": 2222
+ },
+ {
+ "species": "SPECIES_AMPHAROS",
+ "level": 12,
+ "probability": 1667
+ },
+ {
+ "species": "SPECIES_GLIGAR",
+ "level": 12,
+ "probability": 2778
+ },
+ {
+ "species": "SPECIES_STANTLER",
+ "level": 9,
+ "probability": 2222
+ },
+ {
+ "species": "SPECIES_KECLEON",
+ "level": 90,
+ "probability": 0
+ },
+ {
+ "species": "SPECIES_DECOY",
+ "level": 1,
+ "probability": 0
+ }
+ ]
+ }, {
+ "name": "MtThunder_8F_Pokemon",
+ "pokemon": [
+ {
+ "species": "SPECIES_BEEDRILL",
+ "level": 10,
+ "probability": 870
+ },
+ {
+ "species": "SPECIES_ELECTABUZZ",
+ "level": 12,
+ "probability": 1739
+ },
+ {
+ "species": "SPECIES_AMPHAROS",
+ "level": 12,
+ "probability": 1304
+ },
+ {
+ "species": "SPECIES_GLIGAR",
+ "level": 12,
+ "probability": 2174
+ },
+ {
+ "species": "SPECIES_STANTLER",
+ "level": 9,
+ "probability": 1739
+ },
+ {
+ "species": "SPECIES_MANECTRIC",
+ "level": 9,
+ "probability": 2174
+ },
+ {
+ "species": "SPECIES_KECLEON",
+ "level": 90,
+ "probability": 0
+ },
+ {
+ "species": "SPECIES_DECOY",
+ "level": 1,
+ "probability": 0
+ }
+ ]
+ }, {
+ "name": "MtThunder_9F_Pokemon",
+ "pokemon": [
+ {
+ "species": "SPECIES_GROWLITHE",
+ "level": 10,
+ "probability": 1905
+ },
+ {
+ "species": "SPECIES_AMPHAROS",
+ "level": 12,
+ "probability": 1428
+ },
+ {
+ "species": "SPECIES_GLIGAR",
+ "level": 12,
+ "probability": 2381
+ },
+ {
+ "species": "SPECIES_STANTLER",
+ "level": 9,
+ "probability": 1905
+ },
+ {
+ "species": "SPECIES_MANECTRIC",
+ "level": 9,
+ "probability": 2381
+ },
+ {
+ "species": "SPECIES_KECLEON",
+ "level": 90,
+ "probability": 0
+ },
+ {
+ "species": "SPECIES_DECOY",
+ "level": 1,
+ "probability": 0
+ }
+ ]
+ }, {
+ "name": "MtThunder_10F_Pokemon",
+ "pokemon": [
+ {
+ "species": "SPECIES_GROWLITHE",
+ "level": 10,
+ "probability": 2353
+ },
+ {
+ "species": "SPECIES_AMPHAROS",
+ "level": 12,
+ "probability": 1765
+ },
+ {
+ "species": "SPECIES_GLIGAR",
+ "level": 12,
+ "probability": 2941
+ },
+ {
+ "species": "SPECIES_MANECTRIC",
+ "level": 9,
+ "probability": 2941
+ },
+ {
+ "species": "SPECIES_KECLEON",
+ "level": 90,
+ "probability": 0
+ },
+ {
+ "species": "SPECIES_DECOY",
+ "level": 1,
+ "probability": 0
+ }
+ ]
+ }]
+}
|