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/TinyWoods | |
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/TinyWoods')
-rw-r--r-- | data/dungeon/TinyWoods/floor_id.inc | 6 | ||||
-rw-r--r-- | data/dungeon/TinyWoods/floor_id.json | 32 | ||||
-rw-r--r-- | data/dungeon/TinyWoods/pokemon_found.inc | 18 | ||||
-rw-r--r-- | data/dungeon/TinyWoods/pokemon_found.json | 64 |
4 files changed, 96 insertions, 24 deletions
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 + } + ] + }] +} |