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/IndigoPlateauLobby.asm | |
| parent | 2fe1505babaf02b995cc0d9c3a827b798935b19a (diff) | |
| parent | d5db0c3dbf78a957e8f10ad410789c4256d64f74 (diff) | |
Merge pull request #287 from Rangi42/master
Simplify map event definitions
Diffstat (limited to 'data/maps/objects/IndigoPlateauLobby.asm')
| -rwxr-xr-x | data/maps/objects/IndigoPlateauLobby.asm | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/data/maps/objects/IndigoPlateauLobby.asm b/data/maps/objects/IndigoPlateauLobby.asm index 7bcb8a23..9c4c4435 100755 --- a/data/maps/objects/IndigoPlateauLobby.asm +++ b/data/maps/objects/IndigoPlateauLobby.asm @@ -1,21 +1,18 @@ IndigoPlateauLobby_Object: db $0 ; border block - db 3 ; warps + def_warps warp 7, 11, 0, LAST_MAP warp 8, 11, 1, LAST_MAP warp 8, 0, 0, LORELEIS_ROOM - db 0 ; signs + def_signs - db 5 ; objects + def_objects object SPRITE_NURSE, 7, 5, STAY, DOWN, 1 ; person object SPRITE_GYM_GUIDE, 4, 9, STAY, RIGHT, 2 ; person object SPRITE_COOLTRAINER_F, 5, 1, STAY, DOWN, 3 ; person object SPRITE_CLERK, 0, 5, STAY, RIGHT, 4 ; person object SPRITE_LINK_RECEPTIONIST, 13, 6, STAY, DOWN, 5 ; person - ; warp-to - warp_to 7, 11, INDIGO_PLATEAU_LOBBY_WIDTH - warp_to 8, 11, INDIGO_PLATEAU_LOBBY_WIDTH - warp_to 8, 0, INDIGO_PLATEAU_LOBBY_WIDTH ; LORELEIS_ROOM + def_warps_to INDIGO_PLATEAU_LOBBY |