diff options
Diffstat (limited to 'data/maps/Underwater6')
| -rw-r--r-- | data/maps/Underwater6/border.bin | 1 | ||||
| -rw-r--r-- | data/maps/Underwater6/connections.inc | 2 | ||||
| -rw-r--r-- | data/maps/Underwater6/events.inc | 7 | ||||
| -rw-r--r-- | data/maps/Underwater6/header.inc | 10 | ||||
| -rw-r--r-- | data/maps/Underwater6/map.bin | 1 | ||||
| -rw-r--r-- | data/maps/Underwater6/scripts.inc | 8 |
6 files changed, 21 insertions, 8 deletions
diff --git a/data/maps/Underwater6/border.bin b/data/maps/Underwater6/border.bin deleted file mode 100644 index b15c94f96..000000000 --- a/data/maps/Underwater6/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/Underwater6/connections.inc b/data/maps/Underwater6/connections.inc index 4d2960b36..432ab625f 100644 --- a/data/maps/Underwater6/connections.inc +++ b/data/maps/Underwater6/connections.inc @@ -1,5 +1,5 @@ Underwater6_MapConnectionsList: @ 8486D24 - connection emerge, 0, ROUTE_105, 0 + connection emerge, 0, MAP_ROUTE105 Underwater6_MapConnections: @ 8486D30 .4byte 0x1 diff --git a/data/maps/Underwater6/events.inc b/data/maps/Underwater6/events.inc new file mode 100644 index 000000000..a624efba3 --- /dev/null +++ b/data/maps/Underwater6/events.inc @@ -0,0 +1,7 @@ +Underwater6_MapWarps: @ 852D044 + warp_def 13, 4, 0, 0, MAP_UNDERWATER_MARINE_CAVE + warp_def 17, 66, 0, 0, MAP_UNDERWATER_MARINE_CAVE + +Underwater6_MapEvents:: @ 852D054 + map_events 0x0, Underwater6_MapWarps, 0x0, 0x0 + diff --git a/data/maps/Underwater6/header.inc b/data/maps/Underwater6/header.inc index cf6ab9141..17769c331 100644 --- a/data/maps/Underwater6/header.inc +++ b/data/maps/Underwater6/header.inc @@ -1,15 +1,15 @@ Underwater6: @ 8482ABC - .4byte Underwater6_MapAttributes + .4byte Underwater6_Layout .4byte Underwater6_MapEvents .4byte Underwater6_MapScripts .4byte Underwater6_MapConnections .2byte MUS_DEEPDEEP .2byte 410 - .byte 206 + .byte MAPSEC_UNDERWATER_TERRA_CAVE .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/Underwater6/map.bin b/data/maps/Underwater6/map.bin deleted file mode 100644 index 92bd56031..000000000 --- a/data/maps/Underwater6/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©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 #~©22222©2©2/ ###222222©2222222©2
©2z222x2©2©2©2©2©2©2©2©2y2y2©2©2©2©2©2©2©2©2©2©2©2©2©2©2©2©2©2©2####"""##########"""""""""""""""
#
##
©222©2©2
©22222©2
222222
##
##222222
#~z222x2©2
#~y2y2©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
####"""
#
##
#
#
#
# #####""
\ No newline at end of file diff --git a/data/maps/Underwater6/scripts.inc b/data/maps/Underwater6/scripts.inc new file mode 100644 index 000000000..047628c9c --- /dev/null +++ b/data/maps/Underwater6/scripts.inc @@ -0,0 +1,8 @@ +Underwater6_MapScripts:: @ 81F773D + map_script 5, Underwater6_MapScript1_1F7743 + .byte 0 + +Underwater6_MapScript1_1F7743: @ 81F7743 + call Underwater6_EventScript_274223 + end + |