diff options
| author | Seth Barberee <seth.barberee@gmail.com> | 2021-06-09 22:54:21 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-09 22:54:21 -0500 |
| commit | 377bd14ea67d6177250fb401e12d7dfcf44e2cf6 (patch) | |
| tree | 5440970e02a7890791b234aa233e91e5c1d65b40 /data/dungeon | |
| parent | eaa141c612dd1689936a21bd57018a55ff686b69 (diff) | |
Dungeon pokemon/Floor ID JSON Part 1 (#39)
* move Thunderwave and Tiny Woods pokemon to json
* rule tweaking to actually build tool before parsing JSON
* delete .inc pokemon for tiny Woods and Thunderwave
* silence git complaining about br_ips and ips_patch
* use defines for species and pass the header file for species
* convert sinister woods
* convert MtThunderPeak
* convert silent chasm
* add trial floor_id w/ tiny woods
* change make rule name to fix compile
* MtSteel converted and bugfix
* convert few floor headers and great canyon pokemon
* code cleanup
* unify unkData into UnkTextStruct2
* more code cleanup and some text decomp
* doc more funcs and decomp/split some stuff
* document more save stuff
* more save work and move some data
* pika sniped UpdateNatureTotal
* decomp a litle and convert a few more dungeons
* better scanning for json files
* mt freeze and peak
Diffstat (limited to 'data/dungeon')
32 files changed, 2904 insertions, 661 deletions
diff --git a/data/dungeon/.gitignore b/data/dungeon/.gitignore new file mode 100644 index 0000000..9f03cde --- /dev/null +++ b/data/dungeon/.gitignore @@ -0,0 +1,2 @@ +**/pokemon_found.inc +**/floor_id.inc diff --git a/data/dungeon/FrostyForest/pokemon_found.json b/data/dungeon/FrostyForest/pokemon_found.json new file mode 100644 index 0000000..c35cf48 --- /dev/null +++ b/data/dungeon/FrostyForest/pokemon_found.json @@ -0,0 +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 + } + ] + } + ] +} diff --git a/data/dungeon/FrostyGrotto/pokemon_found.json b/data/dungeon/FrostyGrotto/pokemon_found.json new file mode 100644 index 0000000..241f094 --- /dev/null +++ b/data/dungeon/FrostyGrotto/pokemon_found.json @@ -0,0 +1,47 @@ +{ + "tables": [{ + "name": "FrostyGrotto_1F_4F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_RHYHORN", + "level": 16, + "probability": 5000 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_METANG", + "level": 17, + "probability": 5000 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "FrostyGrotto_5F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_ARTICUNO", + "level": 33, + "probability": 10000 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + } + ] +} diff --git a/data/dungeon/GreatCanyon/pokemon_found.inc b/data/dungeon/GreatCanyon/pokemon_found.inc deleted file mode 100644 index cafa22e..0000000 --- a/data/dungeon/GreatCanyon/pokemon_found.inc +++ /dev/null @@ -1,85 +0,0 @@ -.global GreatCanyon_1F_3F_Pokemon -GreatCanyon_1F_3F_Pokemon: -.byte 0x54, 0x1c, 0x95, 0x05, 0x95, 0x05, 0x00, 0x00 -.byte 0xbc, 0x1a, 0xbe, 0x10, 0xbe, 0x10, 0x00, 0x00 -.byte 0xe7, 0x1a, 0xe7, 0x1b, 0xe7, 0x1b, 0x00, 0x00 -.byte 0x00, 0x1d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.global GreatCanyon_4F_Pokemon -GreatCanyon_4F_Pokemon: -.byte 0x2d, 0x1c, 0xa0, 0x0f, 0xa0, 0x0f, 0x00, 0x00 -.byte 0x54, 0x1c, 0x70, 0x17, 0x70, 0x17, 0x00, 0x00 -.byte 0x37, 0x1d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.global GreatCanyon_5F_Pokemon -GreatCanyon_5F_Pokemon: -.byte 0x2d, 0x1c, 0xc4, 0x09, 0xc4, 0x09, 0x00, 0x00 -.byte 0xc6, 0x1c, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00 -.byte 0x37, 0x1d, 0x4c, 0x1d, 0x4c, 0x1d, 0x00, 0x00 -.byte 0x65, 0x1d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.global GreatCanyon_6F_Pokemon -GreatCanyon_6F_Pokemon: -.byte 0x2d, 0x1c, 0xd0, 0x07, 0xd0, 0x07, 0x00, 0x00 -.byte 0xa4, 0x1c, 0xa0, 0x0f, 0xa0, 0x0f, 0x00, 0x00 -.byte 0xc6, 0x1c, 0x70, 0x17, 0x70, 0x17, 0x00, 0x00 -.byte 0x37, 0x1d, 0x40, 0x1f, 0x40, 0x1f, 0x00, 0x00 -.byte 0x65, 0x1d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.global GreatCanyon_7F_Pokemon -GreatCanyon_7F_Pokemon: -.byte 0xa4, 0x1c, 0xc4, 0x09, 0xc4, 0x09, 0x00, 0x00 -.byte 0xc6, 0x1c, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00 -.byte 0xef, 0x1c, 0x4c, 0x1d, 0x4c, 0x1d, 0x00, 0x00 -.byte 0x65, 0x1d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.global GreatCanyon_8F_Pokemon -GreatCanyon_8F_Pokemon: -.byte 0xa4, 0x1c, 0xc4, 0x09, 0xc4, 0x09, 0x00, 0x00 -.byte 0xa8, 0x1c, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00 -.byte 0xef, 0x1c, 0x4c, 0x1d, 0x4c, 0x1d, 0x00, 0x00 -.byte 0x65, 0x1d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - - -.global GreatCanyon_9F_Pokemon -GreatCanyon_9F_Pokemon: -.byte 0xa8, 0x1c, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00 -.byte 0xef, 0x1c, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.global GreatCanyon_10F_11F_Pokemon -GreatCanyon_10F_11F_Pokemon: -.byte 0x80, 0x1e, 0x05, 0x0c, 0x05, 0x0c, 0x00, 0x00 -.byte 0xa8, 0x1c, 0x0a, 0x18, 0x0a, 0x18, 0x00, 0x00 -.byte 0xfe, 0x1e, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.global GreatCanyon_12F_Pokemon -GreatCanyon_12F_Pokemon: -.byte 0x80, 0x1e, 0x5c, 0x11, 0x5c, 0x11, 0x00, 0x00 -.byte 0xfe, 0x1e, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 diff --git a/data/dungeon/GreatCanyon/pokemon_found.json b/data/dungeon/GreatCanyon/pokemon_found.json new file mode 100644 index 0000000..bf2dde4 --- /dev/null +++ b/data/dungeon/GreatCanyon/pokemon_found.json @@ -0,0 +1,284 @@ +{ + "tables": [{ + "name": "GreatCanyon_1F_3F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_DODUO", + "level": 14, + "probability": 1429 + }, + { + "species": "SPECIES_SKIPLOOM", + "level": 13, + "probability": 2857 + }, + { + "species": "SPECIES_DUNSPARCE", + "level": 13, + "probability": 2857 + }, + { + "species": "SPECIES_PHANPY", + "level": 14, + "probability": 2857 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "GreatCanyon_4F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_VILEPLUME", + "level": 14, + "probability": 4000 + }, + { + "species": "SPECIES_DODUO", + "level": 14, + "probability": 2000 + }, + { + "species": "SPECIES_BRELOOM", + "level": 14, + "probability": 4000 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "GreatCanyon_5F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_VILEPLUME", + "level": 14, + "probability": 2500 + }, + { + "species": "SPECIES_MURKROW", + "level": 14, + "probability": 2500 + }, + { + "species": "SPECIES_BRELOOM", + "level": 14, + "probability": 2500 + }, + { + "species": "SPECIES_CACTURNE", + "level": 14, + "probability": 2500 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "GreatCanyon_6F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_VILEPLUME", + "level": 14, + "probability": 2000 + }, + { + "species": "SPECIES_NOCTOWL", + "level": 14, + "probability": 2000 + }, + { + "species": "SPECIES_MURKROW", + "level": 14, + "probability": 2000 + }, + { + "species": "SPECIES_BRELOOM", + "level": 14, + "probability": 2000 + }, + { + "species": "SPECIES_CACTURNE", + "level": 14, + "probability": 2000 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "GreatCanyon_7F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_NOCTOWL", + "level": 14, + "probability": 2500 + }, + { + "species": "SPECIES_MURKROW", + "level": 14, + "probability": 2500 + }, + { + "species": "SPECIES_HERACROSS", + "level": 14, + "probability": 2500 + }, + { + "species": "SPECIES_CACTURNE", + "level": 14, + "probability": 2500 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "GreatCanyon_8F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_NOCTOWL", + "level": 14, + "probability": 2500 + }, + { + "species": "SPECIES_ARIADOS", + "level": 14, + "probability": 2500 + }, + { + "species": "SPECIES_HERACROSS", + "level": 14, + "probability": 2500 + }, + { + "species": "SPECIES_CACTURNE", + "level": 14, + "probability": 2500 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "GreatCanyon_9F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_ARIADOS", + "level": 14, + "probability": 5000 + }, + { + "species": "SPECIES_HERACROSS", + "level": 14, + "probability": 5000 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "GreatCanyon_10F_11F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_TAUROS", + "level": 15, + "probability": 3077 + }, + { + "species": "SPECIES_ARIADOS", + "level": 14, + "probability": 3077 + }, + { + "species": "SPECIES_HOUNDOOM", + "level": 15, + "probability": 3846 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "GreatCanyon_12F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_TAUROS", + "level": 15, + "probability": 4444 + }, + { + "species": "SPECIES_HOUNDOOM", + "level": 15, + "probability": 5556 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }] +} diff --git a/data/dungeon/LapisCave/pokemon_found.inc b/data/dungeon/LapisCave/pokemon_found.inc deleted file mode 100644 index 26c16f7..0000000 --- a/data/dungeon/LapisCave/pokemon_found.inc +++ /dev/null @@ -1,57 +0,0 @@ -.global LapisCave_1F_3F_Pokemon -LapisCave_1F_3F_Pokemon: -.byte 0x29, 0x22, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00 -.byte 0x3b, 0x1d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.global LapisCave_4F_Pokemon -LapisCave_4F_Pokemon: -.byte 0x1e, 0x1e, 0x05, 0x0d, 0x05, 0x0d, 0x00, 0x00 -.byte 0x21, 0x1e, 0x0b, 0x1a, 0x0b, 0x1a, 0x00, 0x00 -.byte 0x3b, 0x1d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.global LapisCave_5F_8F_Pokemon -LapisCave_5F_8F_Pokemon: -.byte 0x1e, 0x1e, 0x05, 0x0d, 0x05, 0x0d, 0x00, 0x00 -.byte 0x21, 0x1e, 0x0b, 0x1a, 0x0b, 0x1a, 0x00, 0x00 -.byte 0x53, 0x1f, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.global LapisCave_9F_10F_Pokemon -LapisCave_9F_10F_Pokemon: -.byte 0x72, 0x1c, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x8f, 0x21, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.global LapisCave_11F_12F_Pokemon -LapisCave_11F_12F_Pokemon: -.byte 0x2a, 0x14, 0x05, 0x0d, 0x05, 0x0d, 0x00, 0x00 -.byte 0x72, 0x1c, 0x0b, 0x1a, 0x0b, 0x1a, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x8f, 0x21, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.global LapisCave_13F_Pokemon -LapisCave_13F_Pokemon: -.byte 0x2a, 0x14, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x8f, 0x21, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.global LapisCave_14F_Pokemon -LapisCave_14F_Pokemon: -.byte 0x2a, 0x14, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 diff --git a/data/dungeon/LapisCave/pokemon_found.json b/data/dungeon/LapisCave/pokemon_found.json new file mode 100644 index 0000000..7964480 --- /dev/null +++ b/data/dungeon/LapisCave/pokemon_found.json @@ -0,0 +1,174 @@ +{ + "tables": [{ + "name": "LapisCave_1F_3F_Pokemon", + "pokemon": [{ + "species": "SPECIES_ZUBAT", + "level": 17, + "probability": 5000 + }, + { + "species": "SPECIES_NINCADA", + "level": 14, + "probability": 5000 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "LapisCave_4F_Pokemon", + "pokemon": [{ + "species": "SPECIES_NIDORINA", + "level": 15, + "probability": 3333 + }, + { + "species": "SPECIES_NIDORINO", + "level": 15, + "probability": 3334 + }, + { + "species": "SPECIES_NINCADA", + "level": 14, + "probability": 3333 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "LapisCave_5F_8F_Pokemon", + "pokemon": [{ + "species": "SPECIES_NIDORINA", + "level": 15, + "probability": 3333 + }, + { + "species": "SPECIES_NIDORINO", + "level": 15, + "probability": 3334 + }, + { + "species": "SPECIES_ILLIMISE", + "level": 15, + "probability": 3333 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "LapisCave_9F_10F_Pokemon", + "pokemon": [{ + "species": "SPECIES_TANGELA", + "level": 14, + "probability": 5000 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_BAGON", + "level": 16, + "probability": 5000 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "LapisCave_11F_12F_Pokemon", + "pokemon": [{ + "species": "SPECIES_GOLBAT", + "level": 10, + "probability": 3333 + }, + { + "species": "SPECIES_TANGELA", + "level": 14, + "probability": 3334 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_BAGON", + "level": 16, + "probability": 3333 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "LapisCave_13F_Pokemon", + "pokemon": [{ + "species": "SPECIES_GOLBAT", + "level": 10, + "probability": 5000 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_BAGON", + "level": 16, + "probability": 5000 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "LapisCave_14F_Pokemon", + "pokemon": [{ + "species": "SPECIES_GOLBAT", + "level": 10, + "probability": 10000 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }] +} diff --git a/data/dungeon/MtBlaze/pokemon_found.json b/data/dungeon/MtBlaze/pokemon_found.json new file mode 100644 index 0000000..b269470 --- /dev/null +++ b/data/dungeon/MtBlaze/pokemon_found.json @@ -0,0 +1,220 @@ +{ + "tables": [{ + "name": "MtBlaze_1F_3F_Pokemon", + "pokemon": [{ + "species": "SPECIES_PIDGEOT", + "level": 16, + "probability": 2857 + }, + { + "species": "SPECIES_SLUGMA", + "level": 16, + "probability": 1429 + }, + { + "species": "SPECIES_MAGBY", + "level": 17, + "probability": 2857 + }, + { + "species": "SPECIES_NUMEL", + "level": 14, + "probability": 2857 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + + "name": "MtBlaze_4F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_SLUGMA", + "level": 16, + "probability": 2000 + }, + { + "species": "SPECIES_MAGBY", + "level": 17, + "probability": 4000 + }, + { + "species": "SPECIES_NUMEL", + "level": 14, + "probability": 4000 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + + ] + }, { + "name": "MtBlaze_5F_Pokemon", + "pokemon": [{ + "species": "SPECIES_SHUCKLE", + "level": 15, + "probability": 1304 + }, + { + "species": "SPECIES_SLUGMA", + "level": 16, + "probability": 1739 + }, + { + "species": "SPECIES_MAGBY", + "level": 17, + "probability": 3479 + }, + { + "species": "SPECIES_NUMEL", + "level": 14, + "probability": 3478 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "MtBlaze_6F_Pokemon", + "pokemon": [{ + "species": "SPECIES_SHUCKLE", + "level": 15, + "probability": 2000 + }, + { + "species": "SPECIES_SLUGMA", + "level": 16, + "probability": 2667 + }, + { + "species": "SPECIES_NUMEL", + "level": 14, + "probability": 5333 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "MtBlaze_7F_Pokemon", + "pokemon": [{ + "species": "SPECIES_SHUCKLE", + "level": 15, + "probability": 2000 + }, + { + "species": "SPECIES_SLUGMA", + "level": 16, + "probability": 2667 + }, + { + "species": "SPECIES_TORKOAL", + "level": 15, + "probability": 5333 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "MtBlaze_8F_9F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_RAPIDASH", + "level": 10, + "probability": 3478 + }, + { + "species": "SPECIES_SHUCKLE", + "level": 15, + "probability": 1305 + }, + { + "species": "SPECIES_SLUGMA", + "level": 16, + "probability": 1739 + }, + { + "species": "SPECIES_TORKOAL", + "level": 15, + "probability": 3478 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "MtBlaze_10F_12F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_RAPIDASH", + "level": 10, + "probability": 4000 + }, + { + "species": "SPECIES_SLUGMA", + "level": 16, + "probability": 2000 + }, + { + "species": "SPECIES_TORKOAL", + "level": 15, + "probability": 4000 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + } + ] +} diff --git a/data/dungeon/MtBlazePeak/pokemon_found.json b/data/dungeon/MtBlazePeak/pokemon_found.json new file mode 100644 index 0000000..76c7400 --- /dev/null +++ b/data/dungeon/MtBlazePeak/pokemon_found.json @@ -0,0 +1,45 @@ +{ + "tables": [{ + "name": "MtBlazePeak_1F_2F_Pokemon", + "pokemon": [{ + "species": "SPECIES_FEAROW", + "level": 17, + "probability": 5000 + }, + { + "species": "SPECIES_ARCANINE", + "level": 18, + "probability": 5000 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "MtBlazePeak_3F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_MOLTRES", + "level": 32, + "probability": 10000 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }] +} diff --git a/data/dungeon/MtFreeze/pokemon_found.json b/data/dungeon/MtFreeze/pokemon_found.json new file mode 100644 index 0000000..bdd07d0 --- /dev/null +++ b/data/dungeon/MtFreeze/pokemon_found.json @@ -0,0 +1,216 @@ +{ + "tables": [{ + "name": "MtFreeze_1F_2F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_PINECO", + "level": 18, + "probability": 1111 + }, + { + "species": "SPECIES_SWABLU", + "level": 18, + "probability": 4445 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_SHELGON", + "level": 19, + "probability": 4444 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "MtFreeze_3F_5F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_SEEL", + "level": 18, + "probability": 2759 + }, + { + "species": "SPECIES_PINECO", + "level": 18, + "probability": 689 + }, + { + "species": "SPECIES_PUPITAR", + "level": 17, + "probability": 1035 + }, + { + "species": "SPECIES_SWABLU", + "level": 18, + "probability": 2758 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_SHELGON", + "level": 19, + "probability": 2759 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "MtFreeze_6F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_SEEL", + "level": 18, + "probability": 3333 + }, + { + "species": "SPECIES_SWABLU", + "level": 18, + "probability": 3334 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_SHELGON", + "level": 19, + "probability": 3333 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "MtFreeze_7F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_SEEL", + "level": 18, + "probability": 2857 + }, + { + "species": "SPECIES_VIGOROTH", + "level": 20, + "probability": 2857 + }, + { + "species": "SPECIES_ZANGOOSE", + "level": 18, + "probability": 2857 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_CHIMECHO", + "level": 22, + "probability": 1429 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "MtFreeze_8F_11F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_VIGOROTH", + "level": 20, + "probability": 4000 + }, + { + "species": "SPECIES_ZANGOOSE", + "level": 18, + "probability": 4000 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_CHIMECHO", + "level": 22, + "probability": 2000 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "MtFreeze_12F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_SLAKING", + "level": 15, + "probability": 4000 + }, + { + "species": "SPECIES_ZANGOOSE", + "level": 18, + "probability": 4000 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_CHIMECHO", + "level": 22, + "probability": 2000 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "MtFreeze_13F_15F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_SLAKING", + "level": 15, + "probability": 5000 + }, + { + "species": "SPECIES_SEVIPER", + "level": 19, + "probability": 5000 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }] +} diff --git a/data/dungeon/MtFreezePeak/pokemon_found.json b/data/dungeon/MtFreezePeak/pokemon_found.json new file mode 100644 index 0000000..683135d --- /dev/null +++ b/data/dungeon/MtFreezePeak/pokemon_found.json @@ -0,0 +1,56 @@ +{ + "tables": [{ + "name": "MtFreezePeak_1F_4F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_GLALIE", + "level": 20, + "probability": 10000 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "MtFreezePeak_5F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_CHARIZARD", + "level": 55, + "probability": 0 + }, + { + "species": "SPECIES_ALAKAZAM", + "level": 50, + "probability": 0 + }, + { + "species": "SPECIES_TYRANITAR", + "level": 50, + "probability": 0 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_GLALIE", + "level": 20, + "probability": 10000 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }] +} diff --git a/data/dungeon/MtSteel/floor_id.inc b/data/dungeon/MtSteel/floor_id.inc deleted file mode 100644 index 07f7ae9..0000000 --- a/data/dungeon/MtSteel/floor_id.inc +++ /dev/null @@ -1,12 +0,0 @@ -.global MtSteelFloorID -MtSteelFloorID: -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x08, 0x00, 0x05, 0x00, 0x01, 0x00, 0x08, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 -.byte 0x09, 0x00, 0x05, 0x00, 0x01, 0x00, 0x08, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 -.byte 0x0a, 0x00, 0x05, 0x00, 0x01, 0x00, 0x08, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 -.byte 0x0b, 0x00, 0x05, 0x00, 0x01, 0x00, 0x09, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 -.byte 0x0c, 0x00, 0x06, 0x00, 0x01, 0x00, 0x09, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 -.byte 0x0d, 0x00, 0x07, 0x00, 0x01, 0x00, 0x09, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 -.byte 0x0e, 0x00, 0x08, 0x00, 0x01, 0x00, 0x0a, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 -.byte 0x0f, 0x00, 0x08, 0x00, 0x01, 0x00, 0x0a, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 -.byte 0x10, 0x00, 0x09, 0x00, 0x01, 0x00, 0x0a, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 diff --git a/data/dungeon/MtSteel/floor_id.json b/data/dungeon/MtSteel/floor_id.json new file mode 100644 index 0000000..986c5f3 --- /dev/null +++ b/data/dungeon/MtSteel/floor_id.json @@ -0,0 +1,86 @@ +{ + "name": "MtSteelFloorID", + "tables": [ + { + "MainData": 8, + "Pokemon": 5, + "Traps": 1, + "Items": 8, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 9, + "Pokemon": 5, + "Traps": 1, + "Items": 8, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 10, + "Pokemon": 5, + "Traps": 1, + "Items": 8, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 11, + "Pokemon": 5, + "Traps": 1, + "Items": 9, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 12, + "Pokemon": 6, + "Traps": 1, + "Items": 9, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 13, + "Pokemon": 7, + "Traps": 1, + "Items": 9, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 14, + "Pokemon": 8, + "Traps": 1, + "Items": 10, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 15, + "Pokemon": 8, + "Traps": 1, + "Items": 10, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 16, + "Pokemon": 9, + "Traps": 1, + "Items": 10, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + } + ] +} diff --git a/data/dungeon/MtSteel/pokemon_found.inc b/data/dungeon/MtSteel/pokemon_found.inc deleted file mode 100644 index 1cf6500..0000000 --- a/data/dungeon/MtSteel/pokemon_found.inc +++ /dev/null @@ -1,53 +0,0 @@ -.global MtSteel_1F_4F_Pokemon -MtSteel_1F_4F_Pokemon: -.byte 0x15, 0x08, 0x31, 0x09, 0x31, 0x09, 0x00, 0x00 -.byte 0x20, 0x0b, 0x62, 0x12, 0x62, 0x12, 0x00, 0x00 -.byte 0x49, 0x0d, 0xdf, 0x1d, 0xdf, 0x1d, 0x00, 0x00 -.byte 0x70, 0x0b, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.global MtSteel_5F_Pokemon -MtSteel_5F_Pokemon: -.byte 0x4a, 0x0a, 0x71, 0x07, 0x71, 0x07, 0x00, 0x00 -.byte 0x05, 0x0d, 0xe2, 0x0e, 0xe2, 0x0e, 0x00, 0x00 -.byte 0x20, 0x0b, 0x52, 0x16, 0x52, 0x16, 0x00, 0x00 -.byte 0x49, 0x0d, 0x9f, 0x1f, 0x9f, 0x1f, 0x00, 0x00 -.byte 0x4c, 0x0d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.global MtSteel_6F_Pokemon -MtSteel_6F_Pokemon: -.byte 0x4a, 0x0a, 0x03, 0x08, 0x03, 0x08, 0x00, 0x00 -.byte 0x05, 0x0d, 0x07, 0x10, 0x07, 0x10, 0x00, 0x00 -.byte 0x49, 0x0d, 0x0b, 0x1a, 0x0b, 0x1a, 0x00, 0x00 -.byte 0x4c, 0x0d, 0x0e, 0x22, 0x0e, 0x22, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x92, 0x0b, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.global MtSteel_7F_8F_Pokemon -MtSteel_7F_8F_Pokemon: -.byte 0x4a, 0x0a, 0x61, 0x06, 0x61, 0x06, 0x00, 0x00 -.byte 0x7f, 0x0c, 0x59, 0x0e, 0x59, 0x0e, 0x00, 0x00 -.byte 0x05, 0x0d, 0xba, 0x14, 0xba, 0x14, 0x00, 0x00 -.byte 0x49, 0x0d, 0xb3, 0x1c, 0xb3, 0x1c, 0x00, 0x00 -.byte 0x4c, 0x0d, 0x14, 0x23, 0x14, 0x23, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x92, 0x0b, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.global MtSteel_9F_Pokemon -MtSteel_9F_Pokemon: -.byte 0x32, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xfc, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x49, 0x0d, 0x0b, 0x1a, 0x0b, 0x1a, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x92, 0x0b, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 diff --git a/data/dungeon/MtSteel/pokemon_found.json b/data/dungeon/MtSteel/pokemon_found.json new file mode 100644 index 0000000..8b8b110 --- /dev/null +++ b/data/dungeon/MtSteel/pokemon_found.json @@ -0,0 +1,188 @@ +{ + "tables": [{ + "name": "MtSteel_1F_4F_Pokemon", + "pokemon": [{ + "species": "SPECIES_SPEAROW", + "level": 4, + "probability": 2353 + }, + { + "species": "SPECIES_ZIGZAGOON", + "level": 5, + "probability": 2353 + }, + { + "species": "SPECIES_ARON", + "level": 6, + "probability": 2941 + }, + { + "species": "SPECIES_BALTOY", + "level": 5, + "probability": 2353 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "MtSteel_5F_Pokemon", + "pokemon": [{ + "species": "SPECIES_GEODUDE", + "level": 5, + "probability": 1905 + }, + { + "species": "SPECIES_TYROGUE", + "level": 6, + "probability": 1905 + }, + { + "species": "SPECIES_ZIGZAGOON", + "level": 5, + "probability": 1904 + }, + { + "species": "SPECIES_ARON", + "level": 6, + "probability": 2381 + }, + { + "species": "SPECIES_MEDITITE", + "level": 6, + "probability": 1905 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "MtSteel_6F_Pokemon", + "pokemon": [{ + "species": "SPECIES_GEODUDE", + "level": 5, + "probability": 2051 + }, + { + "species": "SPECIES_TYROGUE", + "level": 6, + "probability": 2052 + }, + { + "species": "SPECIES_ARON", + "level": 6, + "probability": 2564 + }, + { + "species": "SPECIES_MEDITITE", + "level": 6, + "probability": 2051 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_BELDUM", + "level": 5, + "probability": 1282 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "MtSteel_7F_8F_Pokemon", + "pokemon": [{ + "species": "SPECIES_GEODUDE", + "level": 5, + "probability": 1633 + }, + { + "species": "SPECIES_PINSIR", + "level": 6, + "probability": 2040 + }, + { + "species": "SPECIES_TYROGUE", + "level": 6, + "probability": 1633 + }, + { + "species": "SPECIES_ARON", + "level": 6, + "probability": 2041 + }, + { + "species": "SPECIES_MEDITITE", + "level": 6, + "probability": 1633 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_BELDUM", + "level": 5, + "probability": 1020 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "MtSteel_9F_Pokemon", + "pokemon": [{ + "species": "SPECIES_DIGLETT", + "level": 5, + "probability": 0 + }, + { + "species": "SPECIES_SKARMORY", + "level": 10, + "probability": 0 + }, + { + "species": "SPECIES_ARON", + "level": 6, + "probability": 6667 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_BELDUM", + "level": 5, + "probability": 3333 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }] +} diff --git a/data/dungeon/MtThunder/pokemon_found.inc b/data/dungeon/MtThunder/pokemon_found.inc deleted file mode 100644 index b2d3e93..0000000 --- a/data/dungeon/MtThunder/pokemon_found.inc +++ /dev/null @@ -1,84 +0,0 @@ -.global MtThunder_1F_Pokemon -MtThunder_1F_Pokemon: -.byte 0x0d, 0x10, 0x53, 0x07, 0x53, 0x07, 0x00, 0x00 -.byte 0x20, 0x18, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00 -.byte 0x4e, 0x19, 0xbd, 0x1f, 0xbd, 0x1f, 0x00, 0x00 -.byte 0x64, 0x17, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.global MtThunder_2F_4F_Pokemon -MtThunder_2F_4F_Pokemon: -.byte 0x0d, 0x10, 0x95, 0x05, 0x95, 0x05, 0x00, 0x00 -.byte 0x11, 0x16, 0xe2, 0x0e, 0xe2, 0x0e, 0x00, 0x00 -.byte 0x20, 0x18, 0x2e, 0x18, 0x2e, 0x18, 0x00, 0x00 -.byte 0x4e, 0x19, 0x7b, 0x21, 0x7b, 0x21, 0x00, 0x00 -.byte 0x64, 0x17, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.global MtThunder_5F_Pokemon -MtThunder_5F_Pokemon: -.byte 0x0f, 0x14, 0x35, 0x05, 0x35, 0x05, 0x00, 0x00 -.byte 0x11, 0x16, 0x3b, 0x12, 0x3b, 0x12, 0x00, 0x00 -.byte 0x7d, 0x18, 0xa5, 0x1c, 0xa5, 0x1c, 0x00, 0x00 -.byte 0x03, 0x13, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.global MtThunder_6F_Pokemon -MtThunder_6F_Pokemon: -.byte 0x0f, 0x14, 0x02, 0x06, 0x02, 0x06, 0x00, 0x00 -.byte 0x7d, 0x18, 0x07, 0x12, 0x07, 0x12, 0x00, 0x00 -.byte 0xb5, 0x18, 0x0b, 0x1b, 0x0b, 0x1b, 0x00, 0x00 -.byte 0x03, 0x13, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.global MtThunder_7F_Pokemon -MtThunder_7F_Pokemon: -.byte 0x0f, 0x14, 0x57, 0x04, 0x57, 0x04, 0x00, 0x00 -.byte 0x7d, 0x18, 0x05, 0x0d, 0x05, 0x0d, 0x00, 0x00 -.byte 0xb5, 0x18, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00 -.byte 0xe8, 0x18, 0x62, 0x1e, 0x62, 0x1e, 0x00, 0x00 -.byte 0x03, 0x13, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.global MtThunder_8F_Pokemon -MtThunder_8F_Pokemon: -.byte 0x0f, 0x14, 0x66, 0x03, 0x66, 0x03, 0x00, 0x00 -.byte 0x7d, 0x18, 0x31, 0x0a, 0x31, 0x0a, 0x00, 0x00 -.byte 0xb5, 0x18, 0x49, 0x0f, 0x49, 0x0f, 0x00, 0x00 -.byte 0xe8, 0x18, 0xc7, 0x17, 0xc7, 0x17, 0x00, 0x00 -.byte 0x03, 0x13, 0x92, 0x1e, 0x92, 0x1e, 0x00, 0x00 -.byte 0x4f, 0x13, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.global MtThunder_9F_Pokemon -MtThunder_9F_Pokemon: -.byte 0x3a, 0x14, 0x71, 0x07, 0x71, 0x07, 0x00, 0x00 -.byte 0xb5, 0x18, 0x05, 0x0d, 0x05, 0x0d, 0x00, 0x00 -.byte 0xe8, 0x18, 0x52, 0x16, 0x52, 0x16, 0x00, 0x00 -.byte 0x03, 0x13, 0xc3, 0x1d, 0xc3, 0x1d, 0x00, 0x00 -.byte 0x4f, 0x13, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.global MtThunder_10F_Pokemon -MtThunder_10F_Pokemon: -.byte 0x3a, 0x14, 0x31, 0x09, 0x31, 0x09, 0x00, 0x00 -.byte 0xb5, 0x18, 0x16, 0x10, 0x16, 0x10, 0x00, 0x00 -.byte 0xe8, 0x18, 0x93, 0x1b, 0x93, 0x1b, 0x00, 0x00 -.byte 0x4f, 0x13, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 diff --git a/data/dungeon/MtThunder/pokemon_found.json b/data/dungeon/MtThunder/pokemon_found.json new file mode 100644 index 0000000..731f4ac --- /dev/null +++ b/data/dungeon/MtThunder/pokemon_found.json @@ -0,0 +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 + } + ] + }] +} diff --git a/data/dungeon/MtThunderPeak/pokemon_found.inc b/data/dungeon/MtThunderPeak/pokemon_found.inc deleted file mode 100644 index b8ce32c..0000000 --- a/data/dungeon/MtThunderPeak/pokemon_found.inc +++ /dev/null @@ -1,17 +0,0 @@ -.global MtThunderPeak_1F_2F_Pokemon -MtThunderPeak_1F_2F_Pokemon: -.byte 0x3a, 0x14, 0xd0, 0x07, 0xd0, 0x07, 0x00, 0x00 -.byte 0x7d, 0x18, 0xa0, 0x0f, 0xa0, 0x0f, 0x00, 0x00 -.byte 0xb5, 0x18, 0x70, 0x17, 0x70, 0x17, 0x00, 0x00 -.byte 0xe8, 0x18, 0x40, 0x1f, 0x40, 0x1f, 0x00, 0x00 -.byte 0x4f, 0x13, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.global MtThunderPeak_3F_Pokemon -MtThunderPeak_3F_Pokemon: -.byte 0x91, 0x32, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 diff --git a/data/dungeon/MtThunderPeak/pokemon_found.json b/data/dungeon/MtThunderPeak/pokemon_found.json new file mode 100644 index 0000000..22f230e --- /dev/null +++ b/data/dungeon/MtThunderPeak/pokemon_found.json @@ -0,0 +1,59 @@ +{ + "tables": [{ + "name": "MtThunderPeak_1F_2F_Pokemon", + "pokemon": [{ + "species": "SPECIES_GROWLITHE", + "level": 10, + "probability": 2000 + }, + { + "species": "SPECIES_ELECTABUZZ", + "level": 12, + "probability": 2000 + }, + { + "species": "SPECIES_AMPHAROS", + "level": 12, + "probability": 2000 + }, + { + "species": "SPECIES_GLIGAR", + "level": 12, + "probability": 2000 + }, + { + "species": "SPECIES_MANECTRIC", + "level": 9, + "probability": 2000 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "MtThunderPeak_3F_Pokemon", + "pokemon": [{ + "species": "SPECIES_ZAPDOS", + "level": 25, + "probability": 10000 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }] +} diff --git a/data/dungeon/SilentChasm/pokemon_found.inc b/data/dungeon/SilentChasm/pokemon_found.inc deleted file mode 100644 index d622578..0000000 --- a/data/dungeon/SilentChasm/pokemon_found.inc +++ /dev/null @@ -1,84 +0,0 @@ -.global SilentChasm_1F_3F_Pokemon -SilentChasm_1F_3F_Pokemon: -.byte 0x0d, 0x10, 0x83, 0x06, 0x83, 0x06, 0x00, 0x00 -.byte 0x2c, 0x14, 0x6b, 0x0a, 0x6b, 0x0a, 0x00, 0x00 -.byte 0x53, 0x14, 0xd5, 0x14, 0xd5, 0x14, 0x00, 0x00 -.byte 0xc1, 0x14, 0xa5, 0x1c, 0xa5, 0x1c, 0x00, 0x00 -.byte 0xf1, 0x14, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.global SilentChasm_4F_Pokemon -SilentChasm_4F_Pokemon: -.byte 0x0d, 0x10, 0xda, 0x0a, 0xda, 0x0a, 0x00, 0x00 -.byte 0x2c, 0x14, 0x5c, 0x11, 0x5c, 0x11, 0x00, 0x00 -.byte 0xc1, 0x14, 0x62, 0x1e, 0x62, 0x1e, 0x00, 0x00 -.byte 0x26, 0x15, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.global SilentChasm_5F_Pokemon -SilentChasm_5F_Pokemon: -.byte 0x0d, 0x10, 0xeb, 0x05, 0xeb, 0x05, 0x00, 0x00 -.byte 0x2c, 0x14, 0x78, 0x09, 0x78, 0x09, 0x00, 0x00 -.byte 0x3c, 0x14, 0x05, 0x0d, 0x05, 0x0d, 0x00, 0x00 -.byte 0xc1, 0x14, 0x20, 0x14, 0x20, 0x14, 0x00, 0x00 -.byte 0xfd, 0x16, 0x98, 0x1d, 0x98, 0x1d, 0x00, 0x00 -.byte 0x26, 0x15, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.global SilentChasm_6F_Pokemon -SilentChasm_6F_Pokemon: -.byte 0x0d, 0x10, 0x28, 0x04, 0x28, 0x04, 0x00, 0x00 -.byte 0x2c, 0x14, 0xa6, 0x06, 0xa6, 0x06, 0x00, 0x00 -.byte 0x3c, 0x14, 0x24, 0x09, 0x24, 0x09, 0x00, 0x00 -.byte 0xa7, 0x16, 0x21, 0x0e, 0x21, 0x0e, 0x00, 0x00 -.byte 0xc1, 0x14, 0x1e, 0x13, 0x1e, 0x13, 0x00, 0x00 -.byte 0xfd, 0x16, 0xc4, 0x19, 0xc4, 0x19, 0x00, 0x00 -.byte 0x26, 0x15, 0x6a, 0x20, 0x6a, 0x20, 0x00, 0x00 -.byte 0x61, 0x17, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.global SilentChasm_7F_Pokemon -SilentChasm_7F_Pokemon: -.byte 0x2c, 0x14, 0x8c, 0x02, 0x8c, 0x02, 0x00, 0x00 -.byte 0x2e, 0x16, 0xf2, 0x05, 0xf2, 0x05, 0x00, 0x00 -.byte 0x3c, 0x14, 0x7e, 0x08, 0x7e, 0x08, 0x00, 0x00 -.byte 0xa7, 0x16, 0x96, 0x0d, 0x96, 0x0d, 0x00, 0x00 -.byte 0xc1, 0x14, 0xaf, 0x12, 0xaf, 0x12, 0x00, 0x00 -.byte 0xfd, 0x16, 0x7a, 0x19, 0x7a, 0x19, 0x00, 0x00 -.byte 0x26, 0x15, 0x45, 0x20, 0x45, 0x20, 0x00, 0x00 -.byte 0x61, 0x17, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.global SilentChasm_8F_Pokemon -SilentChasm_8F_Pokemon: -.byte 0x2c, 0x14, 0xe8, 0x03, 0xe8, 0x03, 0x00, 0x00 -.byte 0x2e, 0x16, 0x1d, 0x09, 0x1d, 0x09, 0x00, 0x00 -.byte 0x3c, 0x14, 0x05, 0x0d, 0x05, 0x0d, 0x00, 0x00 -.byte 0xa7, 0x16, 0xd5, 0x14, 0xd5, 0x14, 0x00, 0x00 -.byte 0xc1, 0x14, 0xa5, 0x1c, 0xa5, 0x1c, 0x00, 0x00 -.byte 0x61, 0x17, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.global SilentChasm_9F_Pokemon -SilentChasm_9F_Pokemon: -.byte 0x0f, 0x14, 0xbc, 0x06, 0xbc, 0x06, 0x00, 0x00 -.byte 0x2c, 0x14, 0xc7, 0x0a, 0xc7, 0x0a, 0x00, 0x00 -.byte 0x2e, 0x16, 0x2a, 0x10, 0x2a, 0x10, 0x00, 0x00 -.byte 0x3c, 0x14, 0x34, 0x14, 0x34, 0x14, 0x00, 0x00 -.byte 0xa7, 0x16, 0x49, 0x1c, 0x49, 0x1c, 0x00, 0x00 -.byte 0x61, 0x17, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 diff --git a/data/dungeon/SilentChasm/pokemon_found.json b/data/dungeon/SilentChasm/pokemon_found.json new file mode 100644 index 0000000..5edadea --- /dev/null +++ b/data/dungeon/SilentChasm/pokemon_found.json @@ -0,0 +1,316 @@ +{ + "tables": [{ + "name": "SilentChasm_1F_3F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_WEEDLE", + "level": 8, + "probability": 1667 + }, + { + "species": "SPECIES_GLOOM", + "level": 10, + "probability": 1000 + }, + { + "species": "SPECIES_FARFETCHD", + "level": 10, + "probability": 2666 + }, + { + "species": "SPECIES_YANMA", + "level": 10, + "probability": 2000 + }, + { + "species": "SPECIES_TEDDIURSA", + "level": 10, + "probability": 2667 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "SilentChasm_4F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_WEEDLE", + "level": 8, + "probability": 2778 + }, + { + "species": "SPECIES_GLOOM", + "level": 10, + "probability": 1666 + }, + { + "species": "SPECIES_YANMA", + "level": 10, + "probability": 3334 + }, + { + "species": "SPECIES_DUSTOX", + "level": 10, + "probability": 2222 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "SilentChasm_5F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_WEEDLE", + "level": 8, + "probability": 1515 + }, + { + "species": "SPECIES_GLOOM", + "level": 10, + "probability": 909 + }, + { + "species": "SPECIES_POLIWAG", + "level": 10, + "probability": 909 + }, + { + "species": "SPECIES_YANMA", + "level": 10, + "probability": 1819 + }, + { + "species": "SPECIES_HOUNDOUR", + "level": 11, + "probability": 2424 + }, + { + "species": "SPECIES_DUSTOX", + "level": 10, + "probability": 2424 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "SilentChasm_6F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_WEEDLE", + "level": 8, + "probability": 1064 + }, + { + "species": "SPECIES_GLOOM", + "level": 10, + "probability": 638 + }, + { + "species": "SPECIES_POLIWAG", + "level": 10, + "probability": 638 + }, + { + "species": "SPECIES_SPINARAK", + "level": 11, + "probability": 1277 + }, + { + "species": "SPECIES_YANMA", + "level": 10, + "probability": 1277 + }, + { + "species": "SPECIES_HOUNDOUR", + "level": 11, + "probability": 1702 + }, + { + "species": "SPECIES_DUSTOX", + "level": 10, + "probability": 1702 + }, + { + "species": "SPECIES_TRAPINCH", + "level": 11, + "probability": 1702 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "SilentChasm_7F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_GLOOM", + "level": 10, + "probability": 652 + }, + { + "species": "SPECIES_PARAS", + "level": 11, + "probability": 870 + }, + { + "species": "SPECIES_POLIWAG", + "level": 10, + "probability": 652 + }, + { + "species": "SPECIES_SPINARAK", + "level": 11, + "probability": 1304 + }, + { + "species": "SPECIES_YANMA", + "level": 10, + "probability": 1305 + }, + { + "species": "SPECIES_HOUNDOUR", + "level": 11, + "probability": 1739 + }, + { + "species": "SPECIES_DUSTOX", + "level": 10, + "probability": 1739 + }, + { + "species": "SPECIES_TRAPINCH", + "level": 11, + "probability": 1739 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "SilentChasm_8F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_GLOOM", + "level": 10, + "probability": 1000 + }, + { + "species": "SPECIES_PARAS", + "level": 11, + "probability": 1333 + }, + { + "species": "SPECIES_POLIWAG", + "level": 10, + "probability": 1000 + }, + { + "species": "SPECIES_SPINARAK", + "level": 11, + "probability": 2000 + }, + { + "species": "SPECIES_YANMA", + "level": 10, + "probability": 2000 + }, + { + "species": "SPECIES_TRAPINCH", + "level": 11, + "probability": 2667 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "SilentChasm_9F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_BEEDRILL", + "level": 10, + "probability": 1724 + }, + { + "species": "SPECIES_GLOOM", + "level": 10, + "probability": 1035 + }, + { + "species": "SPECIES_PARAS", + "level": 11, + "probability": 1379 + }, + { + "species": "SPECIES_POLIWAG", + "level": 10, + "probability": 1034 + }, + { + "species": "SPECIES_SPINARAK", + "level": 11, + "probability": 2069 + }, + { + "species": "SPECIES_TRAPINCH", + "level": 11, + "probability": 2759 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }] +} diff --git a/data/dungeon/SinisterWoods/pokemon_found.inc b/data/dungeon/SinisterWoods/pokemon_found.inc deleted file mode 100644 index a31fbad..0000000 --- a/data/dungeon/SinisterWoods/pokemon_found.inc +++ /dev/null @@ -1,126 +0,0 @@ -.global SinisterWoods_1F_Pokemon -SinisterWoods_1F_Pokemon: -.byte 0x2b, 0x0e, 0x2b, 0x06, 0x2b, 0x06, 0x00, 0x00 -.byte 0xb9, 0x0e, 0x9d, 0x16, 0x9d, 0x16, 0x00, 0x00 -.byte 0xf5, 0x10, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.global SinisterWoods_2F_Pokemon -SinisterWoods_2F_Pokemon: -.byte 0x2b, 0x0e, 0x54, 0x05, 0x54, 0x05, 0x00, 0x00 -.byte 0xb9, 0x0e, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00 -.byte 0xc0, 0x10, 0xdc, 0x18, 0xdc, 0x18, 0x00, 0x00 -.byte 0xf5, 0x10, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.global SinisterWoods_3F_Pokemon -SinisterWoods_3F_Pokemon: -.byte 0x2b, 0x0e, 0xe8, 0x03, 0xe8, 0x03, 0x00, 0x00 -.byte 0xa1, 0x0c, 0x53, 0x0e, 0x53, 0x0e, 0x00, 0x00 -.byte 0xb9, 0x0e, 0xbd, 0x18, 0xbd, 0x18, 0x00, 0x00 -.byte 0xc0, 0x10, 0xa5, 0x1c, 0xa5, 0x1c, 0x00, 0x00 -.byte 0xf5, 0x10, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.global SinisterWoods_4F_Pokemon -SinisterWoods_4F_Pokemon: -.byte 0x2b, 0x0e, 0xa9, 0x03, 0xa9, 0x03, 0x00, 0x00 -.byte 0xa1, 0x0c, 0x6d, 0x0d, 0x6d, 0x0d, 0x00, 0x00 -.byte 0xb9, 0x0e, 0x31, 0x17, 0x31, 0x17, 0x00, 0x00 -.byte 0xc0, 0x10, 0xdb, 0x1a, 0xdb, 0x1a, 0x00, 0x00 -.byte 0x23, 0x11, 0xf5, 0x20, 0xf5, 0x20, 0x00, 0x00 -.byte 0x25, 0x11, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.global SinisterWoods_5F_Pokemon -SinisterWoods_5F_Pokemon: -.byte 0xa1, 0x0c, 0xe2, 0x0e, 0xe2, 0x0e, 0x00, 0x00 -.byte 0xc0, 0x10, 0x76, 0x14, 0x76, 0x14, 0x00, 0x00 -.byte 0x23, 0x11, 0xc3, 0x1d, 0xc3, 0x1d, 0x00, 0x00 -.byte 0x25, 0x11, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.global SinisterWoods_6F_Pokemon -SinisterWoods_6F_Pokemon: -.byte 0xa1, 0x0c, 0xc7, 0x0a, 0xc7, 0x0a, 0x00, 0x00 -.byte 0xc0, 0x10, 0xd1, 0x0e, 0xd1, 0x0e, 0x00, 0x00 -.byte 0x23, 0x11, 0x8d, 0x15, 0x8d, 0x15, 0x00, 0x00 -.byte 0x25, 0x11, 0x49, 0x1c, 0x49, 0x1c, 0x00, 0x00 -.byte 0x36, 0x13, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.global SinisterWoods_7F_Pokemon -SinisterWoods_7F_Pokemon: -.byte 0xa5, 0x0e, 0x60, 0x09, 0x60, 0x09, 0x00, 0x00 -.byte 0xc0, 0x10, 0x10, 0x0e, 0x10, 0x0e, 0x00, 0x00 -.byte 0x21, 0x11, 0x90, 0x1a, 0x90, 0x1a, 0x00, 0x00 -.byte 0x36, 0x13, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.global SinisterWoods_8F_9F_Pokemon -SinisterWoods_8F_9F_Pokemon: -.byte 0x7b, 0x14, 0xee, 0x08, 0xee, 0x08, 0x00, 0x00 -.byte 0xa5, 0x0e, 0xa0, 0x0f, 0xa0, 0x0f, 0x00, 0x00 -.byte 0xc2, 0x14, 0x35, 0x15, 0x35, 0x15, 0x00, 0x00 -.byte 0x21, 0x11, 0x22, 0x1e, 0x22, 0x1e, 0x00, 0x00 -.byte 0x36, 0x13, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.global SinisterWoods_10F_Pokemon -SinisterWoods_10F_Pokemon: -.byte 0x67, 0x10, 0x21, 0x06, 0x21, 0x06, 0x00, 0x00 -.byte 0x7b, 0x14, 0x41, 0x0c, 0x41, 0x0c, 0x00, 0x00 -.byte 0xa3, 0x0c, 0x62, 0x12, 0x62, 0x12, 0x00, 0x00 -.byte 0xa5, 0x0e, 0xfa, 0x16, 0xfa, 0x16, 0x00, 0x00 -.byte 0xc2, 0x14, 0xcf, 0x1a, 0xcf, 0x1a, 0x00, 0x00 -.byte 0x36, 0x13, 0xef, 0x20, 0xef, 0x20, 0x00, 0x00 -.byte 0x38, 0x11, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.global SinisterWoods_11F_Pokemon -SinisterWoods_11F_Pokemon: -.byte 0x67, 0x10, 0xd0, 0x07, 0xd0, 0x07, 0x00, 0x00 -.byte 0x7b, 0x14, 0xa0, 0x0f, 0xa0, 0x0f, 0x00, 0x00 -.byte 0xa3, 0x0c, 0x70, 0x17, 0x70, 0x17, 0x00, 0x00 -.byte 0x36, 0x13, 0x40, 0x1f, 0x40, 0x1f, 0x00, 0x00 -.byte 0x38, 0x11, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.global SinisterWoods_12F_Pokemon -SinisterWoods_12F_Pokemon: -.byte 0x67, 0x10, 0xc4, 0x09, 0xc4, 0x09, 0x00, 0x00 -.byte 0xa3, 0x0c, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00 -.byte 0x36, 0x13, 0x4c, 0x1d, 0x4c, 0x1d, 0x00, 0x00 -.byte 0x38, 0x11, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.global SinisterWoods_13F_Pokemon -SinisterWoods_13F_Pokemon: -.byte 0x17, 0x1e, 0x05, 0x0d, 0x05, 0x0d, 0x00, 0x00 -.byte 0x5e, 0x1e, 0x0b, 0x1a, 0x0b, 0x1a, 0x00, 0x00 -.byte 0x4d, 0x19, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 diff --git a/data/dungeon/SinisterWoods/pokemon_found.json b/data/dungeon/SinisterWoods/pokemon_found.json new file mode 100644 index 0000000..f9f1d69 --- /dev/null +++ b/data/dungeon/SinisterWoods/pokemon_found.json @@ -0,0 +1,446 @@ +{ + "tables": [{ + "name": "SinisterWoods_1F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_ODDISH", + "level": 7, + "probability": 1579 + }, + { + "species": "SPECIES_SUDOWOODO", + "level": 7, + "probability": 4210 + }, + { + "species": "SPECIES_SWINUB", + "level": 8, + "probability": 4211 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "SinisterWoods_2F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_ODDISH", + "level": 7, + "probability": 1364 + }, + { + "species": "SPECIES_SUDOWOODO", + "level": 7, + "probability": 3636 + }, + { + "species": "SPECIES_SUNFLORA", + "level": 8, + "probability": 1364 + }, + { + "species": "SPECIES_SWINUB", + "level": 8, + "probability": 3636 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "SinisterWoods_3F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_ODDISH", + "level": 7, + "probability": 1000 + }, + { + "species": "SPECIES_SENTRET", + "level": 6, + "probability": 2667 + }, + { + "species": "SPECIES_SUDOWOODO", + "level": 7, + "probability": 2666 + }, + { + "species": "SPECIES_SUNFLORA", + "level": 8, + "probability": 1000 + }, + { + "species": "SPECIES_SWINUB", + "level": 8, + "probability": 2667 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "SinisterWoods_4F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_ODDISH", + "level": 7, + "probability": 937 + }, + { + "species": "SPECIES_SENTRET", + "level": 6, + "probability": 2500 + }, + { + "species": "SPECIES_SUDOWOODO", + "level": 7, + "probability": 2500 + }, + { + "species": "SPECIES_SUNFLORA", + "level": 8, + "probability": 938 + }, + { + "species": "SPECIES_SILCOON", + "level": 8, + "probability": 1562 + }, + { + "species": "SPECIES_CASCOON", + "level": 8, + "probability": 1563 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "SinisterWoods_5F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_SENTRET", + "level": 6, + "probability": 3810 + }, + { + "species": "SPECIES_SUNFLORA", + "level": 8, + "probability": 1428 + }, + { + "species": "SPECIES_SILCOON", + "level": 8, + "probability": 2381 + }, + { + "species": "SPECIES_CASCOON", + "level": 8, + "probability": 2381 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "SinisterWoods_6F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_SENTRET", + "level": 6, + "probability": 2759 + }, + { + "species": "SPECIES_SUNFLORA", + "level": 8, + "probability": 1034 + }, + { + "species": "SPECIES_SILCOON", + "level": 8, + "probability": 1724 + }, + { + "species": "SPECIES_CASCOON", + "level": 8, + "probability": 1724 + }, + { + "species": "SPECIES_SHROOMISH", + "level": 9, + "probability": 2759 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "SinisterWoods_7F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_LEDYBA", + "level": 7, + "probability": 2400 + }, + { + "species": "SPECIES_SUNFLORA", + "level": 8, + "probability": 1200 + }, + { + "species": "SPECIES_LINOONE", + "level": 8, + "probability": 3200 + }, + { + "species": "SPECIES_SHROOMISH", + "level": 9, + "probability": 3200 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "SinisterWoods_8F_9F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_SCYTHER", + "level": 10, + "probability": 2286 + }, + { + "species": "SPECIES_LEDYBA", + "level": 7, + "probability": 1714 + }, + { + "species": "SPECIES_WOOPER", + "level": 10, + "probability": 1429 + }, + { + "species": "SPECIES_LINOONE", + "level": 8, + "probability": 2285 + }, + { + "species": "SPECIES_SHROOMISH", + "level": 9, + "probability": 2286 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "SinisterWoods_10F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_EXEGGUTOR", + "level": 8, + "probability": 1569 + }, + { + "species": "SPECIES_SCYTHER", + "level": 10, + "probability": 1568 + }, + { + "species": "SPECIES_HOOTHOOT", + "level": 6, + "probability": 1569 + }, + { + "species": "SPECIES_LEDYBA", + "level": 7, + "probability": 1176 + }, + { + "species": "SPECIES_WOOPER", + "level": 10, + "probability": 981 + }, + { + "species": "SPECIES_SHROOMISH", + "level": 9, + "probability": 1568 + }, + { + "species": "SPECIES_SLAKOTH", + "level": 8, + "probability": 1569 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "SinisterWoods_11F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_EXEGGUTOR", + "level": 8, + "probability": 2000 + }, + { + "species": "SPECIES_SCYTHER", + "level": 10, + "probability": 2000 + }, + { + "species": "SPECIES_HOOTHOOT", + "level": 6, + "probability": 2000 + }, + { + "species": "SPECIES_SHROOMISH", + "level": 9, + "probability": 2000 + }, + { + "species": "SPECIES_SLAKOTH", + "level": 8, + "probability": 2000 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "SinisterWoods_12F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_EXEGGUTOR", + "level": 8, + "probability": 2500 + }, + { + "species": "SPECIES_HOOTHOOT", + "level": 6, + "probability": 2500 + }, + { + "species": "SPECIES_SHROOMISH", + "level": 9, + "probability": 2500 + }, + { + "species": "SPECIES_SLAKOTH", + "level": 8, + "probability": 2500 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "SinisterWoods_13F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_EKANS", + "level": 15, + "probability": 3333 + }, + { + "species": "SPECIES_GENGAR", + "level": 15, + "probability": 3334 + }, + { + "species": "SPECIES_MEDICHAM", + "level": 12, + "probability": 3333 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }] +} diff --git a/data/dungeon/ThunderwaveCave/floor_id.inc b/data/dungeon/ThunderwaveCave/floor_id.inc deleted file mode 100644 index c2d2c55..0000000 --- a/data/dungeon/ThunderwaveCave/floor_id.inc +++ /dev/null @@ -1,8 +0,0 @@ -.global ThunderwaveCaveFloorID -ThunderwaveCaveFloorID: -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x03, 0x00, 0x02, 0x00, 0x01, 0x00, 0x06, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 -.byte 0x04, 0x00, 0x02, 0x00, 0x01, 0x00, 0x06, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 -.byte 0x05, 0x00, 0x03, 0x00, 0x01, 0x00, 0x06, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 -.byte 0x06, 0x00, 0x04, 0x00, 0x01, 0x00, 0x07, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 -.byte 0x07, 0x00, 0x04, 0x00, 0x01, 0x00, 0x07, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 diff --git a/data/dungeon/ThunderwaveCave/floor_id.json b/data/dungeon/ThunderwaveCave/floor_id.json new file mode 100644 index 0000000..a90b7cb --- /dev/null +++ b/data/dungeon/ThunderwaveCave/floor_id.json @@ -0,0 +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 + } + ] +} diff --git a/data/dungeon/ThunderwaveCave/pokemon_found.inc b/data/dungeon/ThunderwaveCave/pokemon_found.inc deleted file mode 100644 index 007e8a0..0000000 --- a/data/dungeon/ThunderwaveCave/pokemon_found.inc +++ /dev/null @@ -1,28 +0,0 @@ -.global ThunderwaveCave_1F_2F_Pokemon -ThunderwaveCave_1F_2F_Pokemon: -.byte 0x13, 0x06, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00 -.byte 0x1d, 0x08, 0x4c, 0x1d, 0x4c, 0x1d, 0x00, 0x00 -.byte 0x1e, 0x07, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.global ThunderwaveCave_3F_Pokemon -ThunderwaveCave_3F_Pokemon: -.byte 0x13, 0x06, 0x47, 0x10, 0x47, 0x10, 0x00, 0x00 -.byte 0x1d, 0x08, 0x6a, 0x18, 0x6a, 0x18, 0x00, 0x00 -.byte 0x64, 0x06, 0xed, 0x1e, 0xed, 0x1e, 0x00, 0x00 -.byte 0x1e, 0x07, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.global ThunderwaveCave_4F_5F_Pokemon -ThunderwaveCave_4F_5F_Pokemon: -.byte 0x64, 0x06, 0x06, 0x0f, 0x06, 0x0f, 0x00, 0x00 -.byte 0x08, 0x09, 0x0b, 0x1b, 0x0b, 0x1b, 0x00, 0x00 -.byte 0x50, 0x07, 0x0e, 0x21, 0x0e, 0x21, 0x00, 0x00 -.byte 0x51, 0x07, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 diff --git a/data/dungeon/ThunderwaveCave/pokemon_found.json b/data/dungeon/ThunderwaveCave/pokemon_found.json new file mode 100644 index 0000000..676857b --- /dev/null +++ b/data/dungeon/ThunderwaveCave/pokemon_found.json @@ -0,0 +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 + } + ] + }] +} diff --git a/data/dungeon/TinyWoods/floor_id.inc b/data/dungeon/TinyWoods/floor_id.inc deleted file mode 100644 index 6d4a2de..0000000 --- a/data/dungeon/TinyWoods/floor_id.inc +++ /dev/null @@ -1,6 +0,0 @@ -.global TinyWoodsFloorID -TinyWoodsFloorID: -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 -.byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 -.byte 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x05, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 diff --git a/data/dungeon/TinyWoods/floor_id.json b/data/dungeon/TinyWoods/floor_id.json new file mode 100644 index 0000000..4471594 --- /dev/null +++ b/data/dungeon/TinyWoods/floor_id.json @@ -0,0 +1,32 @@ +{ + "name": "TinyWoodsFloorID", + "tables": [ + { + "MainData": 0, + "Pokemon": 0, + "Traps": 0, + "Items": 0, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1, + "Pokemon": 0, + "Traps": 0, + "Items": 4, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 2, + "Pokemon": 1, + "Traps": 0, + "Items": 5, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + } + ] +} diff --git a/data/dungeon/TinyWoods/pokemon_found.inc b/data/dungeon/TinyWoods/pokemon_found.inc deleted file mode 100644 index 9a5b566..0000000 --- a/data/dungeon/TinyWoods/pokemon_found.inc +++ /dev/null @@ -1,18 +0,0 @@ -.global TinyWoods1F_2FPokemon -TinyWoods1F_2F_Pokemon: -.byte 0x10, 0x02, 0x05, 0x0d, 0x05, 0x0d, 0x00, 0x00 -.byte 0xbf, 0x02, 0x0b, 0x1a, 0x0b, 0x1a, 0x00, 0x00 -.byte 0x22, 0x03, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.global TinyWoods3FPokemon -TinyWoods3F_Pokemon: -.byte 0x10, 0x02, 0x29, 0x0b, 0x29, 0x0b, 0x00, 0x00 -.byte 0x66, 0x02, 0xbe, 0x10, 0xbe, 0x10, 0x00, 0x00 -.byte 0xbf, 0x02, 0xe7, 0x1b, 0xe7, 0x1b, 0x00, 0x00 -.byte 0x22, 0x03, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 diff --git a/data/dungeon/TinyWoods/pokemon_found.json b/data/dungeon/TinyWoods/pokemon_found.json new file mode 100644 index 0000000..4f28076 --- /dev/null +++ b/data/dungeon/TinyWoods/pokemon_found.json @@ -0,0 +1,64 @@ +{ + "tables": [{ + "name": "TinyWoods1F_2F_Pokemon", + "pokemon": [{ + "species": "SPECIES_PIDGEY", + "level": 1, + "probability": 3333 + }, + { + "species": "SPECIES_SUNKERN", + "level": 1, + "probability": 3334 + }, + { + "species": "SPECIES_WURMPLE", + "level": 1, + "probability": 3333 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "TinyWoods3F_Pokemon", + "pokemon": [{ + "species": "SPECIES_PIDGEY", + "level": 1, + "probability": 2857 + }, + { + "species": "SPECIES_EXEGGCUTE", + "level": 1, + "probability": 1429 + }, + { + "species": "SPECIES_SUNKERN", + "level": 1, + "probability": 2857 + }, + { + "species": "SPECIES_WURMPLE", + "level": 1, + "probability": 2857 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }] +} diff --git a/data/dungeon/pokemon_found.inc b/data/dungeon/pokemon_found.inc index 9b5508b..220f1c7 100644 --- a/data/dungeon/pokemon_found.inc +++ b/data/dungeon/pokemon_found.inc @@ -1,5 +1,7 @@ @ Start of Pokemon Found (0x84b6064) +.include "include/constants/species.h" + .include "data/dungeon/TinyWoods/pokemon_found.inc" .include "data/dungeon/ThunderwaveCave/pokemon_found.inc" .include "data/dungeon/MtSteel/pokemon_found.inc" @@ -9,66 +11,16 @@ .include "data/dungeon/MtThunderPeak/pokemon_found.inc" .include "data/dungeon/GreatCanyon/pokemon_found.inc" .include "data/dungeon/LapisCave/pokemon_found.inc" +.include "data/dungeon/MtBlaze/pokemon_found.inc" +.include "data/dungeon/MtBlazePeak/pokemon_found.inc" +.include "data/dungeon/FrostyForest/pokemon_found.inc" +.include "data/dungeon/FrostyGrotto/pokemon_found.inc" +.include "data/dungeon/MtFreeze/pokemon_found.inc" +.include "data/dungeon/MtFreezePeak/pokemon_found.inc" -.byte 0x12, 0x20, 0x29, 0x0b, 0x29, 0x0b, 0x00, 0x00 -.byte 0xf3, 0x20, 0xbe, 0x10, 0xbe, 0x10, 0x00, 0x00 -.byte 0x09, 0x23, 0xe7, 0x1b, 0xe7, 0x1b, 0x00, 0x00 -.byte 0x5b, 0x1d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xf3, 0x20, 0xd0, 0x07, 0xd0, 0x07, 0x00, 0x00 -.byte 0x09, 0x23, 0x70, 0x17, 0x70, 0x17, 0x00, 0x00 -.byte 0x5b, 0x1d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.byte 0xee, 0x1e, 0x18, 0x05, 0x18, 0x05, 0x00, 0x00 -.byte 0xf3, 0x20, 0xe3, 0x0b, 0xe3, 0x0b, 0x00, 0x00 -.byte 0x09, 0x23, 0x7a, 0x19, 0x7a, 0x19, 0x00, 0x00 -.byte 0x5b, 0x1d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.byte 0xee, 0x1e, 0xd0, 0x07 -.byte 0xd0, 0x07, 0x00, 0x00, 0xf3, 0x20, 0x3b, 0x12, 0x3b, 0x12, 0x00, 0x00, 0x5b, 0x1d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xee, 0x1e, 0xd0, 0x07, 0xd0, 0x07, 0x00, 0x00, 0xf3, 0x20, 0x3b, 0x12, 0x3b, 0x12, 0x00, 0x00, 0x5d, 0x1f, 0x10, 0x27 -.byte 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4e, 0x14, 0x96, 0x0d -.byte 0x96, 0x0d, 0x00, 0x00, 0xee, 0x1e, 0xaf, 0x12, 0xaf, 0x12, 0x00, 0x00, 0xf3, 0x20, 0x7a, 0x19, 0x7a, 0x19, 0x00, 0x00, 0x5d, 0x1f, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4e, 0x14, 0xa0, 0x0f, 0xa0, 0x0f, 0x00, 0x00, 0xf3, 0x20, 0x70, 0x17 -.byte 0x70, 0x17, 0x00, 0x00, 0x5d, 0x1f, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x16, 0x22, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00, 0x3b, 0x24, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x92, 0x40, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa2, 0x1c, 0x6a, 0x18, 0x6a, 0x18, 0x00, 0x00, 0x43, 0x17, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa2, 0x1c, 0x47, 0x10, 0x47, 0x10, 0x00, 0x00, 0x43, 0x17, 0x0b, 0x1a -.byte 0x0b, 0x1a, 0x00, 0x00, 0x44, 0x1b, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x84, 0x32, 0x95, 0x05, 0x95, 0x05, 0x00, 0x00, 0xa2, 0x1c, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00, 0xf6, 0x1c, 0xe7, 0x1b, 0xe7, 0x1b, 0x00, 0x00, 0x44, 0x1b, 0x10, 0x27 -.byte 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x84, 0x32, 0xae, 0x08 -.byte 0xae, 0x08, 0x00, 0x00, 0xf6, 0x1c, 0xb4, 0x15, 0xb4, 0x15, 0x00, 0x00, 0x44, 0x1b, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x84, 0x32, 0xd0, 0x07, 0xd0, 0x07, 0x00, 0x00, 0x1f, 0x23, 0x70, 0x17, 0x70, 0x17, 0x00, 0x00, 0x4a, 0x23, 0x10, 0x27 -.byte 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x84, 0x32, 0x40, 0x06 -.byte 0x40, 0x06, 0x00, 0x00, 0x1f, 0x23, 0xc0, 0x12, 0xc0, 0x12, 0x00, 0x00, 0x4a, 0x23, 0x40, 0x1f, 0x40, 0x1f, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x85, 0x29, 0x10, 0x27 -.byte 0x10, 0x27, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6f, 0x20, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x93, 0x23, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x42, 0x10, 0x27 -.byte 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe5, 0x24, 0x57, 0x04 -.byte 0x57, 0x04, 0x00, 0x00, 0x66, 0x25, 0xb4, 0x15, 0xb4, 0x15, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x27, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x56, 0x24, 0xc7, 0x0a, 0xc7, 0x0a, 0x00, 0x00, 0xe5, 0x24, 0x78, 0x0d, 0x78, 0x0d, 0x00, 0x00, 0x10, 0x23, 0x83, 0x11 -.byte 0x83, 0x11, 0x00, 0x00, 0x66, 0x25, 0x49, 0x1c, 0x49, 0x1c, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x27, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x56, 0x24, 0x05, 0x0d, 0x05, 0x0d, 0x00, 0x00, 0x66, 0x25, 0x0b, 0x1a, 0x0b, 0x1a, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x90, 0x27, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x56, 0x24, 0x29, 0x0b -.byte 0x29, 0x0b, 0x00, 0x00, 0x39, 0x29, 0x52, 0x16, 0x52, 0x16, 0x00, 0x00, 0x68, 0x25, 0x7b, 0x21, 0x7b, 0x21, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x82, 0x2d, 0x10, 0x27 -.byte 0x10, 0x27, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x39, 0x29, 0xa0, 0x0f, 0xa0, 0x0f, 0x00, 0x00, 0x68, 0x25, 0x40, 0x1f -.byte 0x40, 0x1f, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x82, 0x2d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x3a, 0x1f, 0xa0, 0x0f, 0xa0, 0x0f, 0x00, 0x00, 0x68, 0x25, 0x40, 0x1f, 0x40, 0x1f, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x82, 0x2d, 0x10, 0x27 -.byte 0x10, 0x27, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3a, 0x1f, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00, 0x69, 0x27, 0x10, 0x27 -.byte 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x86, 0x29, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x6e, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x41, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x86, 0x29, 0x10, 0x27 -.byte 0x10, 0x27, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x26, 0xc4, 0x09, 0xc4, 0x09, 0x00, 0x00, 0x1b, 0x28, 0x88, 0x13 +.byte 0x14, 0x26, 0xc4, 0x09, 0xc4, 0x09, 0x00, 0x00, 0x1b, 0x28, 0x88, 0x13 .byte 0x88, 0x13, 0x00, 0x00, 0x1f, 0x28, 0x4c, 0x1d, 0x4c, 0x1d, 0x00, 0x00, 0x22, 0x2a, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1b, 0x28, 0x05, 0x0d, 0x05, 0x0d, 0x00, 0x00, 0x1f, 0x28, 0x0b, 0x1a, 0x0b, 0x1a, 0x00, 0x00, 0x22, 0x2a, 0x10, 0x27 .byte 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1b, 0x28, 0xc4, 0x09 @@ -1616,33 +1568,33 @@ DungeonPokemonFoundTable: .4byte LapisCave_11F_12F_Pokemon .4byte LapisCave_13F_Pokemon .4byte LapisCave_14F_Pokemon +.4byte MtBlaze_1F_3F_Pokemon +.4byte MtBlaze_4F_Pokemon +.4byte MtBlaze_5F_Pokemon +.4byte MtBlaze_6F_Pokemon +.4byte MtBlaze_7F_Pokemon +.4byte MtBlaze_8F_9F_Pokemon +.4byte MtBlaze_10F_12F_Pokemon +.4byte MtBlazePeak_1F_2F_Pokemon +.4byte MtBlazePeak_3F_Pokemon +.4byte FrostyForest_1F_2F_Pokemon +.4byte FrostyForest_3F_Pokemon +.4byte FrostyForest_4F_Pokemon +.4byte FrostyForest_5F_6F_Pokemon +.4byte FrostyForest_7F_Pokemon +.4byte FrostyForest_8F_9F_Pokemon +.4byte FrostyGrotto_1F_4F_Pokemon +.4byte FrostyGrotto_5F_Pokemon +.4byte MtFreeze_1F_2F_Pokemon +.4byte MtFreeze_3F_5F_Pokemon +.4byte MtFreeze_6F_Pokemon +.4byte MtFreeze_7F_Pokemon +.4byte MtFreeze_8F_11F_Pokemon +.4byte MtFreeze_12F_Pokemon +.4byte MtFreeze_13F_15F_Pokemon +.4byte MtFreezePeak_1F_4F_Pokemon +.4byte MtFreezePeak_5F_Pokemon -.byte 0xbc, 0x6c, 0x4b, 0x08 -.byte 0xf4, 0x6c, 0x4b, 0x08 -.byte 0x24, 0x6d, 0x4b, 0x08 -.byte 0x5c, 0x6d, 0x4b, 0x08 -.byte 0x8c, 0x6d, 0x4b, 0x08 -.byte 0xbc, 0x6d, 0x4b, 0x08 -.byte 0xf4, 0x6d, 0x4b, 0x08 -.byte 0x24, 0x6e, 0x4b, 0x08 -.byte 0x4c, 0x6e, 0x4b, 0x08 -.byte 0x6c, 0x6e, 0x4b, 0x08 -.byte 0x94, 0x6e, 0x4b, 0x08 -.byte 0xc4, 0x6e, 0x4b, 0x08 -.byte 0xfc, 0x6e, 0x4b, 0x08 -.byte 0x2c, 0x6f, 0x4b, 0x08 -.byte 0x5c, 0x6f, 0x4b, 0x08 -.byte 0x94, 0x6f, 0x4b, 0x08 -.byte 0xbc, 0x6f, 0x4b, 0x08 -.byte 0xdc, 0x6f, 0x4b, 0x08 -.byte 0x0c, 0x70, 0x4b, 0x08 -.byte 0x4c, 0x70, 0x4b, 0x08 -.byte 0x7c, 0x70, 0x4b, 0x08 -.byte 0xb4, 0x70, 0x4b, 0x08 -.byte 0xe4, 0x70, 0x4b, 0x08 -.byte 0x14, 0x71, 0x4b, 0x08 -.byte 0x3c, 0x71, 0x4b, 0x08 -.byte 0x5c, 0x71, 0x4b, 0x08 .byte 0x94, 0x71, 0x4b, 0x08 .byte 0xcc, 0x71, 0x4b, 0x08 .byte 0xfc, 0x71, 0x4b, 0x08 |