4 files changed, 150 insertions, 36 deletions
diff --git a/data/dungeon/ThunderwaveCave/floor_id.inc b/data/dungeon/ThunderwaveCave/floor_id.inc
deleted file mode 100644
index c2d2c55..0000000
--- a/data/dungeon/ThunderwaveCave/floor_id.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-.global ThunderwaveCaveFloorID
-ThunderwaveCaveFloorID:
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0x03, 0x00, 0x02, 0x00, 0x01, 0x00, 0x06, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
-.byte 0x04, 0x00, 0x02, 0x00, 0x01, 0x00, 0x06, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
-.byte 0x05, 0x00, 0x03, 0x00, 0x01, 0x00, 0x06, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
-.byte 0x06, 0x00, 0x04, 0x00, 0x01, 0x00, 0x07, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
-.byte 0x07, 0x00, 0x04, 0x00, 0x01, 0x00, 0x07, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
diff --git a/data/dungeon/ThunderwaveCave/floor_id.json b/data/dungeon/ThunderwaveCave/floor_id.json
new file mode 100644
index 0000000..a90b7cb
--- /dev/null
+++ b/data/dungeon/ThunderwaveCave/floor_id.json
@@ -0,0 +1,50 @@
+{
+    "name": "ThunderwaveCaveFloorID",
+    "tables": [
+        {
+            "MainData": 3,
+            "Pokemon": 2,
+            "Traps": 1,
+            "Items": 6,
+            "KecleonShop": 1,
+            "MonsterRoomItems": 2,
+            "BuriedItems": 3
+        },
+        {
+            "MainData": 4,
+            "Pokemon": 2,
+            "Traps": 1,
+            "Items": 6,
+            "KecleonShop": 1,
+            "MonsterRoomItems": 2,
+            "BuriedItems": 3
+        },
+        {
+            "MainData": 5,
+            "Pokemon": 3,
+            "Traps": 1,
+            "Items": 6,
+            "KecleonShop": 1,
+            "MonsterRoomItems": 2,
+            "BuriedItems": 3
+        },
+        {
+            "MainData": 6,
+            "Pokemon": 4,
+            "Traps": 1,
+            "Items": 7,
+            "KecleonShop": 1,
+            "MonsterRoomItems": 2,
+            "BuriedItems": 3
+        },
+        {
+            "MainData": 7,
+            "Pokemon": 4,
+            "Traps": 1,
+            "Items": 7,
+            "KecleonShop": 1,
+            "MonsterRoomItems": 2,
+            "BuriedItems": 3
+        }
+    ]
+}
diff --git a/data/dungeon/ThunderwaveCave/pokemon_found.inc b/data/dungeon/ThunderwaveCave/pokemon_found.inc
deleted file mode 100644
index 007e8a0..0000000
--- a/data/dungeon/ThunderwaveCave/pokemon_found.inc
+++ /dev/null
@@ -1,28 +0,0 @@
-.global ThunderwaveCave_1F_2F_Pokemon
-ThunderwaveCave_1F_2F_Pokemon:
-.byte 0x13, 0x06, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00
-.byte 0x1d, 0x08, 0x4c, 0x1d, 0x4c, 0x1d, 0x00, 0x00
-.byte 0x1e, 0x07, 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 ThunderwaveCave_3F_Pokemon
-ThunderwaveCave_3F_Pokemon:
-.byte 0x13, 0x06, 0x47, 0x10, 0x47, 0x10, 0x00, 0x00
-.byte 0x1d, 0x08, 0x6a, 0x18, 0x6a, 0x18, 0x00, 0x00
-.byte 0x64, 0x06, 0xed, 0x1e, 0xed, 0x1e, 0x00, 0x00
-.byte 0x1e, 0x07, 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 ThunderwaveCave_4F_5F_Pokemon
-ThunderwaveCave_4F_5F_Pokemon:
-.byte 0x64, 0x06, 0x06, 0x0f, 0x06, 0x0f, 0x00, 0x00
-.byte 0x08, 0x09, 0x0b, 0x1b, 0x0b, 0x1b, 0x00, 0x00
-.byte 0x50, 0x07, 0x0e, 0x21, 0x0e, 0x21, 0x00, 0x00
-.byte 0x51, 0x07, 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/ThunderwaveCave/pokemon_found.json b/data/dungeon/ThunderwaveCave/pokemon_found.json
new file mode 100644
index 0000000..676857b
--- /dev/null
+++ b/data/dungeon/ThunderwaveCave/pokemon_found.json
@@ -0,0 +1,100 @@
+{
+	"tables": [{
+		"name": "ThunderwaveCave_1F_2F_Pokemon",
+		"pokemon": [
+                        {
+				"species": "SPECIES_RATTATA",
+				"level": 3,
+				"probability": 5000
+			},
+			{
+				"species": "SPECIES_NIDORAN_F",
+				"level": 4,
+				"probability": 2500
+			},
+			{
+				"species": "SPECIES_POOCHYENA",
+				"level": 3,
+				"probability": 2500
+			},
+			{
+				"species": "SPECIES_KECLEON",
+				"level": 90,
+				"probability": 0
+			},
+			{
+				"species": "SPECIES_DECOY",
+				"level": 1,
+				"probability": 0
+			}
+		]
+	}, {
+		"name": "ThunderwaveCave_3F_Pokemon",
+		"pokemon": [
+                        {
+				"species": "SPECIES_RATTATA",
+				"level": 3,
+				"probability": 4167
+			},
+			{
+				"species": "SPECIES_NIDORAN_F",
+				"level": 4,
+				"probability": 2083
+			},
+			{
+				"species": "SPECIES_VOLTORB",
+				"level": 3,
+				"probability": 1667
+			},
+			{
+				"species": "SPECIES_POOCHYENA",
+				"level": 3,
+				"probability": 2083
+			},
+			{
+				"species": "SPECIES_KECLEON",
+				"level": 90,
+				"probability": 0
+			},
+			{
+				"species": "SPECIES_DECOY",
+				"level": 1,
+				"probability": 0
+			}
+		]
+	}, {
+		"name": "ThunderwaveCave_4F_5F_Pokemon",
+		"pokemon": [
+                        {
+				"species": "SPECIES_VOLTORB",
+				"level": 3,
+				"probability": 3846
+			},
+			{
+				"species": "SPECIES_ELEKID",
+				"level": 4,
+				"probability": 3077
+			},
+			{
+				"species": "SPECIES_PLUSLE",
+				"level": 3,
+				"probability": 1539
+			},
+			{
+				"species": "SPECIES_MINUN",
+				"level": 3,
+				"probability": 1538
+			},
+			{
+				"species": "SPECIES_KECLEON",
+				"level": 90,
+				"probability": 0
+			},
+			{
+				"species": "SPECIES_DECOY",
+				"level": 1,
+				"probability": 0
+			}
+		]
+	}]
+}