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

4 files changed, 274 insertions, 65 deletions

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