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, 284 insertions, 85 deletions

diff --git a/data/dungeon/GreatCanyon/pokemon_found.inc b/data/dungeon/GreatCanyon/pokemon_found.inc
deleted file mode 100644
index cafa22e..0000000
--- a/data/dungeon/GreatCanyon/pokemon_found.inc
+++ /dev/null
@@ -1,85 +0,0 @@
-.global GreatCanyon_1F_3F_Pokemon
-GreatCanyon_1F_3F_Pokemon:
-.byte 0x54, 0x1c, 0x95, 0x05, 0x95, 0x05, 0x00, 0x00
-.byte 0xbc, 0x1a, 0xbe, 0x10, 0xbe, 0x10, 0x00, 0x00
-.byte 0xe7, 0x1a, 0xe7, 0x1b, 0xe7, 0x1b, 0x00, 0x00
-.byte 0x00, 0x1d, 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 GreatCanyon_4F_Pokemon
-GreatCanyon_4F_Pokemon:
-.byte 0x2d, 0x1c, 0xa0, 0x0f, 0xa0, 0x0f, 0x00, 0x00
-.byte 0x54, 0x1c, 0x70, 0x17, 0x70, 0x17, 0x00, 0x00
-.byte 0x37, 0x1d, 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 GreatCanyon_5F_Pokemon
-GreatCanyon_5F_Pokemon:
-.byte 0x2d, 0x1c, 0xc4, 0x09, 0xc4, 0x09, 0x00, 0x00
-.byte 0xc6, 0x1c, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00
-.byte 0x37, 0x1d, 0x4c, 0x1d, 0x4c, 0x1d, 0x00, 0x00
-.byte 0x65, 0x1d, 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 GreatCanyon_6F_Pokemon
-GreatCanyon_6F_Pokemon:
-.byte 0x2d, 0x1c, 0xd0, 0x07, 0xd0, 0x07, 0x00, 0x00
-.byte 0xa4, 0x1c, 0xa0, 0x0f, 0xa0, 0x0f, 0x00, 0x00
-.byte 0xc6, 0x1c, 0x70, 0x17, 0x70, 0x17, 0x00, 0x00
-.byte 0x37, 0x1d, 0x40, 0x1f, 0x40, 0x1f, 0x00, 0x00
-.byte 0x65, 0x1d, 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 GreatCanyon_7F_Pokemon
-GreatCanyon_7F_Pokemon:
-.byte 0xa4, 0x1c, 0xc4, 0x09, 0xc4, 0x09, 0x00, 0x00
-.byte 0xc6, 0x1c, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00
-.byte 0xef, 0x1c, 0x4c, 0x1d, 0x4c, 0x1d, 0x00, 0x00
-.byte 0x65, 0x1d, 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 GreatCanyon_8F_Pokemon
-GreatCanyon_8F_Pokemon:
-.byte 0xa4, 0x1c, 0xc4, 0x09, 0xc4, 0x09, 0x00, 0x00
-.byte 0xa8, 0x1c, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00
-.byte 0xef, 0x1c, 0x4c, 0x1d, 0x4c, 0x1d, 0x00, 0x00
-.byte 0x65, 0x1d, 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 GreatCanyon_9F_Pokemon
-GreatCanyon_9F_Pokemon:
-.byte 0xa8, 0x1c, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00
-.byte 0xef, 0x1c, 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 GreatCanyon_10F_11F_Pokemon
-GreatCanyon_10F_11F_Pokemon:
-.byte 0x80, 0x1e, 0x05, 0x0c, 0x05, 0x0c, 0x00, 0x00
-.byte 0xa8, 0x1c, 0x0a, 0x18, 0x0a, 0x18, 0x00, 0x00
-.byte 0xfe, 0x1e, 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 GreatCanyon_12F_Pokemon
-GreatCanyon_12F_Pokemon:
-.byte 0x80, 0x1e, 0x5c, 0x11, 0x5c, 0x11, 0x00, 0x00
-.byte 0xfe, 0x1e, 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/GreatCanyon/pokemon_found.json b/data/dungeon/GreatCanyon/pokemon_found.json
new file mode 100644
index 0000000..bf2dde4
--- /dev/null
+++ b/data/dungeon/GreatCanyon/pokemon_found.json
@@ -0,0 +1,284 @@
+{
+	"tables": [{
+		"name": "GreatCanyon_1F_3F_Pokemon",
+		"pokemon": [
+                        {
+				"species": "SPECIES_DODUO",
+				"level": 14,
+				"probability": 1429
+			},
+			{
+				"species": "SPECIES_SKIPLOOM",
+				"level": 13,
+				"probability": 2857
+			},
+			{
+				"species": "SPECIES_DUNSPARCE",
+				"level": 13,
+				"probability": 2857
+			},
+			{
+				"species": "SPECIES_PHANPY",
+				"level": 14,
+				"probability": 2857
+			},
+			{
+				"species": "SPECIES_KECLEON",
+				"level": 90,
+				"probability": 0
+			},
+			{
+				"species": "SPECIES_DECOY",
+				"level": 1,
+				"probability": 0
+			}
+		]
+	}, {
+		"name": "GreatCanyon_4F_Pokemon",
+		"pokemon": [
+                        {
+				"species": "SPECIES_VILEPLUME",
+				"level": 14,
+				"probability": 4000
+			},
+			{
+				"species": "SPECIES_DODUO",
+				"level": 14,
+				"probability": 2000
+			},
+			{
+				"species": "SPECIES_BRELOOM",
+				"level": 14,
+				"probability": 4000
+			},
+			{
+				"species": "SPECIES_KECLEON",
+				"level": 90,
+				"probability": 0
+			},
+			{
+				"species": "SPECIES_DECOY",
+				"level": 1,
+				"probability": 0
+			}
+		]
+	}, {
+		"name": "GreatCanyon_5F_Pokemon",
+		"pokemon": [
+                        {
+				"species": "SPECIES_VILEPLUME",
+				"level": 14,
+				"probability": 2500
+			},
+			{
+				"species": "SPECIES_MURKROW",
+				"level": 14,
+				"probability": 2500
+			},
+			{
+				"species": "SPECIES_BRELOOM",
+				"level": 14,
+				"probability": 2500
+			},
+			{
+				"species": "SPECIES_CACTURNE",
+				"level": 14,
+				"probability": 2500
+			},
+			{
+				"species": "SPECIES_KECLEON",
+				"level": 90,
+				"probability": 0
+			},
+			{
+				"species": "SPECIES_DECOY",
+				"level": 1,
+				"probability": 0
+			}
+		]
+	}, {
+		"name": "GreatCanyon_6F_Pokemon",
+		"pokemon": [
+                        {
+				"species": "SPECIES_VILEPLUME",
+				"level": 14,
+				"probability": 2000
+			},
+			{
+				"species": "SPECIES_NOCTOWL",
+				"level": 14,
+				"probability": 2000
+			},
+			{
+				"species": "SPECIES_MURKROW",
+				"level": 14,
+				"probability": 2000
+			},
+			{
+				"species": "SPECIES_BRELOOM",
+				"level": 14,
+				"probability": 2000
+			},
+			{
+				"species": "SPECIES_CACTURNE",
+				"level": 14,
+				"probability": 2000
+			},
+			{
+				"species": "SPECIES_KECLEON",
+				"level": 90,
+				"probability": 0
+			},
+			{
+				"species": "SPECIES_DECOY",
+				"level": 1,
+				"probability": 0
+			}
+		]
+	}, {
+		"name": "GreatCanyon_7F_Pokemon",
+		"pokemon": [
+			{
+				"species": "SPECIES_NOCTOWL",
+				"level": 14,
+				"probability": 2500
+			},
+			{
+				"species": "SPECIES_MURKROW",
+				"level": 14,
+				"probability": 2500
+			},
+			{
+				"species": "SPECIES_HERACROSS",
+				"level": 14,
+				"probability": 2500
+			},
+			{
+				"species": "SPECIES_CACTURNE",
+				"level": 14,
+				"probability": 2500
+			},
+			{
+				"species": "SPECIES_KECLEON",
+				"level": 90,
+				"probability": 0
+			},
+			{
+				"species": "SPECIES_DECOY",
+				"level": 1,
+				"probability": 0
+			}
+		]
+	}, {
+		"name": "GreatCanyon_8F_Pokemon",
+		"pokemon": [
+			{
+				"species": "SPECIES_NOCTOWL",
+				"level": 14,
+				"probability": 2500
+			},
+			{
+				"species": "SPECIES_ARIADOS",
+				"level": 14,
+				"probability": 2500
+			},
+			{
+				"species": "SPECIES_HERACROSS",
+				"level": 14,
+				"probability": 2500
+			},
+			{
+				"species": "SPECIES_CACTURNE",
+				"level": 14,
+				"probability": 2500
+			},
+			{
+				"species": "SPECIES_KECLEON",
+				"level": 90,
+				"probability": 0
+			},
+			{
+				"species": "SPECIES_DECOY",
+				"level": 1,
+				"probability": 0
+			}
+		]
+	}, {
+		"name": "GreatCanyon_9F_Pokemon",
+		"pokemon": [
+			{
+				"species": "SPECIES_ARIADOS",
+				"level": 14,
+				"probability": 5000
+			},
+			{
+				"species": "SPECIES_HERACROSS",
+				"level": 14,
+				"probability": 5000
+			},
+			{
+				"species": "SPECIES_KECLEON",
+				"level": 90,
+				"probability": 0
+			},
+			{
+				"species": "SPECIES_DECOY",
+				"level": 1,
+				"probability": 0
+			}
+		]
+	}, {
+		"name": "GreatCanyon_10F_11F_Pokemon",
+		"pokemon": [
+			{
+				"species": "SPECIES_TAUROS",
+				"level": 15,
+				"probability": 3077
+			},
+			{
+				"species": "SPECIES_ARIADOS",
+				"level": 14,
+				"probability": 3077
+			},
+			{
+				"species": "SPECIES_HOUNDOOM",
+				"level": 15,
+				"probability": 3846
+			},
+			{
+				"species": "SPECIES_KECLEON",
+				"level": 90,
+				"probability": 0
+			},
+			{
+				"species": "SPECIES_DECOY",
+				"level": 1,
+				"probability": 0
+			}
+		]
+	}, {
+		"name": "GreatCanyon_12F_Pokemon",
+		"pokemon": [
+			{
+				"species": "SPECIES_TAUROS",
+				"level": 15,
+				"probability": 4444
+			},
+			{
+				"species": "SPECIES_HOUNDOOM",
+				"level": 15,
+				"probability": 5556
+			},
+			{
+				"species": "SPECIES_KECLEON",
+				"level": 90,
+				"probability": 0
+			},
+			{
+				"species": "SPECIES_DECOY",
+				"level": 1,
+				"probability": 0
+			}
+		]
+	}]
+}