diff options
| author | Garak <thomastaps194@comcast.net> | 2018-07-04 11:11:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-04 11:11:45 -0400 |
| commit | e06b63efc9ea39875b17f00e5ff20c2e0fcb0415 (patch) | |
| tree | e8d37347ae000823943ef57973dc34dd98633b40 /data/maps/RecordCorner | |
| parent | 9acd55ae4f9e455a92765aaee5929240097f9f8f (diff) | |
| parent | efebc51972b23ddffa2700b1dd6895d4728646a3 (diff) | |
Merge pull request #1 from pret/master
synching with source repo
Diffstat (limited to 'data/maps/RecordCorner')
| -rw-r--r-- | data/maps/RecordCorner/border.bin | 1 | ||||
| -rw-r--r-- | data/maps/RecordCorner/events.inc | 18 | ||||
| -rw-r--r-- | data/maps/RecordCorner/header.inc | 2 | ||||
| -rw-r--r-- | data/maps/RecordCorner/map.bin | 1 | ||||
| -rw-r--r-- | data/maps/RecordCorner/scripts.inc | 3 |
5 files changed, 22 insertions, 3 deletions
diff --git a/data/maps/RecordCorner/border.bin b/data/maps/RecordCorner/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/RecordCorner/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/RecordCorner/events.inc b/data/maps/RecordCorner/events.inc new file mode 100644 index 000000000..7970c14ba --- /dev/null +++ b/data/maps/RecordCorner/events.inc @@ -0,0 +1,18 @@ +RecordCorner_EventObjects: @ 8539DFC + object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 10, 5, 3, 8, 0, 0, 0, 0, RecordCorner_EventScript_2774C6, 0 + +RecordCorner_MapWarps: @ 8539E14 + warp_def 8, 9, 3, 127, MAP_NONE + warp_def 9, 9, 3, 127, MAP_NONE + warp_def 11, 9, 3, 127, MAP_NONE + warp_def 10, 9, 3, 127, MAP_NONE + +RecordCorner_MapCoordEvents: @ 8539E34 + coord_event 6, 4, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_0827741D + coord_event 6, 6, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_08277447 + coord_event 13, 4, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_08277432 + coord_event 13, 6, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_0827745C + +RecordCorner_MapEvents:: @ 8539E74 + map_events RecordCorner_EventObjects, RecordCorner_MapWarps, RecordCorner_MapCoordEvents, 0x0 + diff --git a/data/maps/RecordCorner/header.inc b/data/maps/RecordCorner/header.inc index 67ebd9405..7235504fa 100644 --- a/data/maps/RecordCorner/header.inc +++ b/data/maps/RecordCorner/header.inc @@ -1,5 +1,5 @@ RecordCorner: @ 8484D68 - .4byte RecordCorner_MapAttributes + .4byte RecordCorner_Layout .4byte RecordCorner_MapEvents .4byte RecordCorner_MapScripts .4byte 0x0 diff --git a/data/maps/RecordCorner/map.bin b/data/maps/RecordCorner/map.bin deleted file mode 100644 index 51dfb6e5a..000000000 --- a/data/maps/RecordCorner/map.bin +++ /dev/null @@ -1 +0,0 @@ -22222222222222222222222222222222222222222222222222222222222222222222"2"2"2"2
\ No newline at end of file diff --git a/data/maps/RecordCorner/scripts.inc b/data/maps/RecordCorner/scripts.inc new file mode 100644 index 000000000..4f342b860 --- /dev/null +++ b/data/maps/RecordCorner/scripts.inc @@ -0,0 +1,3 @@ +RecordCorner_MapScripts:: @ 823B77F + .byte 0 + |