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, 300 insertions, 84 deletions

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