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/SecretBase_RedCave3 | |
| parent | 9acd55ae4f9e455a92765aaee5929240097f9f8f (diff) | |
| parent | efebc51972b23ddffa2700b1dd6895d4728646a3 (diff) | |
Merge pull request #1 from pret/master
synching with source repo
Diffstat (limited to 'data/maps/SecretBase_RedCave3')
| -rw-r--r-- | data/maps/SecretBase_RedCave3/border.bin | 1 | ||||
| -rw-r--r-- | data/maps/SecretBase_RedCave3/events.inc | 23 | ||||
| -rw-r--r-- | data/maps/SecretBase_RedCave3/header.inc | 2 | ||||
| -rw-r--r-- | data/maps/SecretBase_RedCave3/map.bin | 47 | ||||
| -rw-r--r-- | data/maps/SecretBase_RedCave3/scripts.inc | 1 |
5 files changed, 25 insertions, 49 deletions
diff --git a/data/maps/SecretBase_RedCave3/border.bin b/data/maps/SecretBase_RedCave3/border.bin deleted file mode 100644 index 5c0908a6a..000000000 --- a/data/maps/SecretBase_RedCave3/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/SecretBase_RedCave3/events.inc b/data/maps/SecretBase_RedCave3/events.inc new file mode 100644 index 000000000..dda054b44 --- /dev/null +++ b/data/maps/SecretBase_RedCave3/events.inc @@ -0,0 +1,23 @@ +SecretBase_RedCave3_EventObjects: @ 8538B14 + object_event 1, 255, 0, 12, 1, 3, 8, 0, 0, 0, 0, SecretBase_RedCave3_EventScript_275D64, 173 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179 + object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180 + object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181 + object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182 + object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183 + object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184 + object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185 + object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186 + object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187 + +SecretBase_RedCave3_MapWarps: @ 8538C7C + warp_def 3, 6, 0, 126, MAP_NONE + +SecretBase_RedCave3_MapEvents:: @ 8538C84 + map_events SecretBase_RedCave3_EventObjects, SecretBase_RedCave3_MapWarps, 0x0, 0x0 + diff --git a/data/maps/SecretBase_RedCave3/header.inc b/data/maps/SecretBase_RedCave3/header.inc index 9d4f26d36..c153e74c6 100644 --- a/data/maps/SecretBase_RedCave3/header.inc +++ b/data/maps/SecretBase_RedCave3/header.inc @@ -1,5 +1,5 @@ SecretBase_RedCave3: @ 8484BE0 - .4byte SecretBase_RedCave3_MapAttributes + .4byte SecretBase_RedCave3_Layout .4byte SecretBase_RedCave3_MapEvents .4byte SecretBase_RedCave3_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_RedCave3/map.bin b/data/maps/SecretBase_RedCave3/map.bin deleted file mode 100644 index 0528e565d..000000000 --- a/data/maps/SecretBase_RedCave3/map.bin +++ /dev/null @@ -1,47 +0,0 @@ - -2 -22 -2 6 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2
6 -2 -2 -2 -2 -2 -2 -2 -2 -222 -22 -2 -2 -2 -2 -2 -2 -2 -2 -26 -2 -2 -2 -2 -2 -22 -2 -2 6 -2 -2 -2
\ No newline at end of file diff --git a/data/maps/SecretBase_RedCave3/scripts.inc b/data/maps/SecretBase_RedCave3/scripts.inc new file mode 100644 index 000000000..512f7f92a --- /dev/null +++ b/data/maps/SecretBase_RedCave3/scripts.inc @@ -0,0 +1 @@ +SecretBase_RedCave3_MapScripts:: @ 823B483 |