diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-08-20 19:07:42 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-20 19:07:42 -0400 |
| commit | 7e9ccbb5b254f794a79c4d0f9d816b3cbfb81f3f (patch) | |
| tree | ddda1118461d6151597a4bf9eefcb0eddc835da1 /data/maps/objects/LoreleisRoom.asm | |
| parent | 2fe1505babaf02b995cc0d9c3a827b798935b19a (diff) | |
| parent | d5db0c3dbf78a957e8f10ad410789c4256d64f74 (diff) | |
Merge pull request #287 from Rangi42/master
Simplify map event definitions
Diffstat (limited to 'data/maps/objects/LoreleisRoom.asm')
| -rwxr-xr-x | data/maps/objects/LoreleisRoom.asm | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/data/maps/objects/LoreleisRoom.asm b/data/maps/objects/LoreleisRoom.asm index 06450bb4..0c119ea3 100755 --- a/data/maps/objects/LoreleisRoom.asm +++ b/data/maps/objects/LoreleisRoom.asm @@ -1,19 +1,15 @@ LoreleisRoom_Object: db $3 ; border block - db 4 ; warps + def_warps warp 4, 11, 2, INDIGO_PLATEAU_LOBBY warp 5, 11, 2, INDIGO_PLATEAU_LOBBY warp 4, 0, 0, BRUNOS_ROOM warp 5, 0, 1, BRUNOS_ROOM - db 0 ; signs + def_signs - db 1 ; objects + def_objects object SPRITE_LORELEI, 5, 2, STAY, DOWN, 1, OPP_LORELEI, 1 - ; warp-to - warp_to 4, 11, LORELEIS_ROOM_WIDTH ; INDIGO_PLATEAU_LOBBY - warp_to 5, 11, LORELEIS_ROOM_WIDTH ; INDIGO_PLATEAU_LOBBY - warp_to 4, 0, LORELEIS_ROOM_WIDTH ; BRUNOS_ROOM - warp_to 5, 0, LORELEIS_ROOM_WIDTH ; BRUNOS_ROOM + def_warps_to LORELEIS_ROOM |