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, 446 insertions, 126 deletions

diff --git a/data/dungeon/SinisterWoods/pokemon_found.inc b/data/dungeon/SinisterWoods/pokemon_found.inc
deleted file mode 100644
index a31fbad..0000000
--- a/data/dungeon/SinisterWoods/pokemon_found.inc
+++ /dev/null
@@ -1,126 +0,0 @@
-.global SinisterWoods_1F_Pokemon
-SinisterWoods_1F_Pokemon:
-.byte 0x2b, 0x0e, 0x2b, 0x06, 0x2b, 0x06, 0x00, 0x00
-.byte 0xb9, 0x0e, 0x9d, 0x16, 0x9d, 0x16, 0x00, 0x00
-.byte 0xf5, 0x10, 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 SinisterWoods_2F_Pokemon
-SinisterWoods_2F_Pokemon:
-.byte 0x2b, 0x0e, 0x54, 0x05, 0x54, 0x05, 0x00, 0x00
-.byte 0xb9, 0x0e, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00
-.byte 0xc0, 0x10, 0xdc, 0x18, 0xdc, 0x18, 0x00, 0x00
-.byte 0xf5, 0x10, 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 SinisterWoods_3F_Pokemon
-SinisterWoods_3F_Pokemon:
-.byte 0x2b, 0x0e, 0xe8, 0x03, 0xe8, 0x03, 0x00, 0x00
-.byte 0xa1, 0x0c, 0x53, 0x0e, 0x53, 0x0e, 0x00, 0x00
-.byte 0xb9, 0x0e, 0xbd, 0x18, 0xbd, 0x18, 0x00, 0x00
-.byte 0xc0, 0x10, 0xa5, 0x1c, 0xa5, 0x1c, 0x00, 0x00
-.byte 0xf5, 0x10, 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 SinisterWoods_4F_Pokemon
-SinisterWoods_4F_Pokemon:
-.byte 0x2b, 0x0e, 0xa9, 0x03, 0xa9, 0x03, 0x00, 0x00
-.byte 0xa1, 0x0c, 0x6d, 0x0d, 0x6d, 0x0d, 0x00, 0x00
-.byte 0xb9, 0x0e, 0x31, 0x17, 0x31, 0x17, 0x00, 0x00
-.byte 0xc0, 0x10, 0xdb, 0x1a, 0xdb, 0x1a, 0x00, 0x00
-.byte 0x23, 0x11, 0xf5, 0x20, 0xf5, 0x20, 0x00, 0x00
-.byte 0x25, 0x11, 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 SinisterWoods_5F_Pokemon
-SinisterWoods_5F_Pokemon:
-.byte 0xa1, 0x0c, 0xe2, 0x0e, 0xe2, 0x0e, 0x00, 0x00
-.byte 0xc0, 0x10, 0x76, 0x14, 0x76, 0x14, 0x00, 0x00
-.byte 0x23, 0x11, 0xc3, 0x1d, 0xc3, 0x1d, 0x00, 0x00
-.byte 0x25, 0x11, 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 SinisterWoods_6F_Pokemon
-SinisterWoods_6F_Pokemon:
-.byte 0xa1, 0x0c, 0xc7, 0x0a, 0xc7, 0x0a, 0x00, 0x00
-.byte 0xc0, 0x10, 0xd1, 0x0e, 0xd1, 0x0e, 0x00, 0x00
-.byte 0x23, 0x11, 0x8d, 0x15, 0x8d, 0x15, 0x00, 0x00
-.byte 0x25, 0x11, 0x49, 0x1c, 0x49, 0x1c, 0x00, 0x00
-.byte 0x36, 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 SinisterWoods_7F_Pokemon
-SinisterWoods_7F_Pokemon:
-.byte 0xa5, 0x0e, 0x60, 0x09, 0x60, 0x09, 0x00, 0x00
-.byte 0xc0, 0x10, 0x10, 0x0e, 0x10, 0x0e, 0x00, 0x00
-.byte 0x21, 0x11, 0x90, 0x1a, 0x90, 0x1a, 0x00, 0x00
-.byte 0x36, 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 SinisterWoods_8F_9F_Pokemon
-SinisterWoods_8F_9F_Pokemon:
-.byte 0x7b, 0x14, 0xee, 0x08, 0xee, 0x08, 0x00, 0x00
-.byte 0xa5, 0x0e, 0xa0, 0x0f, 0xa0, 0x0f, 0x00, 0x00
-.byte 0xc2, 0x14, 0x35, 0x15, 0x35, 0x15, 0x00, 0x00
-.byte 0x21, 0x11, 0x22, 0x1e, 0x22, 0x1e, 0x00, 0x00
-.byte 0x36, 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 SinisterWoods_10F_Pokemon
-SinisterWoods_10F_Pokemon:
-.byte 0x67, 0x10, 0x21, 0x06, 0x21, 0x06, 0x00, 0x00
-.byte 0x7b, 0x14, 0x41, 0x0c, 0x41, 0x0c, 0x00, 0x00
-.byte 0xa3, 0x0c, 0x62, 0x12, 0x62, 0x12, 0x00, 0x00
-.byte 0xa5, 0x0e, 0xfa, 0x16, 0xfa, 0x16, 0x00, 0x00
-.byte 0xc2, 0x14, 0xcf, 0x1a, 0xcf, 0x1a, 0x00, 0x00
-.byte 0x36, 0x13, 0xef, 0x20, 0xef, 0x20, 0x00, 0x00
-.byte 0x38, 0x11, 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 SinisterWoods_11F_Pokemon
-SinisterWoods_11F_Pokemon:
-.byte 0x67, 0x10, 0xd0, 0x07, 0xd0, 0x07, 0x00, 0x00
-.byte 0x7b, 0x14, 0xa0, 0x0f, 0xa0, 0x0f, 0x00, 0x00
-.byte 0xa3, 0x0c, 0x70, 0x17, 0x70, 0x17, 0x00, 0x00
-.byte 0x36, 0x13, 0x40, 0x1f, 0x40, 0x1f, 0x00, 0x00
-.byte 0x38, 0x11, 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 SinisterWoods_12F_Pokemon
-SinisterWoods_12F_Pokemon:
-.byte 0x67, 0x10, 0xc4, 0x09, 0xc4, 0x09, 0x00, 0x00
-.byte 0xa3, 0x0c, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00
-.byte 0x36, 0x13, 0x4c, 0x1d, 0x4c, 0x1d, 0x00, 0x00
-.byte 0x38, 0x11, 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 SinisterWoods_13F_Pokemon
-SinisterWoods_13F_Pokemon:
-.byte 0x17, 0x1e, 0x05, 0x0d, 0x05, 0x0d, 0x00, 0x00
-.byte 0x5e, 0x1e, 0x0b, 0x1a, 0x0b, 0x1a, 0x00, 0x00
-.byte 0x4d, 0x19, 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/SinisterWoods/pokemon_found.json b/data/dungeon/SinisterWoods/pokemon_found.json
new file mode 100644
index 0000000..f9f1d69
--- /dev/null
+++ b/data/dungeon/SinisterWoods/pokemon_found.json
@@ -0,0 +1,446 @@
+{
+	"tables": [{
+		"name": "SinisterWoods_1F_Pokemon",
+		"pokemon": [
+                        {
+				"species": "SPECIES_ODDISH",
+				"level": 7,
+				"probability": 1579
+			},
+			{
+				"species": "SPECIES_SUDOWOODO",
+				"level": 7,
+				"probability": 4210
+			},
+			{
+				"species": "SPECIES_SWINUB",
+				"level": 8,
+				"probability": 4211
+			},
+			{
+				"species": "SPECIES_KECLEON",
+				"level": 90,
+				"probability": 0
+			},
+			{
+				"species": "SPECIES_DECOY",
+				"level": 1,
+				"probability": 0
+			}
+		]
+	}, {
+		"name": "SinisterWoods_2F_Pokemon",
+		"pokemon": [
+                        {
+				"species": "SPECIES_ODDISH",
+				"level": 7,
+				"probability": 1364
+			},
+			{
+				"species": "SPECIES_SUDOWOODO",
+				"level": 7,
+				"probability": 3636
+			},
+			{
+				"species": "SPECIES_SUNFLORA",
+				"level": 8,
+				"probability": 1364
+			},
+			{
+				"species": "SPECIES_SWINUB",
+				"level": 8,
+				"probability": 3636
+			},
+			{
+				"species": "SPECIES_KECLEON",
+				"level": 90,
+				"probability": 0
+			},
+			{
+				"species": "SPECIES_DECOY",
+				"level": 1,
+				"probability": 0
+			}
+		]
+	}, {
+		"name": "SinisterWoods_3F_Pokemon",
+		"pokemon": [
+                        {
+				"species": "SPECIES_ODDISH",
+				"level": 7,
+				"probability": 1000
+			},
+			{
+				"species": "SPECIES_SENTRET",
+				"level": 6,
+				"probability": 2667
+			},
+			{
+				"species": "SPECIES_SUDOWOODO",
+				"level": 7,
+				"probability": 2666
+			},
+			{
+				"species": "SPECIES_SUNFLORA",
+				"level": 8,
+				"probability": 1000
+			},
+			{
+				"species": "SPECIES_SWINUB",
+				"level": 8,
+				"probability": 2667
+			},
+			{
+				"species": "SPECIES_KECLEON",
+				"level": 90,
+				"probability": 0
+			},
+			{
+				"species": "SPECIES_DECOY",
+				"level": 1,
+				"probability": 0
+			}
+		]
+	}, {
+		"name": "SinisterWoods_4F_Pokemon",
+		"pokemon": [
+                        {
+				"species": "SPECIES_ODDISH",
+				"level": 7,
+				"probability": 937
+			},
+			{
+				"species": "SPECIES_SENTRET",
+				"level": 6,
+				"probability": 2500
+			},
+			{
+				"species": "SPECIES_SUDOWOODO",
+				"level": 7,
+				"probability": 2500
+			},
+			{
+				"species": "SPECIES_SUNFLORA",
+				"level": 8,
+				"probability": 938
+			},
+			{
+				"species": "SPECIES_SILCOON",
+				"level": 8,
+				"probability": 1562
+			},
+			{
+				"species": "SPECIES_CASCOON",
+				"level": 8,
+				"probability": 1563
+			},
+			{
+				"species": "SPECIES_KECLEON",
+				"level": 90,
+				"probability": 0
+			},
+			{
+				"species": "SPECIES_DECOY",
+				"level": 1,
+				"probability": 0
+			}
+		]
+	}, {
+		"name": "SinisterWoods_5F_Pokemon",
+		"pokemon": [
+                        {
+				"species": "SPECIES_SENTRET",
+				"level": 6,
+				"probability": 3810
+			},
+			{
+				"species": "SPECIES_SUNFLORA",
+				"level": 8,
+				"probability": 1428
+			},
+			{
+				"species": "SPECIES_SILCOON",
+				"level": 8,
+				"probability": 2381
+			},
+			{
+				"species": "SPECIES_CASCOON",
+				"level": 8,
+				"probability": 2381
+			},
+			{
+				"species": "SPECIES_KECLEON",
+				"level": 90,
+				"probability": 0
+			},
+			{
+				"species": "SPECIES_DECOY",
+				"level": 1,
+				"probability": 0
+			}
+		]
+	}, {
+		"name": "SinisterWoods_6F_Pokemon",
+		"pokemon": [
+                        {
+				"species": "SPECIES_SENTRET",
+				"level": 6,
+				"probability": 2759
+			},
+			{
+				"species": "SPECIES_SUNFLORA",
+				"level": 8,
+				"probability": 1034
+			},
+			{
+				"species": "SPECIES_SILCOON",
+				"level": 8,
+				"probability": 1724
+			},
+			{
+				"species": "SPECIES_CASCOON",
+				"level": 8,
+				"probability": 1724
+			},
+			{
+				"species": "SPECIES_SHROOMISH",
+				"level": 9,
+				"probability": 2759
+			},
+			{
+				"species": "SPECIES_KECLEON",
+				"level": 90,
+				"probability": 0
+			},
+			{
+				"species": "SPECIES_DECOY",
+				"level": 1,
+				"probability": 0
+			}
+		]
+	}, {
+		"name": "SinisterWoods_7F_Pokemon",
+		"pokemon": [
+                        {
+				"species": "SPECIES_LEDYBA",
+				"level": 7,
+				"probability": 2400
+			},
+			{
+				"species": "SPECIES_SUNFLORA",
+				"level": 8,
+				"probability": 1200
+			},
+			{
+				"species": "SPECIES_LINOONE",
+				"level": 8,
+				"probability": 3200
+			},
+			{
+				"species": "SPECIES_SHROOMISH",
+				"level": 9,
+				"probability": 3200
+			},
+			{
+				"species": "SPECIES_KECLEON",
+				"level": 90,
+				"probability": 0
+			},
+			{
+				"species": "SPECIES_DECOY",
+				"level": 1,
+				"probability": 0
+			}
+		]
+	}, {
+		"name": "SinisterWoods_8F_9F_Pokemon",
+		"pokemon": [
+                        {
+				"species": "SPECIES_SCYTHER",
+				"level": 10,
+				"probability": 2286
+			},
+			{
+				"species": "SPECIES_LEDYBA",
+				"level": 7,
+				"probability": 1714
+			},
+			{
+				"species": "SPECIES_WOOPER",
+				"level": 10,
+				"probability": 1429
+			},
+			{
+				"species": "SPECIES_LINOONE",
+				"level": 8,
+				"probability": 2285
+			},
+			{
+				"species": "SPECIES_SHROOMISH",
+				"level": 9,
+				"probability": 2286
+			},
+			{
+				"species": "SPECIES_KECLEON",
+				"level": 90,
+				"probability": 0
+			},
+			{
+				"species": "SPECIES_DECOY",
+				"level": 1,
+				"probability": 0
+			}
+		]
+	}, {
+		"name": "SinisterWoods_10F_Pokemon",
+		"pokemon": [
+                        {
+				"species": "SPECIES_EXEGGUTOR",
+				"level": 8,
+				"probability": 1569
+			},
+			{
+				"species": "SPECIES_SCYTHER",
+				"level": 10,
+				"probability": 1568
+			},
+			{
+				"species": "SPECIES_HOOTHOOT",
+				"level": 6,
+				"probability": 1569
+			},
+			{
+				"species": "SPECIES_LEDYBA",
+				"level": 7,
+				"probability": 1176
+			},
+			{
+				"species": "SPECIES_WOOPER",
+				"level": 10,
+				"probability": 981
+			},
+			{
+				"species": "SPECIES_SHROOMISH",
+				"level": 9,
+				"probability": 1568
+			},
+			{
+				"species": "SPECIES_SLAKOTH",
+				"level": 8,
+				"probability": 1569
+			},
+			{
+				"species": "SPECIES_KECLEON",
+				"level": 90,
+				"probability": 0
+			},
+			{
+				"species": "SPECIES_DECOY",
+				"level": 1,
+				"probability": 0
+			}
+		]
+	}, {
+		"name": "SinisterWoods_11F_Pokemon",
+		"pokemon": [
+                        {
+				"species": "SPECIES_EXEGGUTOR",
+				"level": 8,
+				"probability": 2000
+			},
+			{
+				"species": "SPECIES_SCYTHER",
+				"level": 10,
+				"probability": 2000
+			},
+			{
+				"species": "SPECIES_HOOTHOOT",
+				"level": 6,
+				"probability": 2000
+			},
+			{
+				"species": "SPECIES_SHROOMISH",
+				"level": 9,
+				"probability": 2000
+			},
+			{
+				"species": "SPECIES_SLAKOTH",
+				"level": 8,
+				"probability": 2000
+			},
+			{
+				"species": "SPECIES_KECLEON",
+				"level": 90,
+				"probability": 0
+			},
+			{
+				"species": "SPECIES_DECOY",
+				"level": 1,
+				"probability": 0
+			}
+		]
+	}, {
+		"name": "SinisterWoods_12F_Pokemon",
+		"pokemon": [
+                        {
+				"species": "SPECIES_EXEGGUTOR",
+				"level": 8,
+				"probability": 2500
+			},
+			{
+				"species": "SPECIES_HOOTHOOT",
+				"level": 6,
+				"probability": 2500
+			},
+			{
+				"species": "SPECIES_SHROOMISH",
+				"level": 9,
+				"probability": 2500
+			},
+			{
+				"species": "SPECIES_SLAKOTH",
+				"level": 8,
+				"probability": 2500
+			},
+			{
+				"species": "SPECIES_KECLEON",
+				"level": 90,
+				"probability": 0
+			},
+			{
+				"species": "SPECIES_DECOY",
+				"level": 1,
+				"probability": 0
+			}
+		]
+	}, {
+		"name": "SinisterWoods_13F_Pokemon",
+		"pokemon": [
+                        {
+				"species": "SPECIES_EKANS",
+				"level": 15,
+				"probability": 3333
+			},
+			{
+				"species": "SPECIES_GENGAR",
+				"level": 15,
+				"probability": 3334
+			},
+			{
+				"species": "SPECIES_MEDICHAM",
+				"level": 12,
+				"probability": 3333
+			},
+			{
+				"species": "SPECIES_KECLEON",
+				"level": 90,
+				"probability": 0
+			},
+			{
+				"species": "SPECIES_DECOY",
+				"level": 1,
+				"probability": 0
+			}
+		]
+	}]
+}