diff options
Diffstat (limited to 'data/maps/Underwater5')
| -rw-r--r-- | data/maps/Underwater5/border.bin | 1 | ||||
| -rw-r--r-- | data/maps/Underwater5/connections.inc | 2 | ||||
| -rw-r--r-- | data/maps/Underwater5/events.inc | 7 | ||||
| -rw-r--r-- | data/maps/Underwater5/header.inc | 10 | ||||
| -rw-r--r-- | data/maps/Underwater5/map.bin | 1 | ||||
| -rw-r--r-- | data/maps/Underwater5/scripts.inc | 8 |
6 files changed, 21 insertions, 8 deletions
diff --git a/data/maps/Underwater5/border.bin b/data/maps/Underwater5/border.bin deleted file mode 100644 index b15c94f96..000000000 --- a/data/maps/Underwater5/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/Underwater5/connections.inc b/data/maps/Underwater5/connections.inc index 6eafa49d6..15a3322ed 100644 --- a/data/maps/Underwater5/connections.inc +++ b/data/maps/Underwater5/connections.inc @@ -1,5 +1,5 @@ Underwater5_MapConnectionsList: @ 8486DE4 - connection emerge, 0, ROUTE_129, 0 + connection emerge, 0, MAP_ROUTE129 Underwater5_MapConnections: @ 8486DF0 .4byte 0x1 diff --git a/data/maps/Underwater5/events.inc b/data/maps/Underwater5/events.inc new file mode 100644 index 000000000..4b902cf96 --- /dev/null +++ b/data/maps/Underwater5/events.inc @@ -0,0 +1,7 @@ +Underwater5_MapWarps: @ 852D020 + warp_def 26, 3, 0, 0, MAP_UNDERWATER_MARINE_CAVE + warp_def 32, 21, 0, 0, MAP_UNDERWATER_MARINE_CAVE + +Underwater5_MapEvents:: @ 852D030 + map_events 0x0, Underwater5_MapWarps, 0x0, 0x0 + diff --git a/data/maps/Underwater5/header.inc b/data/maps/Underwater5/header.inc index f46d3d677..dda2f54b1 100644 --- a/data/maps/Underwater5/header.inc +++ b/data/maps/Underwater5/header.inc @@ -1,15 +1,15 @@ Underwater5: @ 8482AA0 - .4byte Underwater5_MapAttributes + .4byte Underwater5_Layout .4byte Underwater5_MapEvents .4byte Underwater5_MapScripts .4byte Underwater5_MapConnections .2byte MUS_DEEPDEEP .2byte 412 - .byte 208 + .byte MAPSEC_UNDERWATER_129 .byte 0 - .byte 14 - .byte 5 + .byte WEATHER_BUBBLES + .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Underwater5/map.bin b/data/maps/Underwater5/map.bin deleted file mode 100644 index 902f0dbdc..000000000 --- a/data/maps/Underwater5/map.bin +++ /dev/null @@ -1 +0,0 @@ - &
.
©2©2©2©2©2©2©2
#©2©2©2}#~©2
# ©2©2©2©2 ©2©2}#©2
" ©2©2}#©2 ©2©2©2©2©2 ©2©2©2}#©2©2©2 ©2©2©2}#©2©2©2©2 ©2©2©2©2©2}#©2©2}"## ©222©2©2}#©2©2©2 ©22222©2
©2©2©2}"# 222222©2©2©2©2©2©2# ©2©2222222©2©2©2©2}"#
"""# ©2©2©2z222x2©2©2©2}"#
""©2©2
©2©2©2©2y2y2©2©2©2©2
""©222©2
############ ©22222©2
"" & 222222 .©2222222 #©2©2©2©2©2©2©2©2©2©2©2z222x2©2 ©2©2©2©2©2©2©2©2©2©2©2©2y2y2©2}" # #"""""""""""""""" #
#
"
"
"
" # # # # # # ## # ###
\ No newline at end of file diff --git a/data/maps/Underwater5/scripts.inc b/data/maps/Underwater5/scripts.inc new file mode 100644 index 000000000..9d0cc373c --- /dev/null +++ b/data/maps/Underwater5/scripts.inc @@ -0,0 +1,8 @@ +Underwater5_MapScripts:: @ 81F7731 + map_script 5, Underwater5_MapScript1_1F7737 + .byte 0 + +Underwater5_MapScript1_1F7737: @ 81F7737 + call Underwater5_EventScript_274223 + end + |