From 377bd14ea67d6177250fb401e12d7dfcf44e2cf6 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Wed, 9 Jun 2021 22:54:21 -0500 Subject: 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 --- data/dungeon/LapisCave/pokemon_found.inc | 57 ---------- data/dungeon/LapisCave/pokemon_found.json | 174 ++++++++++++++++++++++++++++++ 2 files changed, 174 insertions(+), 57 deletions(-) delete mode 100644 data/dungeon/LapisCave/pokemon_found.inc create mode 100644 data/dungeon/LapisCave/pokemon_found.json (limited to 'data/dungeon/LapisCave') 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 + } + ] + }] +} -- cgit v1.2.3