convert Sky Tower and Sky Tower Summit to JSON

3 files changed, 640 insertions, 65 deletions

diff --git a/data/dungeon/SkyTower/pokemon_found.json b/data/dungeon/SkyTower/pokemon_found.json
new file mode 100644
index 0000000..e38ad03
--- /dev/null
+++ b/data/dungeon/SkyTower/pokemon_found.json
@@ -0,0 +1,466 @@
+{
+	"tables": [{
+		"name": "SkyTower_1F_5F_Pokemon",
+		"pokemon": [
+                        {
+                            "species": "SPECIES_FORRETRESS",
+                            "level": 23,
+                            "probability": 2581
+                        },
+                        {
+                            "species": "SPECIES_MASQUERAIN",
+                            "level": 27,
+                            "probability": 1290
+                        },
+                        {
+                            "species": "SPECIES_SHEDINJA",
+                            "level": 5,
+                            "probability": 968
+                        },
+                        {
+                            "species": "SPECIES_LUNATONE",
+                            "level": 24,
+                            "probability": 2580
+                        },
+                        {
+                            "species": "SPECIES_KECLEON",
+                            "level": 90,
+                            "probability": 0
+                        },
+                        {
+                            "species": "SPECIES_SHUPPET",
+                            "level": 28,
+                            "probability": 2581
+                        },
+                        {
+                            "species": "SPECIES_DECOY",
+                            "level": 1,
+                            "probability": 0
+                        }
+		]
+	}, {
+		"name": "SkyTower_6F_Pokemon",
+		"pokemon": [
+                        {
+                            "species": "SPECIES_FORRETRESS",
+                            "level": 23,
+                            "probability": 2857
+                        },
+                        {
+                            "species": "SPECIES_MASQUERAIN",
+                            "level": 27,
+                            "probability": 1429
+                        },
+                        {
+                            "species": "SPECIES_LUNATONE",
+                            "level": 24,
+                            "probability": 2857
+                        },
+                        {
+                            "species": "SPECIES_KECLEON",
+                            "level": 90,
+                            "probability": 0
+                        },
+                        {
+                            "species": "SPECIES_SHUPPET",
+                            "level": 28,
+                            "probability": 2857
+                        },
+                        {
+                            "species": "SPECIES_DECOY",
+                            "level": 1,
+                            "probability": 0
+                        }
+		]
+	}, {
+		"name": "SkyTower_7F_8F_Pokemon",
+		"pokemon": [
+                        {
+                            "species": "SPECIES_MASQUERAIN",
+                            "level": 27,
+                            "probability": 2000
+                        },
+                        {
+                            "species": "SPECIES_LUNATONE",
+                            "level": 24,
+                            "probability": 4000
+                        },
+                        {
+                            "species": "SPECIES_KECLEON",
+                            "level": 90,
+                            "probability": 0
+                        },
+                        {
+                            "species": "SPECIES_DUSKULL",
+                            "level": 27,
+                            "probability": 4000
+                        },
+                        {
+                            "species": "SPECIES_DECOY",
+                            "level": 1,
+                            "probability": 0
+                        }
+		]
+	}, {
+		"name": "SkyTower_9F_Pokemon",
+		"pokemon": [
+                        {
+                            "species": "SPECIES_KOFFING",
+                            "level": 24,
+                            "probability": 3333
+                        },
+                        {
+                            "species": "SPECIES_LUNATONE",
+                            "level": 24,
+                            "probability": 3334
+                        },
+                        {
+                            "species": "SPECIES_KECLEON",
+                            "level": 90,
+                            "probability": 0
+                        },
+                        {
+                            "species": "SPECIES_DUSKULL",
+                            "level": 27,
+                            "probability": 3333
+                        },
+                        {
+                            "species": "SPECIES_DECOY",
+                            "level": 1,
+                            "probability": 0
+                        }
+		]
+	}, {
+		"name": "SkyTower_10F_11F_Pokemon",
+		"pokemon": [
+                        {
+                            "species": "SPECIES_KOFFING",
+                            "level": 24,
+                            "probability": 2581
+                        },
+                        {
+                            "species": "SPECIES_LEDIAN",
+                            "level": 24,
+                            "probability": 2258
+                        },
+                        {
+                            "species": "SPECIES_LUNATONE",
+                            "level": 24,
+                            "probability": 2580
+                        },
+                        {
+                            "species": "SPECIES_KECLEON",
+                            "level": 90,
+                            "probability": 0
+                        },
+                        {
+                            "species": "SPECIES_DUSKULL",
+                            "level": 27,
+                            "probability": 2581
+                        },
+                        {
+                            "species": "SPECIES_DECOY",
+                            "level": 1,
+                            "probability": 0
+                        }
+		]
+	}, {
+		"name": "SkyTower_12F_14F_Pokemon",
+		"pokemon": [
+                        {
+                            "species": "SPECIES_KOFFING",
+                            "level": 24,
+                            "probability": 2051
+                        },
+                        {
+                            "species": "SPECIES_LEDIAN",
+                            "level": 24,
+                            "probability": 1795
+                        },
+                        {
+                            "species": "SPECIES_ALTARIA",
+                            "level": 24,
+                            "probability": 2051
+                        },
+                        {
+                            "species": "SPECIES_SOLROCK",
+                            "level": 24,
+                            "probability": 2052
+                        },
+                        {
+                            "species": "SPECIES_KECLEON",
+                            "level": 90,
+                            "probability": 0
+                        },
+                        {
+                            "species": "SPECIES_DUSKULL",
+                            "level": 27,
+                            "probability": 2051
+                        },
+                        {
+                            "species": "SPECIES_DECOY",
+                            "level": 1,
+                            "probability": 0
+                        }
+		]
+	}, {
+		"name": "SkyTower_15F_16F_Pokemon",
+		"pokemon": [
+                        {
+                            "species": "SPECIES_KOFFING",
+                            "level": 24,
+                            "probability": 2051
+                        },
+                        {
+                            "species": "SPECIES_LEDIAN",
+                            "level": 24,
+                            "probability": 1795
+                        },
+                        {
+                            "species": "SPECIES_SCIZOR",
+                            "level": 24,
+                            "probability": 2051
+                        },
+                        {
+                            "species": "SPECIES_ALTARIA",
+                            "level": 24,
+                            "probability": 2052
+                        },
+                        {
+                            "species": "SPECIES_SOLROCK",
+                            "level": 24,
+                            "probability": 2051
+                        },
+                        {
+                            "species": "SPECIES_KECLEON",
+                            "level": 90,
+                            "probability": 0
+                        },
+                        {
+                            "species": "SPECIES_DECOY",
+                            "level": 1,
+                            "probability": 0
+                        }
+		]
+	}, {
+		"name": "SkyTower_17F_Pokemon",
+		"pokemon": [
+                        {
+                            "species": "SPECIES_LEDIAN",
+                            "level": 24,
+                            "probability": 1795
+                        },
+                        {
+                            "species": "SPECIES_SCIZOR",
+                            "level": 24,
+                            "probability": 2051
+                        },
+                        {
+                            "species": "SPECIES_ALTARIA",
+                            "level": 24,
+                            "probability": 2051
+                        },
+                        {
+                            "species": "SPECIES_SOLROCK",
+                            "level": 24,
+                            "probability": 2052
+                        },
+                        {
+                            "species": "SPECIES_KECLEON",
+                            "level": 90,
+                            "probability": 0
+                        },
+                        {
+                            "species": "SPECIES_DUSCLOPS",
+                            "level": 24,
+                            "probability": 2051
+                        },
+                        {
+                            "species": "SPECIES_DECOY",
+                            "level": 1,
+                            "probability": 0
+                        }
+		]
+	}, {
+		"name": "SkyTower_18F_19F_Pokemon",
+		"pokemon": [
+                        {
+                            "species": "SPECIES_SCIZOR",
+                            "level": 24,
+                            "probability": 2500
+                        },
+                        {
+                            "species": "SPECIES_ALTARIA",
+                            "level": 24,
+                            "probability": 2500
+                        },
+                        {
+                            "species": "SPECIES_SOLROCK",
+                            "level": 24,
+                            "probability": 2500
+                        },
+                        {
+                            "species": "SPECIES_KECLEON",
+                            "level": 90,
+                            "probability": 0
+                        },
+                        {
+                            "species": "SPECIES_DUSCLOPS",
+                            "level": 24,
+                            "probability": 2500
+                        },
+                        {
+                            "species": "SPECIES_DECOY",
+                            "level": 1,
+                            "probability": 0
+                        }
+		]
+	}, {
+		"name": "SkyTower_20F_Pokemon",
+		"pokemon": [
+                        {
+                            "species": "SPECIES_VENOMOTH",
+                            "level": 18,
+                            "probability": 2500
+                        },
+                        {
+                            "species": "SPECIES_SCIZOR",
+                            "level": 24,
+                            "probability": 2500
+                        },
+                        {
+                            "species": "SPECIES_SOLROCK",
+                            "level": 24,
+                            "probability": 2500
+                        },
+                        {
+                            "species": "SPECIES_KECLEON",
+                            "level": 90,
+                            "probability": 0
+                        },
+                        {
+                            "species": "SPECIES_DUSCLOPS",
+                            "level": 24,
+                            "probability": 2500
+                        },
+                        {
+                            "species": "SPECIES_DECOY",
+                            "level": 1,
+                            "probability": 0
+                        }
+		]
+	}, {
+		"name": "SkyTower_21F_Pokemon",
+		"pokemon": [
+                        {
+                            "species": "SPECIES_VENOMOTH",
+                            "level": 18,
+                            "probability": 2222
+                        },
+                        {
+                            "species": "SPECIES_AERODACTYL",
+                            "level": 25,
+                            "probability": 2222
+                        },
+                        {
+                            "species": "SPECIES_SCIZOR",
+                            "level": 24,
+                            "probability": 2223
+                        },
+                        {
+                            "species": "SPECIES_FLYGON",
+                            "level": 27,
+                            "probability": 1111
+                        },
+                        {
+                            "species": "SPECIES_KECLEON",
+                            "level": 90,
+                            "probability": 0
+                        },
+                        {
+                            "species": "SPECIES_DUSCLOPS",
+                            "level": 24,
+                            "probability": 2222
+                        },
+                        {
+                            "species": "SPECIES_DECOY",
+                            "level": 1,
+                            "probability": 0
+                        }
+		]
+	}, {
+		"name": "SkyTower_22F_23F_Pokemon",
+		"pokemon": [
+                        {
+                            "species": "SPECIES_VENOMOTH",
+                            "level": 18,
+                            "probability": 2500
+                        },
+                        {
+                            "species": "SPECIES_AERODACTYL",
+                            "level": 25,
+                            "probability": 2500
+                        },
+                        {
+                            "species": "SPECIES_FLYGON",
+                            "level": 27,
+                            "probability": 1250
+                        },
+                        {
+                            "species": "SPECIES_KECLEON",
+                            "level": 90,
+                            "probability": 0
+                        },
+                        {
+                            "species": "SPECIES_DUSCLOPS",
+                            "level": 24,
+                            "probability": 2500
+                        },
+                        {
+                            "species": "SPECIES_TROPIUS",
+                            "level": 27,
+                            "probability": 1250
+                        },
+                        {
+                            "species": "SPECIES_DECOY",
+                            "level": 1,
+                            "probability": 0
+                        }
+		]
+	}, {
+		"name": "SkyTower_24F_25F_Pokemon",
+		"pokemon": [
+                        {
+                            "species": "SPECIES_VENOMOTH",
+                            "level": 18,
+                            "probability": 3333
+                        },
+                        {
+                            "species": "SPECIES_AERODACTYL",
+                            "level": 25,
+                            "probability": 3334
+                        },
+                        {
+                            "species": "SPECIES_FLYGON",
+                            "level": 27,
+                            "probability": 1666
+                        },
+                        {
+                            "species": "SPECIES_KECLEON",
+                            "level": 90,
+                            "probability": 0
+                        },
+                        {
+                            "species": "SPECIES_TROPIUS",
+                            "level": 27,
+                            "probability": 1667
+                        },
+                        {
+                            "species": "SPECIES_DECOY",
+                            "level": 1,
+                            "probability": 0
+                        }
+		]
+        }
+        ]
+}
diff --git a/data/dungeon/SkyTowerSummit/pokemon_found.json b/data/dungeon/SkyTowerSummit/pokemon_found.json
new file mode 100644
index 0000000..75237dc
--- /dev/null
+++ b/data/dungeon/SkyTowerSummit/pokemon_found.json
@@ -0,0 +1,66 @@
+{
+	"tables": [{
+		"name": "SkyTowerSummit_1F_8F_Pokemon",
+		"pokemon": [
+                        {
+                            "species": "SPECIES_AERODACTYL",
+                            "level": 25,
+                            "probability": 1667
+                        },
+                        {
+                            "species": "SPECIES_FLYGON",
+                            "level": 27,
+                            "probability": 1666
+                        },
+                        {
+                            "species": "SPECIES_CLAYDOL",
+                            "level": 26,
+                            "probability": 1667
+                        },
+                        {
+                            "species": "SPECIES_KECLEON",
+                            "level": 90,
+                            "probability": 0
+                        },
+                        {
+                            "species": "SPECIES_TROPIUS",
+                            "level": 27,
+                            "probability": 1667
+                        },
+                        {
+                            "species": "SPECIES_SALAMENCE",
+                            "level": 29,
+                            "probability": 1666
+                        },
+                        {
+                            "species": "SPECIES_METAGROSS",
+                            "level": 30,
+                            "probability": 1667
+                        },
+                        {
+                            "species": "SPECIES_DECOY",
+                            "level": 1,
+                            "probability": 0
+                        }
+		]
+	}, {
+		"name": "SkyTowerSummit_9F_Pokemon",
+		"pokemon": [
+                        {
+                            "species": "SPECIES_KECLEON",
+                            "level": 90,
+                            "probability": 0
+                        },
+                        {
+                            "species": "SPECIES_RAYQUAZA",
+                            "level": 35,
+                            "probability": 10000
+                        },
+                        {
+                            "species": "SPECIES_DECOY",
+                            "level": 1,
+                            "probability": 0
+                        }
+		]
+	}]
+}
diff --git a/data/dungeon/pokemon_found.inc b/data/dungeon/pokemon_found.inc
index 3816001..67ca464 100644
--- a/data/dungeon/pokemon_found.inc
+++ b/data/dungeon/pokemon_found.inc
@@ -19,57 +19,59 @@
 .include "data/dungeon/MtFreezePeak/pokemon_found.inc"
 .include "data/dungeon/MagmaCavern/pokemon_found.inc"
 .include "data/dungeon/MagmaCavernPit/pokemon_found.inc"
+.include "data/dungeon/SkyTower/pokemon_found.inc"
+.include "data/dungeon/SkyTowerSummit/pokemon_found.inc"
 
 
+.byte 0x48, 0x32, 0x1a, 0x07, 0x1a, 0x07, 0x00, 0x00
+.byte 0x49, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+.byte 0x5a, 0x28, 0xc1, 0x11, 0xc1, 0x11, 0x00, 0x00
+.byte 0x8a, 0x32, 0x69, 0x1c, 0x69, 0x1c, 0x00, 0x00
+.byte 0x8b, 0x46, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+.byte 0x2f, 0x2f, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
+.byte 0x30, 0x2f, 0x00, 0x00, 0x00, 0x00, 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
+
+.byte 0x48, 0x32, 0xc4, 0x09, 0xc4, 0x09, 0x00, 0x00
+.byte 0x49, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+.byte 0x5a, 0x28, 0x6a, 0x18, 0x6a, 0x18, 0x00, 0x00
+.byte 0x8a, 0x32, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
+.byte 0x8b, 0x46, 0x00, 0x00, 0x00, 0x00, 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
 
+.byte 0x56, 0x3c, 0x1a, 0x07, 0x1a, 0x07, 0x00, 0x00
+.byte 0x57, 0x46, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+.byte 0x8a, 0x32, 0x4f, 0x15, 0x4f, 0x15, 0x00, 0x00
+.byte 0x8b, 0x46, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+.byte 0x74, 0x2b, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
+.byte 0x75, 0x39, 0x00, 0x00, 0x00, 0x00, 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
 
+.byte 0x56, 0x3c, 0x29, 0x0b, 0x29, 0x0b, 0x00, 0x00
+.byte 0x57, 0x46, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+.byte 0x74, 0x2b, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
+.byte 0x75, 0x39, 0x00, 0x00, 0x00, 0x00, 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
 
-.byte 0xe6, 0x2e, 0x15, 0x0a, 0x15, 0x0a, 0x00, 0x00
-.byte 0x35, 0x37, 0x1f, 0x0f, 0x1f, 0x0f, 0x00, 0x00
-.byte 0x3d, 0x0b, 0xe7, 0x12, 0xe7, 0x12, 0x00, 0x00
-.byte 0x6a, 0x31, 0xfb, 0x1c, 0xfb, 0x1c, 0x00, 0x00
+.byte 0x4f, 0x32, 0x34, 0x0e, 0x34, 0x0e, 0x00, 0x00
+.byte 0x50, 0x36, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+.byte 0x56, 0x3c, 0x4f, 0x15, 0x4f, 0x15, 0x00, 0x00
+.byte 0x57, 0x46, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+.byte 0x74, 0x2b, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
+.byte 0x75, 0x39, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 .byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0x7d, 0x39, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
 .byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 
-.byte 0xe6, 0x2e, 0x29, 0x0b, 0x29, 0x0b, 0x00, 0x00, 0x35, 0x37, 0xbe, 0x10, 0xbe, 0x10, 0x00, 0x00, 0x6a, 0x31, 0xe7, 0x1b
-.byte 0xe7, 0x1b, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7d, 0x39, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x35, 0x37, 0xd0, 0x07, 0xd0, 0x07, 0x00, 0x00, 0x6a, 0x31, 0x70, 0x17, 0x70, 0x17, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x37, 0x10, 0x27
-.byte 0x10, 0x27, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6d, 0x30, 0x05, 0x0d, 0x05, 0x0d, 0x00, 0x00, 0x6a, 0x31, 0x0b, 0x1a
-.byte 0x0b, 0x1a, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x37, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x6d, 0x30, 0x15, 0x0a, 0x15, 0x0a, 0x00, 0x00, 0xa6, 0x30, 0xe7, 0x12, 0xe7, 0x12, 0x00, 0x00, 0x6a, 0x31, 0xfb, 0x1c, 0xfb, 0x1c, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x7f, 0x37, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6d, 0x30, 0x03, 0x08
-.byte 0x03, 0x08, 0x00, 0x00, 0xa6, 0x30, 0x06, 0x0f, 0x06, 0x0f, 0x00, 0x00, 0x67, 0x31, 0x09, 0x17, 0x09, 0x17, 0x00, 0x00, 0x6b, 0x31, 0x0d, 0x1f, 0x0d, 0x1f, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x7f, 0x37, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6d, 0x30, 0x03, 0x08
-.byte 0x03, 0x08, 0x00, 0x00, 0xa6, 0x30, 0x06, 0x0f, 0x06, 0x0f, 0x00, 0x00, 0xed, 0x30, 0x09, 0x17, 0x09, 0x17, 0x00, 0x00, 0x67, 0x31, 0x0d, 0x1f, 0x0d, 0x1f, 0x00, 0x00, 0x6b, 0x31, 0x10, 0x27
-.byte 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa6, 0x30, 0x03, 0x07
-.byte 0x03, 0x07, 0x00, 0x00, 0xed, 0x30, 0x06, 0x0f, 0x06, 0x0f, 0x00, 0x00, 0x67, 0x31, 0x09, 0x17, 0x09, 0x17, 0x00, 0x00, 0x6b, 0x31, 0x0d, 0x1f, 0x0d, 0x1f, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x80, 0x31, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xed, 0x30, 0xc4, 0x09
-.byte 0xc4, 0x09, 0x00, 0x00, 0x67, 0x31, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00, 0x6b, 0x31, 0x4c, 0x1d, 0x4c, 0x1d, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x31, 0x10, 0x27
-.byte 0x10, 0x27, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x31, 0x24, 0xc4, 0x09, 0xc4, 0x09, 0x00, 0x00, 0xed, 0x30, 0x88, 0x13
-.byte 0x88, 0x13, 0x00, 0x00, 0x6b, 0x31, 0x4c, 0x1d, 0x4c, 0x1d, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x31, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x31, 0x24, 0xae, 0x08, 0xae, 0x08, 0x00, 0x00, 0x8e, 0x32, 0x5c, 0x11, 0x5c, 0x11, 0x00, 0x00, 0xed, 0x30, 0x0b, 0x1a
-.byte 0x0b, 0x1a, 0x00, 0x00, 0x63, 0x37, 0x62, 0x1e, 0x62, 0x1e, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x31, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x31, 0x24, 0xc4, 0x09, 0xc4, 0x09, 0x00, 0x00, 0x8e, 0x32, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00, 0x63, 0x37, 0x6a, 0x18
-.byte 0x6a, 0x18, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x31, 0x2e, 0x22, 0x2e, 0x22, 0x00, 0x00, 0x81, 0x37, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x31, 0x24, 0x05, 0x0d, 0x05, 0x0d, 0x00, 0x00, 0x8e, 0x32, 0x0b, 0x1a, 0x0b, 0x1a, 0x00, 0x00, 0x63, 0x37, 0x8d, 0x20
-.byte 0x8d, 0x20, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0x37, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x8e, 0x32, 0x83, 0x06, 0x83, 0x06, 0x00, 0x00, 0x63, 0x37, 0x05, 0x0d, 0x05, 0x0d, 0x00, 0x00, 0x71, 0x35, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x81, 0x37, 0x0b, 0x1a, 0x0b, 0x1a, 0x00, 0x00, 0x91, 0x3b, 0x8d, 0x20, 0x8d, 0x20, 0x00, 0x00, 0x94, 0x3d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9c, 0x47, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0x32, 0x1a, 0x07, 0x1a, 0x07, 0x00, 0x00, 0x49, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5a, 0x28, 0xc1, 0x11
-.byte 0xc1, 0x11, 0x00, 0x00, 0x8a, 0x32, 0x69, 0x1c, 0x69, 0x1c, 0x00, 0x00, 0x8b, 0x46, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2f, 0x2f, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0x30, 0x2f, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0x32, 0xc4, 0x09
-.byte 0xc4, 0x09, 0x00, 0x00, 0x49, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5a, 0x28, 0x6a, 0x18, 0x6a, 0x18, 0x00, 0x00, 0x8a, 0x32, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0x8b, 0x46, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x56, 0x3c, 0x1a, 0x07
-.byte 0x1a, 0x07, 0x00, 0x00, 0x57, 0x46, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8a, 0x32, 0x4f, 0x15, 0x4f, 0x15, 0x00, 0x00, 0x8b, 0x46, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x74, 0x2b, 0x10, 0x27
-.byte 0x10, 0x27, 0x00, 0x00, 0x75, 0x39, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x56, 0x3c, 0x29, 0x0b, 0x29, 0x0b, 0x00, 0x00, 0x57, 0x46, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x74, 0x2b, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0x75, 0x39, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4f, 0x32, 0x34, 0x0e
-.byte 0x34, 0x0e, 0x00, 0x00, 0x50, 0x36, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x56, 0x3c, 0x4f, 0x15, 0x4f, 0x15, 0x00, 0x00, 0x57, 0x46, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x74, 0x2b, 0x10, 0x27
-.byte 0x10, 0x27, 0x00, 0x00, 0x75, 0x39, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x4f, 0x32, 0x05, 0x0c, 0x05, 0x0c, 0x00, 0x00, 0x74, 0x2b, 0x0b, 0x1b, 0x0b, 0x1b, 0x00, 0x00, 0x75, 0x39, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00
+.byte 0x4f, 0x32, 0x05, 0x0c, 0x05, 0x0c, 0x00, 0x00, 0x74, 0x2b, 0x0b, 0x1b, 0x0b, 0x1b, 0x00, 0x00, 0x75, 0x39, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00
 .byte 0x00, 0x00, 0x00, 0x00, 0x87, 0x25, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0x88, 0x2d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x39, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00
 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4f, 0x32, 0xa6, 0x0e, 0xa6, 0x0e, 0x00, 0x00, 0x8b, 0x46, 0x6a, 0x18, 0x6a, 0x18, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00
 .byte 0x00, 0x00, 0x00, 0x00, 0x87, 0x25, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0x88, 0x2d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x39, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00
@@ -1581,29 +1583,70 @@ DungeonPokemonFoundTable:
 .4byte MtFreeze_13F_15F_Pokemon
 .4byte MtFreezePeak_1F_4F_Pokemon
 .4byte MtFreezePeak_5F_Pokemon
-
-.byte 0x94, 0x71, 0x4b, 0x08
-.byte 0xcc, 0x71, 0x4b, 0x08
-.byte 0xfc, 0x71, 0x4b, 0x08
-.byte 0x34, 0x72, 0x4b, 0x08
-.byte 0x5c, 0x72, 0x4b, 0x08
-.byte 0x94, 0x72, 0x4b, 0x08
-.byte 0xd4, 0x72, 0x4b, 0x08
-.byte 0x0c, 0x73, 0x4b, 0x08
-.byte 0x3c, 0x73, 0x4b, 0x08
-.byte 0x64, 0x73, 0x4b, 0x08
-.byte 0x94, 0x73, 0x4b, 0x08
-.byte 0xcc, 0x73, 0x4b, 0x08
-.byte 0xf4, 0x73, 0x4b, 0x08
-.byte 0x14, 0x74, 0x4b, 0x08
-.byte 0x3c, 0x74, 0x4b, 0x08
-.byte 0x64, 0x74, 0x4b, 0x08
-.byte 0x8c, 0x74, 0x4b, 0x08, 0xcc, 0x74, 0x4b, 0x08, 0x04, 0x75, 0x4b, 0x08, 0x34, 0x75, 0x4b, 0x08, 0x64, 0x75, 0x4b, 0x08, 0x9c, 0x75, 0x4b, 0x08, 0xdc, 0x75, 0x4b, 0x08, 0x1c, 0x76, 0x4b, 0x08
-.byte 0x5c, 0x76, 0x4b, 0x08, 0x94, 0x76, 0x4b, 0x08, 0xcc, 0x76, 0x4b, 0x08, 0x0c, 0x77, 0x4b, 0x08, 0x4c, 0x77, 0x4b, 0x08, 0x84, 0x77, 0x4b, 0x08, 0xcc, 0x77, 0x4b, 0x08, 0xec, 0x77, 0x4b, 0x08
-.byte 0x3c, 0x78, 0x4b, 0x08, 0x7c, 0x78, 0x4b, 0x08, 0xc4, 0x78, 0x4b, 0x08, 0xfc, 0x78, 0x4b, 0x08, 0x44, 0x79, 0x4b, 0x08, 0x8c, 0x79, 0x4b, 0x08, 0xcc, 0x79, 0x4b, 0x08, 0x0c, 0x7a, 0x4b, 0x08
-.byte 0x3c, 0x7a, 0x4b, 0x08, 0x74, 0x7a, 0x4b, 0x08, 0xa4, 0x7a, 0x4b, 0x08, 0xdc, 0x7a, 0x4b, 0x08, 0x1c, 0x7b, 0x4b, 0x08, 0x64, 0x7b, 0x4b, 0x08, 0xb4, 0x7b, 0x4b, 0x08, 0xd4, 0x7b, 0x4b, 0x08
-.byte 0x14, 0x7c, 0x4b, 0x08, 0x64, 0x7c, 0x4b, 0x08, 0xbc, 0x7c, 0x4b, 0x08, 0x0c, 0x7d, 0x4b, 0x08, 0x54, 0x7d, 0x4b, 0x08, 0x94, 0x7d, 0x4b, 0x08, 0xd4, 0x7d, 0x4b, 0x08, 0x24, 0x7e, 0x4b, 0x08
-.byte 0x64, 0x7e, 0x4b, 0x08, 0x9c, 0x7e, 0x4b, 0x08, 0xd4, 0x7e, 0x4b, 0x08, 0x14, 0x7f, 0x4b, 0x08, 0x64, 0x7f, 0x4b, 0x08, 0xac, 0x7f, 0x4b, 0x08, 0xec, 0x7f, 0x4b, 0x08, 0x3c, 0x80, 0x4b, 0x08
+.4byte MagmaCavern_1F_3F_Pokemon
+.4byte MagmaCavern_4F_Pokemon
+.4byte MagmaCavern_5F_6F_Pokemon
+.4byte MagmaCavern_7F_Pokemon
+.4byte MagmaCavern_8F_Pokemon
+.4byte MagmaCavern_9F_10F_Pokemon
+.4byte MagmaCavern_11F_Pokemon
+.4byte MagmaCavern_12F_Pokemon
+.4byte MagmaCavern_13F_Pokemon
+.4byte MagmaCavern_14F_Pokemon
+.4byte MagmaCavern_15F_20F_Pokemon
+.4byte MagmaCavern_21F_Pokemon
+.4byte MagmaCavern_22F_23F_Pokemon
+.4byte MagmaCavernPit_1F_Pokemon
+.4byte MagmaCavernPit_2F_Pokemon
+.4byte MagmaCavernPit_3F_Pokemon
+.4byte SkyTower_1F_5F_Pokemon
+.4byte SkyTower_6F_Pokemon
+.4byte SkyTower_7F_8F_Pokemon
+.4byte SkyTower_9F_Pokemon
+.4byte SkyTower_10F_11F_Pokemon
+.4byte SkyTower_12F_14F_Pokemon
+.4byte SkyTower_15F_16F_Pokemon
+.4byte SkyTower_17F_Pokemon
+.4byte SkyTower_18F_19F_Pokemon
+.4byte SkyTower_20F_Pokemon
+.4byte SkyTower_21F_Pokemon
+.4byte SkyTower_22F_23F_Pokemon
+.4byte SkyTower_24F_25F_Pokemon
+.4byte SkyTowerSummit_1F_8F_Pokemon
+.4byte SkyTowerSummit_9F_Pokemon
+.byte 0xec, 0x77, 0x4b, 0x08
+.byte 0x3c, 0x78, 0x4b, 0x08
+.byte 0x7c, 0x78, 0x4b, 0x08
+.byte 0xc4, 0x78, 0x4b, 0x08
+.byte 0xfc, 0x78, 0x4b, 0x08
+.byte 0x44, 0x79, 0x4b, 0x08
+.byte 0x8c, 0x79, 0x4b, 0x08
+.byte 0xcc, 0x79, 0x4b, 0x08
+.byte 0x0c, 0x7a, 0x4b, 0x08
+.byte 0x3c, 0x7a, 0x4b, 0x08
+.byte 0x74, 0x7a, 0x4b, 0x08
+.byte 0xa4, 0x7a, 0x4b, 0x08
+.byte 0xdc, 0x7a, 0x4b, 0x08
+.byte 0x1c, 0x7b, 0x4b, 0x08
+.byte 0x64, 0x7b, 0x4b, 0x08
+.byte 0xb4, 0x7b, 0x4b, 0x08
+.byte 0xd4, 0x7b, 0x4b, 0x08
+.byte 0x14, 0x7c, 0x4b, 0x08
+.byte 0x64, 0x7c, 0x4b, 0x08
+.byte 0xbc, 0x7c, 0x4b, 0x08
+.byte 0x0c, 0x7d, 0x4b, 0x08
+.byte 0x54, 0x7d, 0x4b, 0x08
+.byte 0x94, 0x7d, 0x4b, 0x08
+.byte 0xd4, 0x7d, 0x4b, 0x08
+.byte 0x24, 0x7e, 0x4b, 0x08
+.byte 0x64, 0x7e, 0x4b, 0x08
+.byte 0x9c, 0x7e, 0x4b, 0x08
+.byte 0xd4, 0x7e, 0x4b, 0x08
+.byte 0x14, 0x7f, 0x4b, 0x08
+.byte 0x64, 0x7f, 0x4b, 0x08
+.byte 0xac, 0x7f, 0x4b, 0x08
+.byte 0xec, 0x7f, 0x4b, 0x08
+.byte 0x3c, 0x80, 0x4b, 0x08
 .byte 0x84, 0x80, 0x4b, 0x08, 0xc4, 0x80, 0x4b, 0x08, 0xf4, 0x80, 0x4b, 0x08, 0x2c, 0x81, 0x4b, 0x08, 0x54, 0x81, 0x4b, 0x08, 0x9c, 0x81, 0x4b, 0x08, 0xd4, 0x81, 0x4b, 0x08, 0x0c, 0x82, 0x4b, 0x08
 .byte 0x54, 0x82, 0x4b, 0x08, 0x94, 0x82, 0x4b, 0x08, 0xd4, 0x82, 0x4b, 0x08, 0x0c, 0x83, 0x4b, 0x08, 0x44, 0x83, 0x4b, 0x08, 0x7c, 0x83, 0x4b, 0x08, 0xac, 0x83, 0x4b, 0x08, 0xdc, 0x83, 0x4b, 0x08
 .byte 0xfc, 0x83, 0x4b, 0x08, 0x2c, 0x84, 0x4b, 0x08, 0x64, 0x84, 0x4b, 0x08, 0xa4, 0x84, 0x4b, 0x08, 0xec, 0x84, 0x4b, 0x08, 0x24, 0x85, 0x4b, 0x08, 0x64, 0x85, 0x4b, 0x08, 0x94, 0x85, 0x4b, 0x08