From f5495d12200adf2e1ec2b5d7979997f0aa1ec893 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 1 Sep 2020 03:03:14 -0400 Subject: Give proper names to underwater maps --- data/event_scripts.s | 14 ++-- data/layouts/Underwater1/border.bin | 1 - data/layouts/Underwater1/map.bin | 17 ----- data/layouts/Underwater2/border.bin | 1 - data/layouts/Underwater2/map.bin | 35 --------- data/layouts/Underwater3/border.bin | 1 - data/layouts/Underwater3/map.bin | 1 - data/layouts/Underwater4/border.bin | 1 - data/layouts/Underwater4/map.bin | 1 - data/layouts/Underwater5/border.bin | 1 - data/layouts/Underwater5/map.bin | 1 - data/layouts/Underwater6/border.bin | 1 - data/layouts/Underwater6/map.bin | 1 - data/layouts/Underwater7/border.bin | 1 - data/layouts/Underwater7/map.bin | 1 - data/layouts/Underwater_Route105/border.bin | 1 + data/layouts/Underwater_Route105/map.bin | 1 + data/layouts/Underwater_Route124/border.bin | 1 + data/layouts/Underwater_Route124/map.bin | 17 +++++ data/layouts/Underwater_Route125/border.bin | 1 + data/layouts/Underwater_Route125/map.bin | 1 + data/layouts/Underwater_Route126/border.bin | 1 + data/layouts/Underwater_Route126/map.bin | 35 +++++++++ data/layouts/Underwater_Route127/border.bin | 1 + data/layouts/Underwater_Route127/map.bin | 1 + data/layouts/Underwater_Route128/border.bin | 1 + data/layouts/Underwater_Route128/map.bin | 1 + data/layouts/Underwater_Route129/border.bin | 1 + data/layouts/Underwater_Route129/map.bin | 1 + data/layouts/layouts.json | 56 +++++++------- data/maps/Route105/map.json | 2 +- data/maps/Route124/map.json | 2 +- data/maps/Route125/map.json | 2 +- data/maps/Route126/map.json | 2 +- data/maps/Route127/map.json | 2 +- data/maps/Route128/map.json | 2 +- data/maps/Route129/map.json | 2 +- data/maps/SeafloorCavern_Entrance/map.json | 2 +- data/maps/Underwater1/map.json | 88 --------------------- data/maps/Underwater1/scripts.inc | 3 - data/maps/Underwater2/map.json | 109 --------------------------- data/maps/Underwater2/scripts.inc | 3 - data/maps/Underwater3/map.json | 84 --------------------- data/maps/Underwater3/scripts.inc | 8 -- data/maps/Underwater4/map.json | 56 -------------- data/maps/Underwater4/scripts.inc | 3 - data/maps/Underwater5/map.json | 41 ---------- data/maps/Underwater5/scripts.inc | 8 -- data/maps/Underwater6/map.json | 41 ---------- data/maps/Underwater6/scripts.inc | 8 -- data/maps/Underwater7/map.json | 41 ---------- data/maps/Underwater7/scripts.inc | 8 -- data/maps/Underwater_Route105/map.json | 41 ++++++++++ data/maps/Underwater_Route105/scripts.inc | 8 ++ data/maps/Underwater_Route124/map.json | 88 +++++++++++++++++++++ data/maps/Underwater_Route124/scripts.inc | 3 + data/maps/Underwater_Route125/map.json | 41 ++++++++++ data/maps/Underwater_Route125/scripts.inc | 8 ++ data/maps/Underwater_Route126/map.json | 109 +++++++++++++++++++++++++++ data/maps/Underwater_Route126/scripts.inc | 3 + data/maps/Underwater_Route127/map.json | 84 +++++++++++++++++++++ data/maps/Underwater_Route127/scripts.inc | 8 ++ data/maps/Underwater_Route128/map.json | 56 ++++++++++++++ data/maps/Underwater_Route128/scripts.inc | 3 + data/maps/Underwater_Route129/map.json | 41 ++++++++++ data/maps/Underwater_Route129/scripts.inc | 8 ++ data/maps/Underwater_SeafloorCavern/map.json | 4 +- data/maps/Underwater_SootopolisCity/map.json | 4 +- data/maps/map_groups.json | 28 +++---- 69 files changed, 626 insertions(+), 626 deletions(-) delete mode 100644 data/layouts/Underwater1/border.bin delete mode 100644 data/layouts/Underwater1/map.bin delete mode 100644 data/layouts/Underwater2/border.bin delete mode 100644 data/layouts/Underwater2/map.bin delete mode 100644 data/layouts/Underwater3/border.bin delete mode 100644 data/layouts/Underwater3/map.bin delete mode 100644 data/layouts/Underwater4/border.bin delete mode 100644 data/layouts/Underwater4/map.bin delete mode 100644 data/layouts/Underwater5/border.bin delete mode 100644 data/layouts/Underwater5/map.bin delete mode 100644 data/layouts/Underwater6/border.bin delete mode 100644 data/layouts/Underwater6/map.bin delete mode 100644 data/layouts/Underwater7/border.bin delete mode 100644 data/layouts/Underwater7/map.bin create mode 100644 data/layouts/Underwater_Route105/border.bin create mode 100644 data/layouts/Underwater_Route105/map.bin create mode 100644 data/layouts/Underwater_Route124/border.bin create mode 100644 data/layouts/Underwater_Route124/map.bin create mode 100644 data/layouts/Underwater_Route125/border.bin create mode 100644 data/layouts/Underwater_Route125/map.bin create mode 100644 data/layouts/Underwater_Route126/border.bin create mode 100644 data/layouts/Underwater_Route126/map.bin create mode 100644 data/layouts/Underwater_Route127/border.bin create mode 100644 data/layouts/Underwater_Route127/map.bin create mode 100644 data/layouts/Underwater_Route128/border.bin create mode 100644 data/layouts/Underwater_Route128/map.bin create mode 100644 data/layouts/Underwater_Route129/border.bin create mode 100644 data/layouts/Underwater_Route129/map.bin delete mode 100644 data/maps/Underwater1/map.json delete mode 100644 data/maps/Underwater1/scripts.inc delete mode 100644 data/maps/Underwater2/map.json delete mode 100644 data/maps/Underwater2/scripts.inc delete mode 100644 data/maps/Underwater3/map.json delete mode 100644 data/maps/Underwater3/scripts.inc delete mode 100644 data/maps/Underwater4/map.json delete mode 100644 data/maps/Underwater4/scripts.inc delete mode 100644 data/maps/Underwater5/map.json delete mode 100644 data/maps/Underwater5/scripts.inc delete mode 100644 data/maps/Underwater6/map.json delete mode 100644 data/maps/Underwater6/scripts.inc delete mode 100644 data/maps/Underwater7/map.json delete mode 100644 data/maps/Underwater7/scripts.inc create mode 100644 data/maps/Underwater_Route105/map.json create mode 100644 data/maps/Underwater_Route105/scripts.inc create mode 100644 data/maps/Underwater_Route124/map.json create mode 100644 data/maps/Underwater_Route124/scripts.inc create mode 100644 data/maps/Underwater_Route125/map.json create mode 100644 data/maps/Underwater_Route125/scripts.inc create mode 100644 data/maps/Underwater_Route126/map.json create mode 100644 data/maps/Underwater_Route126/scripts.inc create mode 100644 data/maps/Underwater_Route127/map.json create mode 100644 data/maps/Underwater_Route127/scripts.inc create mode 100644 data/maps/Underwater_Route128/map.json create mode 100644 data/maps/Underwater_Route128/scripts.inc create mode 100644 data/maps/Underwater_Route129/map.json create mode 100644 data/maps/Underwater_Route129/scripts.inc (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index f8348d0b0..8039be687 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -151,13 +151,13 @@ gStdScripts_End:: @ 81DC2CC .include "data/maps/Route132/scripts.inc" .include "data/maps/Route133/scripts.inc" .include "data/maps/Route134/scripts.inc" - .include "data/maps/Underwater1/scripts.inc" - .include "data/maps/Underwater2/scripts.inc" - .include "data/maps/Underwater3/scripts.inc" - .include "data/maps/Underwater4/scripts.inc" - .include "data/maps/Underwater5/scripts.inc" - .include "data/maps/Underwater6/scripts.inc" - .include "data/maps/Underwater7/scripts.inc" + .include "data/maps/Underwater_Route124/scripts.inc" + .include "data/maps/Underwater_Route126/scripts.inc" + .include "data/maps/Underwater_Route127/scripts.inc" + .include "data/maps/Underwater_Route128/scripts.inc" + .include "data/maps/Underwater_Route129/scripts.inc" + .include "data/maps/Underwater_Route105/scripts.inc" + .include "data/maps/Underwater_Route125/scripts.inc" .include "data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc" .include "data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc" .include "data/maps/LittlerootTown_MaysHouse_1F/scripts.inc" diff --git a/data/layouts/Underwater1/border.bin b/data/layouts/Underwater1/border.bin deleted file mode 100644 index b15c94f96..000000000 --- a/data/layouts/Underwater1/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/layouts/Underwater1/map.bin b/data/layouts/Underwater1/map.bin deleted file mode 100644 index 230e3dcd2..000000000 --- a/data/layouts/Underwater1/map.bin +++ /dev/null @@ -1,17 +0,0 @@ -2222222222222222222222222222222222222222222222222222222222222222222222# 22 -"##~222222222222222222222222222222222#  "#####~22222222222}####### 22 -||~22###~22222222#  "22######~2222222222222222222222222222222222222222222222222222}|||| 22 -"22222222222#  "22222222222222222222222222222222222222222222222222#|~222222222222222222#~2222#||~2222222222222222222#|||||||||||~222#~22222#~2222222222222#~2222222222#|||# 22 -"22#  "222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222# 22 -"22}"2222222222222222222y2y222222222222y2y222222222222222# 22 -""~22222222222222222222222#  "222222222222}|"22222222222222222222222222# 22 -|||"2222222222222222222#  "2222"~222222222}|"222# 22 -""|~22222}|"22}|#  ""|||||"22222222222222222222222222222222222222222222222222}||~2222222222222222}"22222222# 22 -"2222"~2222222#  "222222}""|~}"2222222}""|||||22222222222222# 22 -"2222#  "222222"~22222222"~222222222"~22z222 -"22222222222222y2y22222222222222222#~22# 22 -"||||~222222222222#  "#|~2222222222222222222222222222222#|~2222222222222# 22 -"||||||# 22 -"222#  "#  "22222222}"222222222222222 - "# 22 -"#  " \ No newline at end of file diff --git a/data/layouts/Underwater2/border.bin b/data/layouts/Underwater2/border.bin deleted file mode 100644 index b15c94f96..000000000 --- a/data/layouts/Underwater2/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/layouts/Underwater2/map.bin b/data/layouts/Underwater2/map.bin deleted file mode 100644 index 0c6377c30..000000000 --- a/data/layouts/Underwater2/map.bin +++ /dev/null @@ -1,35 +0,0 @@ -2222222222222222222222222222222222222222222222222222222z222x2#~6y2y222}||||||||||||||##||||#2222222222222222222222222#       22222222222/# 222222222222222222 -    222222222222222222222#  22222222222222222222222# 22222222222222222222222222# 2222222222222222222222222222222222222222222222222 -    22222222222222222222222222222222 -" #  222/2222222 222222222222222222222 "#/#   "# 22222 -"222222222222222222222##     " "2222222222222222222222/ "222222 -  222222222222222222 -  22222222222222222/  2222222222/2222222222222/#  22222# 222222222222222222222222 -"#22/2222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222 -"2222222222222222222222222222222222222222222222222# 22222222222222222 -   2222222222222222222222222222222222222222 -   "#     22222222222222222222222222222222222 - " /#           22222222222222/2222222222 -"/ " #/#  22222222/2222222222222 - " " "# /#/# 2222222222222222222 - " "/ "#/#/# 2222222222222222222 -" "/ "#/## 2222222222 -"222222 -" " "#/#/# 22222# 222/2222222 "/ "### 22222#/222222222 -" "##22222222222222 " "#/# 2222222222222## 2222## 2 -"22222 -  "/2222/# "/222222 "##2222#22222222222#2222222/### 2222/2222222//622222/222222 - 22222222222/22222#222222/222222222222/222222#2222222222222//2222222222222 -"22222222222222222222//62222222/# 2222222/2222222/ "2222222/2222222 -"## 2222222/222222 -" "22222222222222/222222222/222222 -"/ "# 222222222/22222222222222222//2222222 "222222222222//2222222 -"#/# 22222222222222efg2222222222/ "##   222222222222222222mno2222222222222222222 #  222222222222222222222222222222222222222222 -" "222222 /#  222222222222222222222222222222222222222 -"2222222##    22222222222222222222222222222222 -  " "6222222222/# 222222222222222222222222222222 -"/62222z222x22##  2222222222222222222222222 -  " "622}~2y2y22} #   22222222222222222222 - "622 |||| ##   222222222222222 - "/ "622/#  2222222 -     "622##       "/ "62222// "6222222#"222222|~22222 ||||   \ No newline at end of file diff --git a/data/layouts/Underwater3/border.bin b/data/layouts/Underwater3/border.bin deleted file mode 100644 index b15c94f96..000000000 --- a/data/layouts/Underwater3/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/layouts/Underwater3/map.bin b/data/layouts/Underwater3/map.bin deleted file mode 100644 index fc5c331a5..000000000 --- a/data/layouts/Underwater3/map.bin +++ /dev/null @@ -1 +0,0 @@ -66666666666666666666666666666666666666666666666666666666666666&666666666666.66666666666662222;2;2666666666666662222;2;2;2;2666666666662222@2C2C2A26666666666222222<2P2Q2:266666666666222222<2T2R:266666666666222222<2T2R:26666666666662z222x22@2G2T2R2:266666666666@2A222y2y22}#@2G2P2\2R2B2A266666666666@2D2B2A2#######<2P2\2V2Z2Q2:266666666666?2P2Q2B2:2<2K2L2V2V2R2B2A266666666666?2W2]2Q2:23242T2V2V2R2S2:266666666666?2W2S2U2:2# ?2K2L2V2Z2Q2:266666666666?2W2S2U2:23242T2V2V2R2:26666666666?2Y2O2U2B2A2## ?2K2K2L2R2:26666666666I242W2U2S2:2#32422L2R2:26666666666  ?2W2]2Q2:2## 422L2R2:26666666666?2Y2O2U2:2#3242L2R2:2666666666I242W2U2B2A2## 42T2R2:26666666666  ?2W2U2S2:2#42T2R2:2666666666?2W2]2Q2:242T2R20 66666666?2W2S2U2:2;242T2R2866666666?2Y2O2U2B2A242T2R28 "666666666   I242W2U2S2:2;242T2R28 "666666666  ?2W2]2Q2:2@2C2A222###!a6`"  666666666?2W2S2U2:2?2S2:22222###" "666666666?2W2S2U2B2A2?2S2:2222222 66666666?2W2S2U2S2:2?2S2B2A2222222 "66666666?2W2S2U2S2:23242S2:2#~z222x2}# "66666666?2W2S2U2S2:2@2A2# ?2S2B2A22y2y22 "# "66666666?2W2S2]2Q2:2?2B2A2?2S2S2:22222##666666666?2W2P2Q2U2:2?2S2:2?22S2:2#~222666666666?2W2T2R2U2:2?2S2:2?2S2S2:2   #~22&#"666666666@2A2?2W2T2R2U2:2?2S2B2A2?2S2S2:2#~2.# "666666666<2:2?2W2T2R2U2:2@2D2P2Q2:2?2S2S2:2222222#  666666666@22B2A2?2W2T2R2U2:2?2P2_2U2:2@2D2S2S2:2#~2222}##"666666666@2222:2?2W2T2R2U2:2?2W2S2U2:2?2S2S22232#######666666666<2222B2A2?2W2T2R2U2:2;2?2W2S2U2:2?2S2S2:2" "666666666<2222S2:2;2?2W2T2R2U2B2A2?2W2S2U2:2;2?2S2S2:266666666I242T2Z2Q2:2@2G2W2T2R2U2S2:2?2W2S2U2B2A2@2D2S2S2:2#"66666666# ?2Y2L2R2B2A2?2S2W2T2R2]2Q2:2?2K2O2U2S2:2?2S2S2S2:266666666I242T2Z2Q2:2?2P2_2T2Z2Q2U2:23242T2U2S2:2?2S2S22232226666666 6# ?2Y2L2R2:2?2W2S2T2V2R2U2:2  ?2T2U22232?2S2S2:2"  222266666666I242T2R2:2?2W2P2\2V2R2U2:2;2?2T2U2:2 ?2S22232  22222266 66666# ?2T2R2B2A2?2W2T2V2V2R2U2B2A2?2T2U2:2@2D2S2:2"22222266666666?2T2Z2Q2:2?2W2T2V2V2R2U2S2:2?2T2U2:2?2S2S2:2  222222266666#?2Y2L2R2:2?2W2T2V2V2R2]2Q2:2?2T2U2:2@2D2S22232222z222x2266666#66I242T2R2B2A2>2?2T2Y2L2V2Z2Q2U2:2>2?2T2U2:2?2S2S2:2"  2222y2y22}#666666666# ?2T2R2S2:2>2?2Y2O2T2V2V2R2U2:2>2>2@2D2T2U2:2@2D2S2S2:2  22222226666666?2T2Z2Q2:2>2?2S2W2Y2L2V2R2U2B2A2>2<22_2U2:2?2S2S22232  2222222}#666666#66#6?2T2V2R2:2>2?2S2Y2O2T2V2R2]2Q2B2C2D2T2M2K2:2?2S2S2:2" "2222222}#666666666?2T2V2R2:2>2I242S2W2T2V2Z2Q2U2S2S22_2U22232?2S22232 "222222266666#6666#?2Y2L2R2:2>2>2?2S2W2T2V2V2R2U2S2S2T2S2U2:2"?2S2:2"#6#~z222x22}|6666666#I242T2R2:2>2>2?2S2W2T2V2V2R2]2^2^2_2S2U2:2?2S2:2 """2y2y2226666#666#66# ?2T2R2:2# >2I242W2Y2L2V2Z2Q2S2S2S2M2K2:2?2S20" #~22}|#666666666?2T2R20" >2>2?2Y2O2T2V2V2Z2Q2S2M2K2S2:2#!!"  #622666666666##1T2R28 " >2>2I242W2Y2L2V2V2R2S2U2S22232 "#6#~}|666666669T2R28 ">2>2>2?2Y2O2T2V2V2R2M2K22232"   "66666666#6##9T2R28# >2>2?2S2W2T2V2V2R2U2S2:2>2 "  #6##6666666669T2R28#>2>2I242W2T2V2V2R2U2S2:2" "  666666669T2R28>2>2>2?2W2Y2L2V2R2U2S2:2 " "666666#6669T2R28## >2>2?2Y2O2T2V2R2U22232 " "#6666666666##)) ## >2I242W2T2V2R2U2:2>2#666666666#  >2>2?2W2T2J2K2U2:2"#666666#6666# " "### >2?2W2T2R2S2U2:2 "  666666666# ">2?2W2T2R2S2U2:2 "#6#666666666 "##>2?2W2T2R2S2U2:2 " "#666#6666666#">2?2W2T2R22U2:2666666666#>2?2W2T2R2S2U2:2666666666>2?2W2T2R2S2U2:2666666666>2?2W2T2R2S2U2:2666666666>2?2W2T2Z22U2:26666666#66 ">2?2W2T2V2R2U2:2666666666>2?2W2T2V2R2U2:2#6666666666>2?2W2T2V2R2U2:2#6#6#6#6 \ No newline at end of file diff --git a/data/layouts/Underwater4/border.bin b/data/layouts/Underwater4/border.bin deleted file mode 100644 index b15c94f96..000000000 --- a/data/layouts/Underwater4/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/layouts/Underwater4/map.bin b/data/layouts/Underwater4/map.bin deleted file mode 100644 index 23f987681..000000000 --- a/data/layouts/Underwater4/map.bin +++ /dev/null @@ -1 +0,0 @@ -666666666  >2?2W2T2V2R2U2:2666666666>2?2W2T2V2R2U2:2666666666>2?2W2K2L2R2U2:2666666666# ?2K2O2T2R2U2:2666666666 3242W2T2R2U2:2666666666 "# ?2W2T2R2U2:2 66666666#?2W2T2R2U2:2#666666666 "?2W2T2R2U2B2A2 666 666666?2W2T2R2]2Q2B2C2C2C2A2 # #6666666666?2W2T2Z2Q2]2[2[2[2Q2B2C2C2C2A2 #   #6666666666#)aV2V2Z2[2[2[2Q2]2[2[2[2Q2:2;2;2;2  666666666 6 6aV2V2V2V2V2Z2[2[2[2Q2U2B2A2@2C2C2C2C2C2C2C2C2C28 666666666##))))))aV2V2R2]2Q2B2C2A2@2C2C2D2P2[2[2[2[2[2[2[2[28666666666 #)))a]2[2Q2B2C2C2C2C2D2P2[2[2_2P2[2[2[2[2[2[2`#666666 66666666 "#a[2]2[2[2[2[2[2[2_2P2[2[2\2V2V2V2V2`)"66666666666666##a[2[2[2[2[2[2[2[2\2V2V2`))))"66666666666666#aV2V2V2V2V2V2V2V2`)"66666666666d2V2V2V2V2V2`)"@2C2A2 6666 6666666666@2C2C2A2<2L2V2V2V2`" @2D22B2C2A26666666 6666666<222:2<2T2L2V2b28 " #<2P2[2[2Q2B2C2C2C2C2C2A26666666666666@2A2## 12:2@2D2T2T2J20 #1W2P2Q2]2[2[2[2[2[2Q2B2C2A2666666666666666@2D2B2A2" !""<2P2_2T2R28#aT2Z2[2[2[2[2[2Q2]2[2Q2B2C26666 66666666666<2P2Q2:2<2T2P2V2R28#aV2V2V2V2V2V2Z2[2[2]2[2`"666666666666666<2T2R2:2<2T2T2V2R28#)aV2V2V2V2`))))"666666666666666#1T2R2B2A2@2D2T2T2V2R28#))))"666666666666666#aZ2Q2B2C2A2efg@2C2D2P2_2T2V2R28  6666666666666666#aZ2[2Q2B2C2A2mn2o@2D2P2[2_2P2V2`)"# 6666666666666666#aQ2]2[2Q2B2C2C2C2A2;2;2;2;2;2<2P2_2P2[2`)" # "#6666666666666666#)aQ2]2[2[2[2Q2B2C2C2C2C2C2D2T2P2V2` "6666666666666666#))a[2Q2]2[2[2[2[2[2[2[2_2T2` "6666666666666666 #aZ2[2[2[2[2[2[2[2[2[2b2 6666666666666666 "##)aV2V2V2V2V2V2V2J2:2 " "666666666666666 d2V2V2V2V2V2J2U2:2 " "6666666666666666@2D2L2V2V2V2V2R2U2B2A2 " "6666666 666666666#<2P2_2L2V2V2V2R2]2Q2B2C2C2C2C2C2C2C2C2A2 6666666666666666#<2T2P2\2V2`)))a[2[2[2[2[2[2[2[2Q2:26666666666666666#@2D2T2`))"#))a[2[2[2[2`))"6666666666666666# @2C2C2D2P2`" #))))" "66666666666666666""# )))))" "#66666666666666666#"#" \ No newline at end of file diff --git a/data/layouts/Underwater5/border.bin b/data/layouts/Underwater5/border.bin deleted file mode 100644 index b15c94f96..000000000 --- a/data/layouts/Underwater5/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/layouts/Underwater5/map.bin b/data/layouts/Underwater5/map.bin deleted file mode 100644 index 902f0dbdc..000000000 --- a/data/layouts/Underwater5/map.bin +++ /dev/null @@ -1 +0,0 @@ -& . 2222222 #222}#~2 #222222}#2 "22}#222222222}#222222}#222222222}#22}"##22222}#222222222222}"#222222222222#222222222222}"# """#222z222x2222}"# ""222222y2y22222 ""2222############222222 ""&222222.2222222#22222222222z222x22222222222222y2y22}"##""""""""""""""""#  # " " "  "############ \ No newline at end of file diff --git a/data/layouts/Underwater6/border.bin b/data/layouts/Underwater6/border.bin deleted file mode 100644 index b15c94f96..000000000 --- a/data/layouts/Underwater6/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/layouts/Underwater6/map.bin b/data/layouts/Underwater6/map.bin deleted file mode 100644 index 92bd56031..000000000 --- a/data/layouts/Underwater6/map.bin +++ /dev/null @@ -1 +0,0 @@ -&/.222/2222222222222/22222222}##222222222}##2222222222222222}##2222/#~222222#~22#2222222222222222222222222222222222#~2222222/###222222222222222z222x222222222y2y2222222222222222222####"""##########"""""""""""""""                                # ##   22222 222222 222222 ## ##222222   #~z222x22 #~y2y222#~222 ~22 ~22  #222   222 2}## &2 .2 2222222  #~222222 #~22222#~2222 ####"""    #  ##  # #  # ######"" \ No newline at end of file diff --git a/data/layouts/Underwater7/border.bin b/data/layouts/Underwater7/border.bin deleted file mode 100644 index b15c94f96..000000000 --- a/data/layouts/Underwater7/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/layouts/Underwater7/map.bin b/data/layouts/Underwater7/map.bin deleted file mode 100644 index 660f585ae..000000000 --- a/data/layouts/Underwater7/map.bin +++ /dev/null @@ -1 +0,0 @@ -9<?WTVVVVVVV9<?WTVVVVVVV9<?WTVVVVVVV9<?WTVVVVVVV9<?WTVVVVVVV9<?WTVVVVVVV9<?WTVVVVVVV9<?WTVVVVVVV9<?WTVVVVVVV&9<?WTVVVVVVV.9<?WTVVVVVVV22222222229<?WTVVVVVVV222222222222222229<?WTVVVVVVV222222222222222229<?WTVVVVVVV22222222222222222229<?WTVVVVVVV22222222222222222229<?WTVVVVVVV222222222222222222}#9<?WTVVVVVVV2222222222222222}"#2222229<?WTVVVVVVV22222222222222222222229<?WTVVVVVVV2z222x222}#########2222229<?WTVVVVVVV22y2y22222222229<?WTVVVVVVV#########2z222x229<?WTVVVVVVV22y2y2229<?WTVVVVVVV #2222229<?WTVVVVVVV 2222229<?WTVVVVVVV#2222229<?WTVVVVVVV2}~2229<?WTVVVVVVV2222229<?WTVVVVVVV#22222}~2229<?WTVVVVVVV "&222222229<?WTVVVVVVV#.22222222229<?WTVVVVVVV #222222222222222229<?WTVVVVVVV222222222222222229<?WTVVVVVVV   ##""""""""""""""""""9<?WTVVVVVVV 9<?WTVVVVVVV "# # 9<?WTVVVVVVV# #9<?WTVVVVVVV## # ##9<?WTVVVVVVV# ##9<?WTVVVVVVV9<?WTVVVVVVV \ No newline at end of file diff --git a/data/layouts/Underwater_Route105/border.bin b/data/layouts/Underwater_Route105/border.bin new file mode 100644 index 000000000..b15c94f96 --- /dev/null +++ b/data/layouts/Underwater_Route105/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/Underwater_Route105/map.bin b/data/layouts/Underwater_Route105/map.bin new file mode 100644 index 000000000..92bd56031 --- /dev/null +++ b/data/layouts/Underwater_Route105/map.bin @@ -0,0 +1 @@ +&/.222/2222222222222/22222222}##222222222}##2222222222222222}##2222/#~222222#~22#2222222222222222222222222222222222#~2222222/###222222222222222z222x222222222y2y2222222222222222222####"""##########"""""""""""""""                                # ##   22222 222222 222222 ## ##222222   #~z222x22 #~y2y222#~222 ~22 ~22  #222   222 2}## &2 .2 2222222  #~222222 #~22222#~2222 ####"""    #  ##  # #  # ######"" \ No newline at end of file diff --git a/data/layouts/Underwater_Route124/border.bin b/data/layouts/Underwater_Route124/border.bin new file mode 100644 index 000000000..b15c94f96 --- /dev/null +++ b/data/layouts/Underwater_Route124/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/Underwater_Route124/map.bin b/data/layouts/Underwater_Route124/map.bin new file mode 100644 index 000000000..230e3dcd2 --- /dev/null +++ b/data/layouts/Underwater_Route124/map.bin @@ -0,0 +1,17 @@ +2222222222222222222222222222222222222222222222222222222222222222222222# 22 +"##~222222222222222222222222222222222#  "#####~22222222222}####### 22 +||~22###~22222222#  "22######~2222222222222222222222222222222222222222222222222222}|||| 22 +"22222222222#  "22222222222222222222222222222222222222222222222222#|~222222222222222222#~2222#||~2222222222222222222#|||||||||||~222#~22222#~2222222222222#~2222222222#|||# 22 +"22#  "222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222# 22 +"22}"2222222222222222222y2y222222222222y2y222222222222222# 22 +""~22222222222222222222222#  "222222222222}|"22222222222222222222222222# 22 +|||"2222222222222222222#  "2222"~222222222}|"222# 22 +""|~22222}|"22}|#  ""|||||"22222222222222222222222222222222222222222222222222}||~2222222222222222}"22222222# 22 +"2222"~2222222#  "222222}""|~}"2222222}""|||||22222222222222# 22 +"2222#  "222222"~22222222"~222222222"~22z222 +"22222222222222y2y22222222222222222#~22# 22 +"||||~222222222222#  "#|~2222222222222222222222222222222#|~2222222222222# 22 +"||||||# 22 +"222#  "#  "22222222}"222222222222222 + "# 22 +"#  " \ No newline at end of file diff --git a/data/layouts/Underwater_Route125/border.bin b/data/layouts/Underwater_Route125/border.bin new file mode 100644 index 000000000..b15c94f96 --- /dev/null +++ b/data/layouts/Underwater_Route125/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/Underwater_Route125/map.bin b/data/layouts/Underwater_Route125/map.bin new file mode 100644 index 000000000..660f585ae --- /dev/null +++ b/data/layouts/Underwater_Route125/map.bin @@ -0,0 +1 @@ +9<?WTVVVVVVV9<?WTVVVVVVV9<?WTVVVVVVV9<?WTVVVVVVV9<?WTVVVVVVV9<?WTVVVVVVV9<?WTVVVVVVV9<?WTVVVVVVV9<?WTVVVVVVV&9<?WTVVVVVVV.9<?WTVVVVVVV22222222229<?WTVVVVVVV222222222222222229<?WTVVVVVVV222222222222222229<?WTVVVVVVV22222222222222222229<?WTVVVVVVV22222222222222222229<?WTVVVVVVV222222222222222222}#9<?WTVVVVVVV2222222222222222}"#2222229<?WTVVVVVVV22222222222222222222229<?WTVVVVVVV2z222x222}#########2222229<?WTVVVVVVV22y2y22222222229<?WTVVVVVVV#########2z222x229<?WTVVVVVVV22y2y2229<?WTVVVVVVV #2222229<?WTVVVVVVV 2222229<?WTVVVVVVV#2222229<?WTVVVVVVV2}~2229<?WTVVVVVVV2222229<?WTVVVVVVV#22222}~2229<?WTVVVVVVV "&222222229<?WTVVVVVVV#.22222222229<?WTVVVVVVV #222222222222222229<?WTVVVVVVV222222222222222229<?WTVVVVVVV   ##""""""""""""""""""9<?WTVVVVVVV 9<?WTVVVVVVV "# # 9<?WTVVVVVVV# #9<?WTVVVVVVV## # ##9<?WTVVVVVVV# ##9<?WTVVVVVVV9<?WTVVVVVVV \ No newline at end of file diff --git a/data/layouts/Underwater_Route126/border.bin b/data/layouts/Underwater_Route126/border.bin new file mode 100644 index 000000000..b15c94f96 --- /dev/null +++ b/data/layouts/Underwater_Route126/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/Underwater_Route126/map.bin b/data/layouts/Underwater_Route126/map.bin new file mode 100644 index 000000000..0c6377c30 --- /dev/null +++ b/data/layouts/Underwater_Route126/map.bin @@ -0,0 +1,35 @@ +2222222222222222222222222222222222222222222222222222222z222x2#~6y2y222}||||||||||||||##||||#2222222222222222222222222#       22222222222/# 222222222222222222 +    222222222222222222222#  22222222222222222222222# 22222222222222222222222222# 2222222222222222222222222222222222222222222222222 +    22222222222222222222222222222222 +" #  222/2222222 222222222222222222222 "#/#   "# 22222 +"222222222222222222222##     " "2222222222222222222222/ "222222 +  222222222222222222 +  22222222222222222/  2222222222/2222222222222/#  22222# 222222222222222222222222 +"#22/2222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222 +"2222222222222222222222222222222222222222222222222# 22222222222222222 +   2222222222222222222222222222222222222222 +   "#     22222222222222222222222222222222222 + " /#           22222222222222/2222222222 +"/ " #/#  22222222/2222222222222 + " " "# /#/# 2222222222222222222 + " "/ "#/#/# 2222222222222222222 +" "/ "#/## 2222222222 +"222222 +" " "#/#/# 22222# 222/2222222 "/ "### 22222#/222222222 +" "##22222222222222 " "#/# 2222222222222## 2222## 2 +"22222 +  "/2222/# "/222222 "##2222#22222222222#2222222/### 2222/2222222//622222/222222 + 22222222222/22222#222222/222222222222/222222#2222222222222//2222222222222 +"22222222222222222222//62222222/# 2222222/2222222/ "2222222/2222222 +"## 2222222/222222 +" "22222222222222/222222222/222222 +"/ "# 222222222/22222222222222222//2222222 "222222222222//2222222 +"#/# 22222222222222efg2222222222/ "##   222222222222222222mno2222222222222222222 #  222222222222222222222222222222222222222222 +" "222222 /#  222222222222222222222222222222222222222 +"2222222##    22222222222222222222222222222222 +  " "6222222222/# 222222222222222222222222222222 +"/62222z222x22##  2222222222222222222222222 +  " "622}~2y2y22} #   22222222222222222222 + "622 |||| ##   222222222222222 + "/ "622/#  2222222 +     "622##       "/ "62222// "6222222#"222222|~22222 ||||   \ No newline at end of file diff --git a/data/layouts/Underwater_Route127/border.bin b/data/layouts/Underwater_Route127/border.bin new file mode 100644 index 000000000..b15c94f96 --- /dev/null +++ b/data/layouts/Underwater_Route127/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/Underwater_Route127/map.bin b/data/layouts/Underwater_Route127/map.bin new file mode 100644 index 000000000..fc5c331a5 --- /dev/null +++ b/data/layouts/Underwater_Route127/map.bin @@ -0,0 +1 @@ +66666666666666666666666666666666666666666666666666666666666666&666666666666.66666666666662222;2;2666666666666662222;2;2;2;2666666666662222@2C2C2A26666666666222222<2P2Q2:266666666666222222<2T2R:266666666666222222<2T2R:26666666666662z222x22@2G2T2R2:266666666666@2A222y2y22}#@2G2P2\2R2B2A266666666666@2D2B2A2#######<2P2\2V2Z2Q2:266666666666?2P2Q2B2:2<2K2L2V2V2R2B2A266666666666?2W2]2Q2:23242T2V2V2R2S2:266666666666?2W2S2U2:2# ?2K2L2V2Z2Q2:266666666666?2W2S2U2:23242T2V2V2R2:26666666666?2Y2O2U2B2A2## ?2K2K2L2R2:26666666666I242W2U2S2:2#32422L2R2:26666666666  ?2W2]2Q2:2## 422L2R2:26666666666?2Y2O2U2:2#3242L2R2:2666666666I242W2U2B2A2## 42T2R2:26666666666  ?2W2U2S2:2#42T2R2:2666666666?2W2]2Q2:242T2R20 66666666?2W2S2U2:2;242T2R2866666666?2Y2O2U2B2A242T2R28 "666666666   I242W2U2S2:2;242T2R28 "666666666  ?2W2]2Q2:2@2C2A222###!a6`"  666666666?2W2S2U2:2?2S2:22222###" "666666666?2W2S2U2B2A2?2S2:2222222 66666666?2W2S2U2S2:2?2S2B2A2222222 "66666666?2W2S2U2S2:23242S2:2#~z222x2}# "66666666?2W2S2U2S2:2@2A2# ?2S2B2A22y2y22 "# "66666666?2W2S2]2Q2:2?2B2A2?2S2S2:22222##666666666?2W2P2Q2U2:2?2S2:2?22S2:2#~222666666666?2W2T2R2U2:2?2S2:2?2S2S2:2   #~22&#"666666666@2A2?2W2T2R2U2:2?2S2B2A2?2S2S2:2#~2.# "666666666<2:2?2W2T2R2U2:2@2D2P2Q2:2?2S2S2:2222222#  666666666@22B2A2?2W2T2R2U2:2?2P2_2U2:2@2D2S2S2:2#~2222}##"666666666@2222:2?2W2T2R2U2:2?2W2S2U2:2?2S2S22232#######666666666<2222B2A2?2W2T2R2U2:2;2?2W2S2U2:2?2S2S2:2" "666666666<2222S2:2;2?2W2T2R2U2B2A2?2W2S2U2:2;2?2S2S2:266666666I242T2Z2Q2:2@2G2W2T2R2U2S2:2?2W2S2U2B2A2@2D2S2S2:2#"66666666# ?2Y2L2R2B2A2?2S2W2T2R2]2Q2:2?2K2O2U2S2:2?2S2S2S2:266666666I242T2Z2Q2:2?2P2_2T2Z2Q2U2:23242T2U2S2:2?2S2S22232226666666 6# ?2Y2L2R2:2?2W2S2T2V2R2U2:2  ?2T2U22232?2S2S2:2"  222266666666I242T2R2:2?2W2P2\2V2R2U2:2;2?2T2U2:2 ?2S22232  22222266 66666# ?2T2R2B2A2?2W2T2V2V2R2U2B2A2?2T2U2:2@2D2S2:2"22222266666666?2T2Z2Q2:2?2W2T2V2V2R2U2S2:2?2T2U2:2?2S2S2:2  222222266666#?2Y2L2R2:2?2W2T2V2V2R2]2Q2:2?2T2U2:2@2D2S22232222z222x2266666#66I242T2R2B2A2>2?2T2Y2L2V2Z2Q2U2:2>2?2T2U2:2?2S2S2:2"  2222y2y22}#666666666# ?2T2R2S2:2>2?2Y2O2T2V2V2R2U2:2>2>2@2D2T2U2:2@2D2S2S2:2  22222226666666?2T2Z2Q2:2>2?2S2W2Y2L2V2R2U2B2A2>2<22_2U2:2?2S2S22232  2222222}#666666#66#6?2T2V2R2:2>2?2S2Y2O2T2V2R2]2Q2B2C2D2T2M2K2:2?2S2S2:2" "2222222}#666666666?2T2V2R2:2>2I242S2W2T2V2Z2Q2U2S2S22_2U22232?2S22232 "222222266666#6666#?2Y2L2R2:2>2>2?2S2W2T2V2V2R2U2S2S2T2S2U2:2"?2S2:2"#6#~z222x22}|6666666#I242T2R2:2>2>2?2S2W2T2V2V2R2]2^2^2_2S2U2:2?2S2:2 """2y2y2226666#666#66# ?2T2R2:2# >2I242W2Y2L2V2Z2Q2S2S2S2M2K2:2?2S20" #~22}|#666666666?2T2R20" >2>2?2Y2O2T2V2V2Z2Q2S2M2K2S2:2#!!"  #622666666666##1T2R28 " >2>2I242W2Y2L2V2V2R2S2U2S22232 "#6#~}|666666669T2R28 ">2>2>2?2Y2O2T2V2V2R2M2K22232"   "66666666#6##9T2R28# >2>2?2S2W2T2V2V2R2U2S2:2>2 "  #6##6666666669T2R28#>2>2I242W2T2V2V2R2U2S2:2" "  666666669T2R28>2>2>2?2W2Y2L2V2R2U2S2:2 " "666666#6669T2R28## >2>2?2Y2O2T2V2R2U22232 " "#6666666666##)) ## >2I242W2T2V2R2U2:2>2#666666666#  >2>2?2W2T2J2K2U2:2"#666666#6666# " "### >2?2W2T2R2S2U2:2 "  666666666# ">2?2W2T2R2S2U2:2 "#6#666666666 "##>2?2W2T2R2S2U2:2 " "#666#6666666#">2?2W2T2R22U2:2666666666#>2?2W2T2R2S2U2:2666666666>2?2W2T2R2S2U2:2666666666>2?2W2T2R2S2U2:2666666666>2?2W2T2Z22U2:26666666#66 ">2?2W2T2V2R2U2:2666666666>2?2W2T2V2R2U2:2#6666666666>2?2W2T2V2R2U2:2#6#6#6#6 \ No newline at end of file diff --git a/data/layouts/Underwater_Route128/border.bin b/data/layouts/Underwater_Route128/border.bin new file mode 100644 index 000000000..b15c94f96 --- /dev/null +++ b/data/layouts/Underwater_Route128/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/Underwater_Route128/map.bin b/data/layouts/Underwater_Route128/map.bin new file mode 100644 index 000000000..23f987681 --- /dev/null +++ b/data/layouts/Underwater_Route128/map.bin @@ -0,0 +1 @@ +666666666  >2?2W2T2V2R2U2:2666666666>2?2W2T2V2R2U2:2666666666>2?2W2K2L2R2U2:2666666666# ?2K2O2T2R2U2:2666666666 3242W2T2R2U2:2666666666 "# ?2W2T2R2U2:2 66666666#?2W2T2R2U2:2#666666666 "?2W2T2R2U2B2A2 666 666666?2W2T2R2]2Q2B2C2C2C2A2 # #6666666666?2W2T2Z2Q2]2[2[2[2Q2B2C2C2C2A2 #   #6666666666#)aV2V2Z2[2[2[2Q2]2[2[2[2Q2:2;2;2;2  666666666 6 6aV2V2V2V2V2Z2[2[2[2Q2U2B2A2@2C2C2C2C2C2C2C2C2C28 666666666##))))))aV2V2R2]2Q2B2C2A2@2C2C2D2P2[2[2[2[2[2[2[2[28666666666 #)))a]2[2Q2B2C2C2C2C2D2P2[2[2_2P2[2[2[2[2[2[2`#666666 66666666 "#a[2]2[2[2[2[2[2[2_2P2[2[2\2V2V2V2V2`)"66666666666666##a[2[2[2[2[2[2[2[2\2V2V2`))))"66666666666666#aV2V2V2V2V2V2V2V2`)"66666666666d2V2V2V2V2V2`)"@2C2A2 6666 6666666666@2C2C2A2<2L2V2V2V2`" @2D22B2C2A26666666 6666666<222:2<2T2L2V2b28 " #<2P2[2[2Q2B2C2C2C2C2C2A26666666666666@2A2## 12:2@2D2T2T2J20 #1W2P2Q2]2[2[2[2[2[2Q2B2C2A2666666666666666@2D2B2A2" !""<2P2_2T2R28#aT2Z2[2[2[2[2[2Q2]2[2Q2B2C26666 66666666666<2P2Q2:2<2T2P2V2R28#aV2V2V2V2V2V2Z2[2[2]2[2`"666666666666666<2T2R2:2<2T2T2V2R28#)aV2V2V2V2`))))"666666666666666#1T2R2B2A2@2D2T2T2V2R28#))))"666666666666666#aZ2Q2B2C2A2efg@2C2D2P2_2T2V2R28  6666666666666666#aZ2[2Q2B2C2A2mn2o@2D2P2[2_2P2V2`)"# 6666666666666666#aQ2]2[2Q2B2C2C2C2A2;2;2;2;2;2<2P2_2P2[2`)" # "#6666666666666666#)aQ2]2[2[2[2Q2B2C2C2C2C2C2D2T2P2V2` "6666666666666666#))a[2Q2]2[2[2[2[2[2[2[2_2T2` "6666666666666666 #aZ2[2[2[2[2[2[2[2[2[2b2 6666666666666666 "##)aV2V2V2V2V2V2V2J2:2 " "666666666666666 d2V2V2V2V2V2J2U2:2 " "6666666666666666@2D2L2V2V2V2V2R2U2B2A2 " "6666666 666666666#<2P2_2L2V2V2V2R2]2Q2B2C2C2C2C2C2C2C2C2A2 6666666666666666#<2T2P2\2V2`)))a[2[2[2[2[2[2[2[2Q2:26666666666666666#@2D2T2`))"#))a[2[2[2[2`))"6666666666666666# @2C2C2D2P2`" #))))" "66666666666666666""# )))))" "#66666666666666666#"#" \ No newline at end of file diff --git a/data/layouts/Underwater_Route129/border.bin b/data/layouts/Underwater_Route129/border.bin new file mode 100644 index 000000000..b15c94f96 --- /dev/null +++ b/data/layouts/Underwater_Route129/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/Underwater_Route129/map.bin b/data/layouts/Underwater_Route129/map.bin new file mode 100644 index 000000000..902f0dbdc --- /dev/null +++ b/data/layouts/Underwater_Route129/map.bin @@ -0,0 +1 @@ +& . 2222222 #222}#~2 #222222}#2 "22}#222222222}#222222}#222222222}#22}"##22222}#222222222222}"#222222222222#222222222222}"# """#222z222x2222}"# ""222222y2y22222 ""2222############222222 ""&222222.2222222#22222222222z222x22222222222222y2y22}"##""""""""""""""""#  # " " "  "############ \ No newline at end of file diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json index b2ebeb5c6..9292e10af 100644 --- a/data/layouts/layouts.json +++ b/data/layouts/layouts.json @@ -502,34 +502,34 @@ "blockdata_filepath": "data/layouts/Route134/map.bin" }, { - "id": "LAYOUT_UNDERWATER2", - "name": "Underwater2_Layout", + "id": "LAYOUT_UNDERWATER_ROUTE126", + "name": "Underwater_Route126_Layout", "width": 80, "height": 80, "primary_tileset": "gTileset_General", "secondary_tileset": "gTileset_Underwater", - "border_filepath": "data/layouts/Underwater2/border.bin", - "blockdata_filepath": "data/layouts/Underwater2/map.bin" + "border_filepath": "data/layouts/Underwater_Route126/border.bin", + "blockdata_filepath": "data/layouts/Underwater_Route126/map.bin" }, { - "id": "LAYOUT_UNDERWATER3", - "name": "Underwater3_Layout", + "id": "LAYOUT_UNDERWATER_ROUTE127", + "name": "Underwater_Route127_Layout", "width": 80, "height": 80, "primary_tileset": "gTileset_General", "secondary_tileset": "gTileset_Underwater", - "border_filepath": "data/layouts/Underwater3/border.bin", - "blockdata_filepath": "data/layouts/Underwater3/map.bin" + "border_filepath": "data/layouts/Underwater_Route127/border.bin", + "blockdata_filepath": "data/layouts/Underwater_Route127/map.bin" }, { - "id": "LAYOUT_UNDERWATER4", - "name": "Underwater4_Layout", + "id": "LAYOUT_UNDERWATER_ROUTE128", + "name": "Underwater_Route128_Layout", "width": 120, "height": 40, "primary_tileset": "gTileset_General", "secondary_tileset": "gTileset_Underwater", - "border_filepath": "data/layouts/Underwater4/border.bin", - "blockdata_filepath": "data/layouts/Underwater4/map.bin" + "border_filepath": "data/layouts/Underwater_Route128/border.bin", + "blockdata_filepath": "data/layouts/Underwater_Route128/map.bin" }, { "id": "LAYOUT_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F", @@ -2732,14 +2732,14 @@ "blockdata_filepath": "data/layouts/LilycoveCity_DepartmentStoreElevator/map.bin" }, { - "id": "LAYOUT_UNDERWATER1", - "name": "Underwater1_Layout", + "id": "LAYOUT_UNDERWATER_ROUTE124", + "name": "Underwater_Route124_Layout", "width": 80, "height": 80, "primary_tileset": "gTileset_General", "secondary_tileset": "gTileset_Underwater", - "border_filepath": "data/layouts/Underwater1/border.bin", - "blockdata_filepath": "data/layouts/Underwater1/map.bin" + "border_filepath": "data/layouts/Underwater_Route124/border.bin", + "blockdata_filepath": "data/layouts/Underwater_Route124/map.bin" }, { "id": "LAYOUT_MOSSDEEP_CITY_SPACE_CENTER_1F", @@ -4092,34 +4092,34 @@ "blockdata_filepath": "data/layouts/TerraCave_End/map.bin" }, { - "id": "LAYOUT_UNDERWATER6", - "name": "Underwater6_Layout", + "id": "LAYOUT_UNDERWATER_ROUTE105", + "name": "Underwater_Route105_Layout", "width": 40, "height": 80, "primary_tileset": "gTileset_General", "secondary_tileset": "gTileset_Underwater", - "border_filepath": "data/layouts/Underwater6/border.bin", - "blockdata_filepath": "data/layouts/Underwater6/map.bin" + "border_filepath": "data/layouts/Underwater_Route105/border.bin", + "blockdata_filepath": "data/layouts/Underwater_Route105/map.bin" }, { - "id": "LAYOUT_UNDERWATER7", - "name": "Underwater7_Layout", + "id": "LAYOUT_UNDERWATER_ROUTE125", + "name": "Underwater_Route125_Layout", "width": 80, "height": 40, "primary_tileset": "gTileset_General", "secondary_tileset": "gTileset_Underwater", - "border_filepath": "data/layouts/Underwater7/border.bin", - "blockdata_filepath": "data/layouts/Underwater7/map.bin" + "border_filepath": "data/layouts/Underwater_Route125/border.bin", + "blockdata_filepath": "data/layouts/Underwater_Route125/map.bin" }, { - "id": "LAYOUT_UNDERWATER5", - "name": "Underwater5_Layout", + "id": "LAYOUT_UNDERWATER_ROUTE129", + "name": "Underwater_Route129_Layout", "width": 80, "height": 40, "primary_tileset": "gTileset_General", "secondary_tileset": "gTileset_Underwater", - "border_filepath": "data/layouts/Underwater5/border.bin", - "blockdata_filepath": "data/layouts/Underwater5/map.bin" + "border_filepath": "data/layouts/Underwater_Route129/border.bin", + "blockdata_filepath": "data/layouts/Underwater_Route129/map.bin" }, { "id": "LAYOUT_MARINE_CAVE_END", diff --git a/data/maps/Route105/map.json b/data/maps/Route105/map.json index bb6c7a653..bd951f62c 100644 --- a/data/maps/Route105/map.json +++ b/data/maps/Route105/map.json @@ -26,7 +26,7 @@ { "direction": "dive", "offset": 0, - "map": "MAP_UNDERWATER6" + "map": "MAP_UNDERWATER_ROUTE105" } ], "object_events": [ diff --git a/data/maps/Route124/map.json b/data/maps/Route124/map.json index cb075d29a..370a5f4e4 100644 --- a/data/maps/Route124/map.json +++ b/data/maps/Route124/map.json @@ -36,7 +36,7 @@ { "direction": "dive", "offset": 0, - "map": "MAP_UNDERWATER1" + "map": "MAP_UNDERWATER_ROUTE124" } ], "object_events": [ diff --git a/data/maps/Route125/map.json b/data/maps/Route125/map.json index 984a554e4..719e6b699 100644 --- a/data/maps/Route125/map.json +++ b/data/maps/Route125/map.json @@ -26,7 +26,7 @@ { "direction": "dive", "offset": 0, - "map": "MAP_UNDERWATER7" + "map": "MAP_UNDERWATER_ROUTE125" } ], "object_events": [ diff --git a/data/maps/Route126/map.json b/data/maps/Route126/map.json index 60b439066..bf7d7027c 100644 --- a/data/maps/Route126/map.json +++ b/data/maps/Route126/map.json @@ -26,7 +26,7 @@ { "direction": "dive", "offset": 0, - "map": "MAP_UNDERWATER2" + "map": "MAP_UNDERWATER_ROUTE126" } ], "object_events": [ diff --git a/data/maps/Route127/map.json b/data/maps/Route127/map.json index 0e6d78da7..6ef7022f4 100644 --- a/data/maps/Route127/map.json +++ b/data/maps/Route127/map.json @@ -31,7 +31,7 @@ { "direction": "dive", "offset": 0, - "map": "MAP_UNDERWATER3" + "map": "MAP_UNDERWATER_ROUTE127" } ], "object_events": [ diff --git a/data/maps/Route128/map.json b/data/maps/Route128/map.json index d8fbb249a..0bed932d5 100644 --- a/data/maps/Route128/map.json +++ b/data/maps/Route128/map.json @@ -31,7 +31,7 @@ { "direction": "dive", "offset": 0, - "map": "MAP_UNDERWATER4" + "map": "MAP_UNDERWATER_ROUTE128" } ], "object_events": [ diff --git a/data/maps/Route129/map.json b/data/maps/Route129/map.json index ca814b465..d5383eb50 100644 --- a/data/maps/Route129/map.json +++ b/data/maps/Route129/map.json @@ -26,7 +26,7 @@ { "direction": "dive", "offset": 0, - "map": "MAP_UNDERWATER5" + "map": "MAP_UNDERWATER_ROUTE129" } ], "object_events": [ diff --git a/data/maps/SeafloorCavern_Entrance/map.json b/data/maps/SeafloorCavern_Entrance/map.json index a80fce6c1..1f7095def 100644 --- a/data/maps/SeafloorCavern_Entrance/map.json +++ b/data/maps/SeafloorCavern_Entrance/map.json @@ -33,7 +33,7 @@ "x": 10, "y": 18, "elevation": 3, - "dest_map": "MAP_UNDERWATER4", + "dest_map": "MAP_UNDERWATER_ROUTE128", "dest_warp_id": 0 }, { diff --git a/data/maps/Underwater1/map.json b/data/maps/Underwater1/map.json deleted file mode 100644 index 71752745d..000000000 --- a/data/maps/Underwater1/map.json +++ /dev/null @@ -1,88 +0,0 @@ -{ - "id": "MAP_UNDERWATER1", - "name": "Underwater1", - "layout": "LAYOUT_UNDERWATER1", - "music": "MUS_UNDERWATER", - "region_map_section": "MAPSEC_UNDERWATER_124", - "requires_flash": false, - "weather": "WEATHER_UNDERWATER_BUBBLES", - "map_type": "MAP_TYPE_UNDERWATER", - "allow_cycling": true, - "allow_escaping": false, - "allow_running": true, - "show_map_name": true, - "battle_scene": "MAP_BATTLE_SCENE_NORMAL", - "connections": [ - { - "direction": "down", - "offset": 0, - "map": "MAP_UNDERWATER2" - }, - { - "direction": "emerge", - "offset": 0, - "map": "MAP_ROUTE124" - } - ], - "object_events": [], - "warp_events": [], - "coord_events": [], - "bg_events": [ - { - "type": "hidden_item", - "x": 42, - "y": 51, - "elevation": 0, - "item": "ITEM_CARBOS", - "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_1_CARBOS" - }, - { - "type": "hidden_item", - "x": 14, - "y": 40, - "elevation": 0, - "item": "ITEM_GREEN_SHARD", - "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_1_GREEN_SHARD" - }, - { - "type": "hidden_item", - "x": 66, - "y": 34, - "elevation": 3, - "item": "ITEM_PEARL", - "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_1_PEARL" - }, - { - "type": "hidden_item", - "x": 64, - "y": 54, - "elevation": 3, - "item": "ITEM_BIG_PEARL", - "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_1_BIG_PEARL" - }, - { - "type": "hidden_item", - "x": 70, - "y": 64, - "elevation": 3, - "item": "ITEM_HEART_SCALE", - "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_1_HEART_SCALE_1" - }, - { - "type": "hidden_item", - "x": 42, - "y": 5, - "elevation": 3, - "item": "ITEM_CALCIUM", - "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_1_CALCIUM" - }, - { - "type": "hidden_item", - "x": 45, - "y": 36, - "elevation": 3, - "item": "ITEM_HEART_SCALE", - "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_1_HEART_SCALE_2" - } - ] -} diff --git a/data/maps/Underwater1/scripts.inc b/data/maps/Underwater1/scripts.inc deleted file mode 100644 index 107a038a8..000000000 --- a/data/maps/Underwater1/scripts.inc +++ /dev/null @@ -1,3 +0,0 @@ -Underwater1_MapScripts:: @ 81F7722 - .byte 0 - diff --git a/data/maps/Underwater2/map.json b/data/maps/Underwater2/map.json deleted file mode 100644 index 5ecdc402a..000000000 --- a/data/maps/Underwater2/map.json +++ /dev/null @@ -1,109 +0,0 @@ -{ - "id": "MAP_UNDERWATER2", - "name": "Underwater2", - "layout": "LAYOUT_UNDERWATER2", - "music": "MUS_UNDERWATER", - "region_map_section": "MAPSEC_UNDERWATER_125", - "requires_flash": false, - "weather": "WEATHER_UNDERWATER_BUBBLES", - "map_type": "MAP_TYPE_UNDERWATER", - "allow_cycling": true, - "allow_escaping": false, - "allow_running": true, - "show_map_name": true, - "battle_scene": "MAP_BATTLE_SCENE_NORMAL", - "connections": [ - { - "direction": "up", - "offset": 0, - "map": "MAP_UNDERWATER1" - }, - { - "direction": "right", - "offset": 0, - "map": "MAP_UNDERWATER3" - }, - { - "direction": "emerge", - "offset": 0, - "map": "MAP_ROUTE126" - } - ], - "object_events": [], - "warp_events": [ - { - "x": 45, - "y": 65, - "elevation": 0, - "dest_map": "MAP_UNDERWATER_SOOTOPOLIS_CITY", - "dest_warp_id": 0 - } - ], - "coord_events": [], - "bg_events": [ - { - "type": "hidden_item", - "x": 30, - "y": 17, - "elevation": 3, - "item": "ITEM_HEART_SCALE", - "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_HEART_SCALE" - }, - { - "type": "hidden_item", - "x": 41, - "y": 19, - "elevation": 3, - "item": "ITEM_ULTRA_BALL", - "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_ULTRA_BALL" - }, - { - "type": "hidden_item", - "x": 63, - "y": 19, - "elevation": 3, - "item": "ITEM_STARDUST", - "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_STARDUST" - }, - { - "type": "hidden_item", - "x": 10, - "y": 36, - "elevation": 3, - "item": "ITEM_PEARL", - "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_PEARL" - }, - { - "type": "hidden_item", - "x": 11, - "y": 39, - "elevation": 3, - "item": "ITEM_IRON", - "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_IRON" - }, - { - "type": "hidden_item", - "x": 12, - "y": 35, - "elevation": 3, - "item": "ITEM_YELLOW_SHARD", - "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_YELLOW_SHARD" - }, - { - "type": "hidden_item", - "x": 65, - "y": 60, - "elevation": 3, - "item": "ITEM_BIG_PEARL", - "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_BIG_PEARL" - }, - { - "type": "hidden_item", - "x": 9, - "y": 77, - "elevation": 3, - "item": "ITEM_BLUE_SHARD", - "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_BLUE_SHARD" - } - ] -} diff --git a/data/maps/Underwater2/scripts.inc b/data/maps/Underwater2/scripts.inc deleted file mode 100644 index 80c854c63..000000000 --- a/data/maps/Underwater2/scripts.inc +++ /dev/null @@ -1,3 +0,0 @@ -Underwater2_MapScripts:: @ 81F7723 - .byte 0 - diff --git a/data/maps/Underwater3/map.json b/data/maps/Underwater3/map.json deleted file mode 100644 index 43df933a0..000000000 --- a/data/maps/Underwater3/map.json +++ /dev/null @@ -1,84 +0,0 @@ -{ - "id": "MAP_UNDERWATER3", - "name": "Underwater3", - "layout": "LAYOUT_UNDERWATER3", - "music": "MUS_UNDERWATER", - "region_map_section": "MAPSEC_UNDERWATER_126", - "requires_flash": false, - "weather": "WEATHER_UNDERWATER_BUBBLES", - "map_type": "MAP_TYPE_UNDERWATER", - "allow_cycling": true, - "allow_escaping": false, - "allow_running": true, - "show_map_name": true, - "battle_scene": "MAP_BATTLE_SCENE_NORMAL", - "connections": [ - { - "direction": "emerge", - "offset": 0, - "map": "MAP_ROUTE127" - }, - { - "direction": "left", - "offset": 0, - "map": "MAP_UNDERWATER2" - }, - { - "direction": "down", - "offset": 0, - "map": "MAP_UNDERWATER4" - } - ], - "object_events": [], - "warp_events": [ - { - "x": 57, - "y": 5, - "elevation": 0, - "dest_map": "MAP_UNDERWATER_MARINE_CAVE", - "dest_warp_id": 0 - }, - { - "x": 67, - "y": 38, - "elevation": 0, - "dest_map": "MAP_UNDERWATER_MARINE_CAVE", - "dest_warp_id": 0 - } - ], - "coord_events": [], - "bg_events": [ - { - "type": "hidden_item", - "x": 12, - "y": 42, - "elevation": 3, - "item": "ITEM_STAR_PIECE", - "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_3_STAR_PIECE" - }, - { - "type": "hidden_item", - "x": 50, - "y": 36, - "elevation": 3, - "item": "ITEM_HP_UP", - "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_3_HP_UP" - }, - { - "type": "hidden_item", - "x": 34, - "y": 72, - "elevation": 3, - "item": "ITEM_HEART_SCALE", - "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_3_HEART_SCALE" - }, - { - "type": "hidden_item", - "x": 72, - "y": 20, - "elevation": 3, - "item": "ITEM_RED_SHARD", - "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_3_RED_SHARD" - } - ] -} diff --git a/data/maps/Underwater3/scripts.inc b/data/maps/Underwater3/scripts.inc deleted file mode 100644 index e75acd635..000000000 --- a/data/maps/Underwater3/scripts.inc +++ /dev/null @@ -1,8 +0,0 @@ -Underwater3_MapScripts:: @ 81F7724 - map_script MAP_SCRIPT_ON_RESUME, Underwater3_OnResume - .byte 0 - -Underwater3_OnResume: @ 81F772A - call AbnormalWeather_Underwater_SetupEscapeWarp - end - diff --git a/data/maps/Underwater4/map.json b/data/maps/Underwater4/map.json deleted file mode 100644 index 4b0fc6d3b..000000000 --- a/data/maps/Underwater4/map.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "id": "MAP_UNDERWATER4", - "name": "Underwater4", - "layout": "LAYOUT_UNDERWATER4", - "music": "MUS_UNDERWATER", - "region_map_section": "MAPSEC_UNDERWATER_127", - "requires_flash": false, - "weather": "WEATHER_UNDERWATER_BUBBLES", - "map_type": "MAP_TYPE_UNDERWATER", - "allow_cycling": true, - "allow_escaping": false, - "allow_running": true, - "show_map_name": true, - "battle_scene": "MAP_BATTLE_SCENE_NORMAL", - "connections": [ - { - "direction": "up", - "offset": 0, - "map": "MAP_UNDERWATER3" - }, - { - "direction": "emerge", - "offset": 0, - "map": "MAP_ROUTE128" - } - ], - "object_events": [], - "warp_events": [ - { - "x": 38, - "y": 26, - "elevation": 3, - "dest_map": "MAP_UNDERWATER_SEAFLOOR_CAVERN", - "dest_warp_id": 0 - } - ], - "coord_events": [], - "bg_events": [ - { - "type": "hidden_item", - "x": 38, - "y": 19, - "elevation": 3, - "item": "ITEM_PROTEIN", - "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_4_PROTEIN" - }, - { - "type": "hidden_item", - "x": 69, - "y": 18, - "elevation": 3, - "item": "ITEM_PEARL", - "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_4_PEARL" - } - ] -} diff --git a/data/maps/Underwater4/scripts.inc b/data/maps/Underwater4/scripts.inc deleted file mode 100644 index 295c27356..000000000 --- a/data/maps/Underwater4/scripts.inc +++ /dev/null @@ -1,3 +0,0 @@ -Underwater4_MapScripts:: @ 81F7730 - .byte 0 - diff --git a/data/maps/Underwater5/map.json b/data/maps/Underwater5/map.json deleted file mode 100644 index 909591f11..000000000 --- a/data/maps/Underwater5/map.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "id": "MAP_UNDERWATER5", - "name": "Underwater5", - "layout": "LAYOUT_UNDERWATER5", - "music": "MUS_UNDERWATER", - "region_map_section": "MAPSEC_UNDERWATER_129", - "requires_flash": false, - "weather": "WEATHER_UNDERWATER_BUBBLES", - "map_type": "MAP_TYPE_UNDERWATER", - "allow_cycling": true, - "allow_escaping": false, - "allow_running": true, - "show_map_name": true, - "battle_scene": "MAP_BATTLE_SCENE_NORMAL", - "connections": [ - { - "direction": "emerge", - "offset": 0, - "map": "MAP_ROUTE129" - } - ], - "object_events": [], - "warp_events": [ - { - "x": 26, - "y": 3, - "elevation": 0, - "dest_map": "MAP_UNDERWATER_MARINE_CAVE", - "dest_warp_id": 0 - }, - { - "x": 32, - "y": 21, - "elevation": 0, - "dest_map": "MAP_UNDERWATER_MARINE_CAVE", - "dest_warp_id": 0 - } - ], - "coord_events": [], - "bg_events": [] -} diff --git a/data/maps/Underwater5/scripts.inc b/data/maps/Underwater5/scripts.inc deleted file mode 100644 index 235d25aba..000000000 --- a/data/maps/Underwater5/scripts.inc +++ /dev/null @@ -1,8 +0,0 @@ -Underwater5_MapScripts:: @ 81F7731 - map_script MAP_SCRIPT_ON_RESUME, Underwater5_OnResume - .byte 0 - -Underwater5_OnResume: @ 81F7737 - call AbnormalWeather_Underwater_SetupEscapeWarp - end - diff --git a/data/maps/Underwater6/map.json b/data/maps/Underwater6/map.json deleted file mode 100644 index 2a021f77f..000000000 --- a/data/maps/Underwater6/map.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "id": "MAP_UNDERWATER6", - "name": "Underwater6", - "layout": "LAYOUT_UNDERWATER6", - "music": "MUS_UNDERWATER", - "region_map_section": "MAPSEC_UNDERWATER_TERRA_CAVE", - "requires_flash": false, - "weather": "WEATHER_UNDERWATER_BUBBLES", - "map_type": "MAP_TYPE_UNDERWATER", - "allow_cycling": true, - "allow_escaping": false, - "allow_running": true, - "show_map_name": true, - "battle_scene": "MAP_BATTLE_SCENE_NORMAL", - "connections": [ - { - "direction": "emerge", - "offset": 0, - "map": "MAP_ROUTE105" - } - ], - "object_events": [], - "warp_events": [ - { - "x": 13, - "y": 4, - "elevation": 0, - "dest_map": "MAP_UNDERWATER_MARINE_CAVE", - "dest_warp_id": 0 - }, - { - "x": 17, - "y": 66, - "elevation": 0, - "dest_map": "MAP_UNDERWATER_MARINE_CAVE", - "dest_warp_id": 0 - } - ], - "coord_events": [], - "bg_events": [] -} diff --git a/data/maps/Underwater6/scripts.inc b/data/maps/Underwater6/scripts.inc deleted file mode 100644 index 21b639cd8..000000000 --- a/data/maps/Underwater6/scripts.inc +++ /dev/null @@ -1,8 +0,0 @@ -Underwater6_MapScripts:: @ 81F773D - map_script MAP_SCRIPT_ON_RESUME, Underwater6_OnResume - .byte 0 - -Underwater6_OnResume: @ 81F7743 - call AbnormalWeather_Underwater_SetupEscapeWarp - end - diff --git a/data/maps/Underwater7/map.json b/data/maps/Underwater7/map.json deleted file mode 100644 index 5155fc6ba..000000000 --- a/data/maps/Underwater7/map.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "id": "MAP_UNDERWATER7", - "name": "Underwater7", - "layout": "LAYOUT_UNDERWATER7", - "music": "MUS_UNDERWATER", - "region_map_section": "MAPSEC_UNDERWATER_UNK1", - "requires_flash": false, - "weather": "WEATHER_UNDERWATER_BUBBLES", - "map_type": "MAP_TYPE_UNDERWATER", - "allow_cycling": true, - "allow_escaping": false, - "allow_running": true, - "show_map_name": true, - "battle_scene": "MAP_BATTLE_SCENE_NORMAL", - "connections": [ - { - "direction": "emerge", - "offset": 0, - "map": "MAP_ROUTE125" - } - ], - "object_events": [], - "warp_events": [ - { - "x": 22, - "y": 10, - "elevation": 0, - "dest_map": "MAP_UNDERWATER_MARINE_CAVE", - "dest_warp_id": 0 - }, - { - "x": 45, - "y": 30, - "elevation": 0, - "dest_map": "MAP_UNDERWATER_MARINE_CAVE", - "dest_warp_id": 0 - } - ], - "coord_events": [], - "bg_events": [] -} diff --git a/data/maps/Underwater7/scripts.inc b/data/maps/Underwater7/scripts.inc deleted file mode 100644 index 4215dced9..000000000 --- a/data/maps/Underwater7/scripts.inc +++ /dev/null @@ -1,8 +0,0 @@ -Underwater7_MapScripts:: @ 81F7749 - map_script MAP_SCRIPT_ON_RESUME, Underwater7_OnResume - .byte 0 - -Underwater7_OnResume: @ 81F774F - call AbnormalWeather_Underwater_SetupEscapeWarp - end - diff --git a/data/maps/Underwater_Route105/map.json b/data/maps/Underwater_Route105/map.json new file mode 100644 index 000000000..890ccb2a8 --- /dev/null +++ b/data/maps/Underwater_Route105/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_UNDERWATER_ROUTE105", + "name": "Underwater_Route105", + "layout": "LAYOUT_UNDERWATER_ROUTE105", + "music": "MUS_UNDERWATER", + "region_map_section": "MAPSEC_UNDERWATER_105", + "requires_flash": false, + "weather": "WEATHER_UNDERWATER_BUBBLES", + "map_type": "MAP_TYPE_UNDERWATER", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "emerge", + "offset": 0, + "map": "MAP_ROUTE105" + } + ], + "object_events": [], + "warp_events": [ + { + "x": 13, + "y": 4, + "elevation": 0, + "dest_map": "MAP_UNDERWATER_MARINE_CAVE", + "dest_warp_id": 0 + }, + { + "x": 17, + "y": 66, + "elevation": 0, + "dest_map": "MAP_UNDERWATER_MARINE_CAVE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} diff --git a/data/maps/Underwater_Route105/scripts.inc b/data/maps/Underwater_Route105/scripts.inc new file mode 100644 index 000000000..41cd8bfbe --- /dev/null +++ b/data/maps/Underwater_Route105/scripts.inc @@ -0,0 +1,8 @@ +Underwater_Route105_MapScripts:: @ 81F773D + map_script MAP_SCRIPT_ON_RESUME, Underwater_Route105_OnResume + .byte 0 + +Underwater_Route105_OnResume: @ 81F7743 + call AbnormalWeather_Underwater_SetupEscapeWarp + end + diff --git a/data/maps/Underwater_Route124/map.json b/data/maps/Underwater_Route124/map.json new file mode 100644 index 000000000..46bc141a8 --- /dev/null +++ b/data/maps/Underwater_Route124/map.json @@ -0,0 +1,88 @@ +{ + "id": "MAP_UNDERWATER_ROUTE124", + "name": "Underwater_Route124", + "layout": "LAYOUT_UNDERWATER_ROUTE124", + "music": "MUS_UNDERWATER", + "region_map_section": "MAPSEC_UNDERWATER_124", + "requires_flash": false, + "weather": "WEATHER_UNDERWATER_BUBBLES", + "map_type": "MAP_TYPE_UNDERWATER", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "down", + "offset": 0, + "map": "MAP_UNDERWATER_ROUTE126" + }, + { + "direction": "emerge", + "offset": 0, + "map": "MAP_ROUTE124" + } + ], + "object_events": [], + "warp_events": [], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 42, + "y": 51, + "elevation": 0, + "item": "ITEM_CARBOS", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_124_CARBOS" + }, + { + "type": "hidden_item", + "x": 14, + "y": 40, + "elevation": 0, + "item": "ITEM_GREEN_SHARD", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_124_GREEN_SHARD" + }, + { + "type": "hidden_item", + "x": 66, + "y": 34, + "elevation": 3, + "item": "ITEM_PEARL", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_124_PEARL" + }, + { + "type": "hidden_item", + "x": 64, + "y": 54, + "elevation": 3, + "item": "ITEM_BIG_PEARL", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_124_BIG_PEARL" + }, + { + "type": "hidden_item", + "x": 70, + "y": 64, + "elevation": 3, + "item": "ITEM_HEART_SCALE", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_124_HEART_SCALE_1" + }, + { + "type": "hidden_item", + "x": 42, + "y": 5, + "elevation": 3, + "item": "ITEM_CALCIUM", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_124_CALCIUM" + }, + { + "type": "hidden_item", + "x": 45, + "y": 36, + "elevation": 3, + "item": "ITEM_HEART_SCALE", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_124_HEART_SCALE_2" + } + ] +} diff --git a/data/maps/Underwater_Route124/scripts.inc b/data/maps/Underwater_Route124/scripts.inc new file mode 100644 index 000000000..2a72dfb11 --- /dev/null +++ b/data/maps/Underwater_Route124/scripts.inc @@ -0,0 +1,3 @@ +Underwater_Route124_MapScripts:: @ 81F7722 + .byte 0 + diff --git a/data/maps/Underwater_Route125/map.json b/data/maps/Underwater_Route125/map.json new file mode 100644 index 000000000..c32bb57e8 --- /dev/null +++ b/data/maps/Underwater_Route125/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_UNDERWATER_ROUTE125", + "name": "Underwater_Route125", + "layout": "LAYOUT_UNDERWATER_ROUTE125", + "music": "MUS_UNDERWATER", + "region_map_section": "MAPSEC_UNDERWATER_125", + "requires_flash": false, + "weather": "WEATHER_UNDERWATER_BUBBLES", + "map_type": "MAP_TYPE_UNDERWATER", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "emerge", + "offset": 0, + "map": "MAP_ROUTE125" + } + ], + "object_events": [], + "warp_events": [ + { + "x": 22, + "y": 10, + "elevation": 0, + "dest_map": "MAP_UNDERWATER_MARINE_CAVE", + "dest_warp_id": 0 + }, + { + "x": 45, + "y": 30, + "elevation": 0, + "dest_map": "MAP_UNDERWATER_MARINE_CAVE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} diff --git a/data/maps/Underwater_Route125/scripts.inc b/data/maps/Underwater_Route125/scripts.inc new file mode 100644 index 000000000..662120e5e --- /dev/null +++ b/data/maps/Underwater_Route125/scripts.inc @@ -0,0 +1,8 @@ +Underwater_Route125_MapScripts:: @ 81F7749 + map_script MAP_SCRIPT_ON_RESUME, Underwater_Route125_OnResume + .byte 0 + +Underwater_Route125_OnResume: @ 81F774F + call AbnormalWeather_Underwater_SetupEscapeWarp + end + diff --git a/data/maps/Underwater_Route126/map.json b/data/maps/Underwater_Route126/map.json new file mode 100644 index 000000000..993bb7907 --- /dev/null +++ b/data/maps/Underwater_Route126/map.json @@ -0,0 +1,109 @@ +{ + "id": "MAP_UNDERWATER_ROUTE126", + "name": "Underwater_Route126", + "layout": "LAYOUT_UNDERWATER_ROUTE126", + "music": "MUS_UNDERWATER", + "region_map_section": "MAPSEC_UNDERWATER_126", + "requires_flash": false, + "weather": "WEATHER_UNDERWATER_BUBBLES", + "map_type": "MAP_TYPE_UNDERWATER", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 0, + "map": "MAP_UNDERWATER_ROUTE124" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_UNDERWATER_ROUTE127" + }, + { + "direction": "emerge", + "offset": 0, + "map": "MAP_ROUTE126" + } + ], + "object_events": [], + "warp_events": [ + { + "x": 45, + "y": 65, + "elevation": 0, + "dest_map": "MAP_UNDERWATER_SOOTOPOLIS_CITY", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 30, + "y": 17, + "elevation": 3, + "item": "ITEM_HEART_SCALE", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_126_HEART_SCALE" + }, + { + "type": "hidden_item", + "x": 41, + "y": 19, + "elevation": 3, + "item": "ITEM_ULTRA_BALL", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_126_ULTRA_BALL" + }, + { + "type": "hidden_item", + "x": 63, + "y": 19, + "elevation": 3, + "item": "ITEM_STARDUST", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_126_STARDUST" + }, + { + "type": "hidden_item", + "x": 10, + "y": 36, + "elevation": 3, + "item": "ITEM_PEARL", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_126_PEARL" + }, + { + "type": "hidden_item", + "x": 11, + "y": 39, + "elevation": 3, + "item": "ITEM_IRON", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_126_IRON" + }, + { + "type": "hidden_item", + "x": 12, + "y": 35, + "elevation": 3, + "item": "ITEM_YELLOW_SHARD", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_126_YELLOW_SHARD" + }, + { + "type": "hidden_item", + "x": 65, + "y": 60, + "elevation": 3, + "item": "ITEM_BIG_PEARL", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_126_BIG_PEARL" + }, + { + "type": "hidden_item", + "x": 9, + "y": 77, + "elevation": 3, + "item": "ITEM_BLUE_SHARD", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_126_BLUE_SHARD" + } + ] +} diff --git a/data/maps/Underwater_Route126/scripts.inc b/data/maps/Underwater_Route126/scripts.inc new file mode 100644 index 000000000..71d43e141 --- /dev/null +++ b/data/maps/Underwater_Route126/scripts.inc @@ -0,0 +1,3 @@ +Underwater_Route126_MapScripts:: @ 81F7723 + .byte 0 + diff --git a/data/maps/Underwater_Route127/map.json b/data/maps/Underwater_Route127/map.json new file mode 100644 index 000000000..b96f79c5d --- /dev/null +++ b/data/maps/Underwater_Route127/map.json @@ -0,0 +1,84 @@ +{ + "id": "MAP_UNDERWATER_ROUTE127", + "name": "Underwater_Route127", + "layout": "LAYOUT_UNDERWATER_ROUTE127", + "music": "MUS_UNDERWATER", + "region_map_section": "MAPSEC_UNDERWATER_127", + "requires_flash": false, + "weather": "WEATHER_UNDERWATER_BUBBLES", + "map_type": "MAP_TYPE_UNDERWATER", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "emerge", + "offset": 0, + "map": "MAP_ROUTE127" + }, + { + "direction": "left", + "offset": 0, + "map": "MAP_UNDERWATER_ROUTE126" + }, + { + "direction": "down", + "offset": 0, + "map": "MAP_UNDERWATER_ROUTE128" + } + ], + "object_events": [], + "warp_events": [ + { + "x": 57, + "y": 5, + "elevation": 0, + "dest_map": "MAP_UNDERWATER_MARINE_CAVE", + "dest_warp_id": 0 + }, + { + "x": 67, + "y": 38, + "elevation": 0, + "dest_map": "MAP_UNDERWATER_MARINE_CAVE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 12, + "y": 42, + "elevation": 3, + "item": "ITEM_STAR_PIECE", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_127_STAR_PIECE" + }, + { + "type": "hidden_item", + "x": 50, + "y": 36, + "elevation": 3, + "item": "ITEM_HP_UP", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_127_HP_UP" + }, + { + "type": "hidden_item", + "x": 34, + "y": 72, + "elevation": 3, + "item": "ITEM_HEART_SCALE", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_127_HEART_SCALE" + }, + { + "type": "hidden_item", + "x": 72, + "y": 20, + "elevation": 3, + "item": "ITEM_RED_SHARD", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_127_RED_SHARD" + } + ] +} diff --git a/data/maps/Underwater_Route127/scripts.inc b/data/maps/Underwater_Route127/scripts.inc new file mode 100644 index 000000000..552b9aab8 --- /dev/null +++ b/data/maps/Underwater_Route127/scripts.inc @@ -0,0 +1,8 @@ +Underwater_Route127_MapScripts:: @ 81F7724 + map_script MAP_SCRIPT_ON_RESUME, Underwater_Route127_OnResume + .byte 0 + +Underwater_Route127_OnResume: @ 81F772A + call AbnormalWeather_Underwater_SetupEscapeWarp + end + diff --git a/data/maps/Underwater_Route128/map.json b/data/maps/Underwater_Route128/map.json new file mode 100644 index 000000000..f80cf41a6 --- /dev/null +++ b/data/maps/Underwater_Route128/map.json @@ -0,0 +1,56 @@ +{ + "id": "MAP_UNDERWATER_ROUTE128", + "name": "Underwater_Route128", + "layout": "LAYOUT_UNDERWATER_ROUTE128", + "music": "MUS_UNDERWATER", + "region_map_section": "MAPSEC_UNDERWATER_128", + "requires_flash": false, + "weather": "WEATHER_UNDERWATER_BUBBLES", + "map_type": "MAP_TYPE_UNDERWATER", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 0, + "map": "MAP_UNDERWATER_ROUTE127" + }, + { + "direction": "emerge", + "offset": 0, + "map": "MAP_ROUTE128" + } + ], + "object_events": [], + "warp_events": [ + { + "x": 38, + "y": 26, + "elevation": 3, + "dest_map": "MAP_UNDERWATER_SEAFLOOR_CAVERN", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 38, + "y": 19, + "elevation": 3, + "item": "ITEM_PROTEIN", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_128_PROTEIN" + }, + { + "type": "hidden_item", + "x": 69, + "y": 18, + "elevation": 3, + "item": "ITEM_PEARL", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_128_PEARL" + } + ] +} diff --git a/data/maps/Underwater_Route128/scripts.inc b/data/maps/Underwater_Route128/scripts.inc new file mode 100644 index 000000000..a050afd93 --- /dev/null +++ b/data/maps/Underwater_Route128/scripts.inc @@ -0,0 +1,3 @@ +Underwater_Route128_MapScripts:: @ 81F7730 + .byte 0 + diff --git a/data/maps/Underwater_Route129/map.json b/data/maps/Underwater_Route129/map.json new file mode 100644 index 000000000..45775bd6b --- /dev/null +++ b/data/maps/Underwater_Route129/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_UNDERWATER_ROUTE129", + "name": "Underwater_Route129", + "layout": "LAYOUT_UNDERWATER_ROUTE129", + "music": "MUS_UNDERWATER", + "region_map_section": "MAPSEC_UNDERWATER_129", + "requires_flash": false, + "weather": "WEATHER_UNDERWATER_BUBBLES", + "map_type": "MAP_TYPE_UNDERWATER", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "emerge", + "offset": 0, + "map": "MAP_ROUTE129" + } + ], + "object_events": [], + "warp_events": [ + { + "x": 26, + "y": 3, + "elevation": 0, + "dest_map": "MAP_UNDERWATER_MARINE_CAVE", + "dest_warp_id": 0 + }, + { + "x": 32, + "y": 21, + "elevation": 0, + "dest_map": "MAP_UNDERWATER_MARINE_CAVE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} diff --git a/data/maps/Underwater_Route129/scripts.inc b/data/maps/Underwater_Route129/scripts.inc new file mode 100644 index 000000000..f9f84841e --- /dev/null +++ b/data/maps/Underwater_Route129/scripts.inc @@ -0,0 +1,8 @@ +Underwater_Route129_MapScripts:: @ 81F7731 + map_script MAP_SCRIPT_ON_RESUME, Underwater_Route129_OnResume + .byte 0 + +Underwater_Route129_OnResume: @ 81F7737 + call AbnormalWeather_Underwater_SetupEscapeWarp + end + diff --git a/data/maps/Underwater_SeafloorCavern/map.json b/data/maps/Underwater_SeafloorCavern/map.json index efcb3c291..d25a3600d 100644 --- a/data/maps/Underwater_SeafloorCavern/map.json +++ b/data/maps/Underwater_SeafloorCavern/map.json @@ -3,7 +3,7 @@ "name": "Underwater_SeafloorCavern", "layout": "LAYOUT_UNDERWATER_SEAFLOOR_CAVERN", "music": "MUS_UNDERWATER", - "region_map_section": "MAPSEC_UNDERWATER_128", + "region_map_section": "MAPSEC_UNDERWATER_SEAFLOOR_CAVERN", "requires_flash": false, "weather": "WEATHER_UNDERWATER_BUBBLES", "map_type": "MAP_TYPE_UNDERWATER", @@ -72,7 +72,7 @@ "x": 6, "y": 7, "elevation": 0, - "dest_map": "MAP_UNDERWATER4", + "dest_map": "MAP_UNDERWATER_ROUTE128", "dest_warp_id": 0 } ], diff --git a/data/maps/Underwater_SootopolisCity/map.json b/data/maps/Underwater_SootopolisCity/map.json index 90e5e97fc..0d1363ff6 100644 --- a/data/maps/Underwater_SootopolisCity/map.json +++ b/data/maps/Underwater_SootopolisCity/map.json @@ -19,14 +19,14 @@ "x": 9, "y": 8, "elevation": 0, - "dest_map": "MAP_UNDERWATER2", + "dest_map": "MAP_UNDERWATER_ROUTE126", "dest_warp_id": 0 }, { "x": 10, "y": 8, "elevation": 0, - "dest_map": "MAP_UNDERWATER2", + "dest_map": "MAP_UNDERWATER_ROUTE126", "dest_warp_id": 0 } ], diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json index 2821ad20f..4201e814f 100644 --- a/data/maps/map_groups.json +++ b/data/maps/map_groups.json @@ -86,13 +86,13 @@ "Route132", "Route133", "Route134", - "Underwater1", - "Underwater2", - "Underwater3", - "Underwater4", - "Underwater5", - "Underwater6", - "Underwater7" + "Underwater_Route124", + "Underwater_Route126", + "Underwater_Route127", + "Underwater_Route128", + "Underwater_Route129", + "Underwater_Route105", + "Underwater_Route125" ], "gMapGroup1": [ "LittlerootTown_BrendansHouse_1F", @@ -672,13 +672,13 @@ "Route132", "Route133", "Route134", - "Underwater6", - "Underwater1", - "Underwater7", - "Underwater2", - "Underwater3", - "Underwater4", - "Underwater5", + "Underwater_Route105", + "Underwater_Route124", + "Underwater_Route125", + "Underwater_Route126", + "Underwater_Route127", + "Underwater_Route128", + "Underwater_Route129", "SafariZone_Northwest", "SafariZone_North", "SafariZone_Southwest", -- cgit v1.2.3