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

2 files changed, 316 insertions, 84 deletions

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
+			}
+		]
+	}]
+}