summaryrefslogtreecommitdiff
path: root/data/dungeon/MarvelousSea
diff options
context:
space:
mode:
Diffstat (limited to 'data/dungeon/MarvelousSea')
-rw-r--r--data/dungeon/MarvelousSea/floor_id.inc14
-rw-r--r--data/dungeon/MarvelousSea/floor_id.json185
2 files changed, 185 insertions, 14 deletions
diff --git a/data/dungeon/MarvelousSea/floor_id.inc b/data/dungeon/MarvelousSea/floor_id.inc
deleted file mode 100644
index e93f23f..0000000
--- a/data/dungeon/MarvelousSea/floor_id.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-.global MarvelousSeaFloorID
-MarvelousSeaFloorID:
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2f, 0x04, 0xf6, 0x01, 0x56, 0x00, 0x79, 0x00, 0x01, 0x00, 0x2e, 0x00
-.byte 0x03, 0x00, 0x00, 0x00, 0x30, 0x04, 0xf6, 0x01, 0x56, 0x00, 0x79, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, 0x00, 0x00, 0x31, 0x04, 0xf6, 0x01, 0x56, 0x00, 0x79, 0x00, 0x01, 0x00, 0x2e, 0x00
-.byte 0x03, 0x00, 0x00, 0x00, 0x32, 0x04, 0xf6, 0x01, 0x56, 0x00, 0x7a, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, 0x00, 0x00, 0x33, 0x04, 0xf6, 0x01, 0x56, 0x00, 0x7a, 0x00, 0x01, 0x00, 0x2e, 0x00
-.byte 0x03, 0x00, 0x00, 0x00, 0x34, 0x04, 0xf7, 0x01, 0x56, 0x00, 0x7a, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, 0x00, 0x00, 0x35, 0x04, 0xf7, 0x01, 0x56, 0x00, 0x7a, 0x00, 0x01, 0x00, 0x2e, 0x00
-.byte 0x03, 0x00, 0x00, 0x00, 0x36, 0x04, 0xf7, 0x01, 0x56, 0x00, 0x7a, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, 0x00, 0x00, 0x37, 0x04, 0xf8, 0x01, 0x56, 0x00, 0x7a, 0x00, 0x01, 0x00, 0x2e, 0x00
-.byte 0x03, 0x00, 0x00, 0x00, 0x38, 0x04, 0xf9, 0x01, 0x56, 0x00, 0x7a, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, 0x00, 0x00, 0x39, 0x04, 0xf9, 0x01, 0x56, 0x00, 0x7a, 0x00, 0x01, 0x00, 0x2e, 0x00
-.byte 0x03, 0x00, 0x00, 0x00, 0x3a, 0x04, 0xf9, 0x01, 0x56, 0x00, 0x7a, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, 0x00, 0x00, 0x3b, 0x04, 0xf9, 0x01, 0x56, 0x00, 0x7a, 0x00, 0x01, 0x00, 0x2e, 0x00
-.byte 0x03, 0x00, 0x00, 0x00, 0x3c, 0x04, 0xfa, 0x01, 0x56, 0x00, 0x7a, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, 0x00, 0x00, 0x3d, 0x04, 0xfb, 0x01, 0x56, 0x00, 0x7a, 0x00, 0x01, 0x00, 0x2e, 0x00
-.byte 0x03, 0x00, 0x00, 0x00, 0x3e, 0x04, 0xfb, 0x01, 0x56, 0x00, 0x7a, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, 0x00, 0x00, 0x3f, 0x04, 0xfb, 0x01, 0x56, 0x00, 0x7a, 0x00, 0x01, 0x00, 0x2e, 0x00
-.byte 0x03, 0x00, 0x00, 0x00, 0x40, 0x04, 0xfb, 0x01, 0x56, 0x00, 0x7a, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, 0x00, 0x00, 0x41, 0x04, 0xfb, 0x01, 0x56, 0x00, 0x7a, 0x00, 0x01, 0x00, 0x2e, 0x00
-.byte 0x03, 0x00, 0x00, 0x00, 0x42, 0x04, 0xfc, 0x01, 0x56, 0x00, 0x7a, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, 0x00, 0x00
-
diff --git a/data/dungeon/MarvelousSea/floor_id.json b/data/dungeon/MarvelousSea/floor_id.json
new file mode 100644
index 0000000..ffd84e4
--- /dev/null
+++ b/data/dungeon/MarvelousSea/floor_id.json
@@ -0,0 +1,185 @@
+{
+ "name": "MarvelousSeaFloorID",
+ "tables": [
+ {
+ "MainData": 1071,
+ "Pokemon": 502,
+ "Traps": 86,
+ "Items": 121,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 46,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1072,
+ "Pokemon": 502,
+ "Traps": 86,
+ "Items": 121,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 46,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1073,
+ "Pokemon": 502,
+ "Traps": 86,
+ "Items": 121,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 46,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1074,
+ "Pokemon": 502,
+ "Traps": 86,
+ "Items": 122,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 46,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1075,
+ "Pokemon": 502,
+ "Traps": 86,
+ "Items": 122,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 46,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1076,
+ "Pokemon": 503,
+ "Traps": 86,
+ "Items": 122,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 46,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1077,
+ "Pokemon": 503,
+ "Traps": 86,
+ "Items": 122,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 46,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1078,
+ "Pokemon": 503,
+ "Traps": 86,
+ "Items": 122,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 46,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1079,
+ "Pokemon": 504,
+ "Traps": 86,
+ "Items": 122,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 46,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1080,
+ "Pokemon": 505,
+ "Traps": 86,
+ "Items": 122,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 46,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1081,
+ "Pokemon": 505,
+ "Traps": 86,
+ "Items": 122,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 46,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1082,
+ "Pokemon": 505,
+ "Traps": 86,
+ "Items": 122,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 46,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1083,
+ "Pokemon": 505,
+ "Traps": 86,
+ "Items": 122,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 46,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1084,
+ "Pokemon": 506,
+ "Traps": 86,
+ "Items": 122,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 46,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1085,
+ "Pokemon": 507,
+ "Traps": 86,
+ "Items": 122,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 46,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1086,
+ "Pokemon": 507,
+ "Traps": 86,
+ "Items": 122,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 46,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1087,
+ "Pokemon": 507,
+ "Traps": 86,
+ "Items": 122,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 46,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1088,
+ "Pokemon": 507,
+ "Traps": 86,
+ "Items": 122,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 46,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1089,
+ "Pokemon": 507,
+ "Traps": 86,
+ "Items": 122,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 46,
+ "BuriedItems": 3
+ },
+ {
+ "MainData": 1090,
+ "Pokemon": 508,
+ "Traps": 86,
+ "Items": 122,
+ "KecleonShop": 1,
+ "MonsterRoomItems": 46,
+ "BuriedItems": 3
+ }
+ ]
+}