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/FrostyForest | |
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/FrostyForest')
-rw-r--r-- | data/dungeon/FrostyForest/floor_id.json | 172 | ||||
-rw-r--r-- | data/dungeon/FrostyForest/pokemon_found.json | 368 |
2 files changed, 270 insertions, 270 deletions
diff --git a/data/dungeon/FrostyForest/floor_id.json b/data/dungeon/FrostyForest/floor_id.json index 9e907aa..538dae7 100644 --- a/data/dungeon/FrostyForest/floor_id.json +++ b/data/dungeon/FrostyForest/floor_id.json @@ -1,86 +1,86 @@ -{ - "name": "FrostyForestFloorID", - "tables": [ - { - "MainData": 93, - "Pokemon": 64, - "Traps": 3, - "Items": 27, - "KecleonShop": 28, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 94, - "Pokemon": 64, - "Traps": 3, - "Items": 27, - "KecleonShop": 28, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 95, - "Pokemon": 65, - "Traps": 3, - "Items": 27, - "KecleonShop": 28, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 96, - "Pokemon": 66, - "Traps": 3, - "Items": 29, - "KecleonShop": 28, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 97, - "Pokemon": 67, - "Traps": 3, - "Items": 29, - "KecleonShop": 28, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 98, - "Pokemon": 67, - "Traps": 3, - "Items": 29, - "KecleonShop": 28, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 99, - "Pokemon": 68, - "Traps": 3, - "Items": 29, - "KecleonShop": 28, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 100, - "Pokemon": 69, - "Traps": 3, - "Items": 29, - "KecleonShop": 28, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 101, - "Pokemon": 69, - "Traps": 3, - "Items": 29, - "KecleonShop": 28, - "MonsterRoomItems": 2, - "BuriedItems": 3 - } - ] -} +{
+ "name": "FrostyForestFloorID",
+ "tables": [
+ {
+ "MainData": 93,
+ "Pokemon": 64,
+ "Traps": 3,
+ "Items": 27,
+ "KecleonShop": 28,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 94,
+ "Pokemon": 64,
+ "Traps": 3,
+ "Items": 27,
+ "KecleonShop": 28,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 95,
+ "Pokemon": 65,
+ "Traps": 3,
+ "Items": 27,
+ "KecleonShop": 28,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 96,
+ "Pokemon": 66,
+ "Traps": 3,
+ "Items": 29,
+ "KecleonShop": 28,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 97,
+ "Pokemon": 67,
+ "Traps": 3,
+ "Items": 29,
+ "KecleonShop": 28,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 98,
+ "Pokemon": 67,
+ "Traps": 3,
+ "Items": 29,
+ "KecleonShop": 28,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 99,
+ "Pokemon": 68,
+ "Traps": 3,
+ "Items": 29,
+ "KecleonShop": 28,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 100,
+ "Pokemon": 69,
+ "Traps": 3,
+ "Items": 29,
+ "KecleonShop": 28,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 101,
+ "Pokemon": 69,
+ "Traps": 3,
+ "Items": 29,
+ "KecleonShop": 28,
+ "MonsterRoomItems": 2,
+ "BuriedItems": 3
+ }
+ ]
+}
diff --git a/data/dungeon/FrostyForest/pokemon_found.json b/data/dungeon/FrostyForest/pokemon_found.json index c35cf48..66e0441 100644 --- a/data/dungeon/FrostyForest/pokemon_found.json +++ b/data/dungeon/FrostyForest/pokemon_found.json @@ -1,184 +1,184 @@ -{ - "tables": [{ - "name": "FrostyForest_1F_2F_Pokemon", - "pokemon": [{ - "species": "SPECIES_FURRET", - "level": 14, - "probability": 6250 - }, - { - "species": "SPECIES_AZURILL", - "level": 11, - "probability": 3750 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - - "name": "FrostyForest_3F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_FURRET", - "level": 14, - "probability": 4167 - }, - { - "species": "SPECIES_AZURILL", - "level": 11, - "probability": 2500 - }, - { - "species": "SPECIES_NOSEPASS", - "level": 13, - "probability": 3333 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - - ] - }, { - "name": "FrostyForest_4F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_DITTO", - "level": 25, - "probability": 1429 - }, - { - "species": "SPECIES_FURRET", - "level": 14, - "probability": 3571 - }, - { - "species": "SPECIES_PILOSWINE", - "level": 14, - "probability": 2143 - }, - { - "species": "SPECIES_NOSEPASS", - "level": 13, - "probability": 2857 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "FrostyForest_5F_6F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_DITTO", - "level": 25, - "probability": 2222 - }, - { - "species": "SPECIES_PILOSWINE", - "level": 14, - "probability": 3334 - }, - { - "species": "SPECIES_NOSEPASS", - "level": 13, - "probability": 4444 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "FrostyForest_7F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_DITTO", - "level": 25, - "probability": 2000 - }, - { - "species": "SPECIES_MIGHTYENA", - "level": 17, - "probability": 4000 - }, - { - "species": "SPECIES_LAIRON", - "level": 17, - "probability": 4000 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "FrostyForest_8F_9F_Pokemon", - "pokemon": [ - { - "species": "SPECIES_DITTO", - "level": 25, - "probability": 1600 - }, - { - "species": "SPECIES_MIGHTYENA", - "level": 17, - "probability": 3200 - }, - { - "species": "SPECIES_LAIRON", - "level": 17, - "probability": 3200 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_SNORUNT", - "level": 20, - "probability": 2000 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - } - ] -} +{
+ "tables": [{
+ "name": "FrostyForest_1F_2F_Pokemon",
+ "pokemon": [{
+ "species": "SPECIES_FURRET",
+ "level": 14,
+ "probability": 6250
+ },
+ {
+ "species": "SPECIES_AZURILL",
+ "level": 11,
+ "probability": 3750
+ },
+ {
+ "species": "SPECIES_KECLEON",
+ "level": 90,
+ "probability": 0
+ },
+ {
+ "species": "SPECIES_DECOY",
+ "level": 1,
+ "probability": 0
+ }
+ ]
+ }, {
+
+ "name": "FrostyForest_3F_Pokemon",
+ "pokemon": [
+ {
+ "species": "SPECIES_FURRET",
+ "level": 14,
+ "probability": 4167
+ },
+ {
+ "species": "SPECIES_AZURILL",
+ "level": 11,
+ "probability": 2500
+ },
+ {
+ "species": "SPECIES_NOSEPASS",
+ "level": 13,
+ "probability": 3333
+ },
+ {
+ "species": "SPECIES_KECLEON",
+ "level": 90,
+ "probability": 0
+ },
+ {
+ "species": "SPECIES_DECOY",
+ "level": 1,
+ "probability": 0
+ }
+
+ ]
+ }, {
+ "name": "FrostyForest_4F_Pokemon",
+ "pokemon": [
+ {
+ "species": "SPECIES_DITTO",
+ "level": 25,
+ "probability": 1429
+ },
+ {
+ "species": "SPECIES_FURRET",
+ "level": 14,
+ "probability": 3571
+ },
+ {
+ "species": "SPECIES_PILOSWINE",
+ "level": 14,
+ "probability": 2143
+ },
+ {
+ "species": "SPECIES_NOSEPASS",
+ "level": 13,
+ "probability": 2857
+ },
+ {
+ "species": "SPECIES_KECLEON",
+ "level": 90,
+ "probability": 0
+ },
+ {
+ "species": "SPECIES_DECOY",
+ "level": 1,
+ "probability": 0
+ }
+ ]
+ }, {
+ "name": "FrostyForest_5F_6F_Pokemon",
+ "pokemon": [
+ {
+ "species": "SPECIES_DITTO",
+ "level": 25,
+ "probability": 2222
+ },
+ {
+ "species": "SPECIES_PILOSWINE",
+ "level": 14,
+ "probability": 3334
+ },
+ {
+ "species": "SPECIES_NOSEPASS",
+ "level": 13,
+ "probability": 4444
+ },
+ {
+ "species": "SPECIES_KECLEON",
+ "level": 90,
+ "probability": 0
+ },
+ {
+ "species": "SPECIES_DECOY",
+ "level": 1,
+ "probability": 0
+ }
+ ]
+ }, {
+ "name": "FrostyForest_7F_Pokemon",
+ "pokemon": [
+ {
+ "species": "SPECIES_DITTO",
+ "level": 25,
+ "probability": 2000
+ },
+ {
+ "species": "SPECIES_MIGHTYENA",
+ "level": 17,
+ "probability": 4000
+ },
+ {
+ "species": "SPECIES_LAIRON",
+ "level": 17,
+ "probability": 4000
+ },
+ {
+ "species": "SPECIES_KECLEON",
+ "level": 90,
+ "probability": 0
+ },
+ {
+ "species": "SPECIES_DECOY",
+ "level": 1,
+ "probability": 0
+ }
+ ]
+ }, {
+ "name": "FrostyForest_8F_9F_Pokemon",
+ "pokemon": [
+ {
+ "species": "SPECIES_DITTO",
+ "level": 25,
+ "probability": 1600
+ },
+ {
+ "species": "SPECIES_MIGHTYENA",
+ "level": 17,
+ "probability": 3200
+ },
+ {
+ "species": "SPECIES_LAIRON",
+ "level": 17,
+ "probability": 3200
+ },
+ {
+ "species": "SPECIES_KECLEON",
+ "level": 90,
+ "probability": 0
+ },
+ {
+ "species": "SPECIES_SNORUNT",
+ "level": 20,
+ "probability": 2000
+ },
+ {
+ "species": "SPECIES_DECOY",
+ "level": 1,
+ "probability": 0
+ }
+ ]
+ }
+ ]
+}
|