diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-07-22 13:14:58 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-07-22 13:14:58 +0200 |
| commit | 1e9143e0b22bc72cb77866e10817bc509064842a (patch) | |
| tree | 87b77fdd2c19d34cb7ac10870fdc4c30188e2d70 /data/maps/Route104_Prototype | |
| parent | c9d486a5d3ea6bf7d256c2d7ca7f10339e498427 (diff) | |
| parent | 06b3ce408f774c7192202308e783cc22bb8e7643 (diff) | |
merge union room with master
Diffstat (limited to 'data/maps/Route104_Prototype')
| -rw-r--r-- | data/maps/Route104_Prototype/border.bin | 1 | ||||
| -rw-r--r-- | data/maps/Route104_Prototype/events.inc | 3 | ||||
| -rw-r--r-- | data/maps/Route104_Prototype/header.inc | 10 | ||||
| -rw-r--r-- | data/maps/Route104_Prototype/map.bin | 1 | ||||
| -rw-r--r-- | data/maps/Route104_Prototype/scripts.inc | 3 |
5 files changed, 11 insertions, 7 deletions
diff --git a/data/maps/Route104_Prototype/border.bin b/data/maps/Route104_Prototype/border.bin deleted file mode 100644 index 03bcafef1..000000000 --- a/data/maps/Route104_Prototype/border.bin +++ /dev/null @@ -1 +0,0 @@ -ÔÕÜÝ
\ No newline at end of file diff --git a/data/maps/Route104_Prototype/events.inc b/data/maps/Route104_Prototype/events.inc new file mode 100644 index 000000000..08976e5a8 --- /dev/null +++ b/data/maps/Route104_Prototype/events.inc @@ -0,0 +1,3 @@ +Route104_Prototype_MapEvents:: @ 853DDC0 + map_events 0x0, 0x0, 0x0, 0x0 + diff --git a/data/maps/Route104_Prototype/header.inc b/data/maps/Route104_Prototype/header.inc index 9728190a1..ea0b1390a 100644 --- a/data/maps/Route104_Prototype/header.inc +++ b/data/maps/Route104_Prototype/header.inc @@ -1,15 +1,15 @@ Route104_Prototype: @ 8485AF8 - .4byte Route104_Prototype_MapAttributes + .4byte Route104_Prototype_Layout .4byte Route104_Prototype_MapEvents .4byte Route104_Prototype_MapScripts .4byte 0x0 .2byte MUS_NEXTROAD .2byte 287 - .byte 19 + .byte MAPSEC_ROUTE_104 .byte 0 - .byte 2 - .byte 3 + .byte WEATHER_SUNNY + .byte MAP_TYPE_ROUTE .2byte 0 .byte 8 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route104_Prototype/map.bin b/data/maps/Route104_Prototype/map.bin deleted file mode 100644 index 71bd63e62..000000000 --- a/data/maps/Route104_Prototype/map.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/Route104_Prototype/scripts.inc b/data/maps/Route104_Prototype/scripts.inc new file mode 100644 index 000000000..d8274fffc --- /dev/null +++ b/data/maps/Route104_Prototype/scripts.inc @@ -0,0 +1,3 @@ +Route104_Prototype_MapScripts:: @ 82693F2 + .byte 0 + |