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/ChampionsRoom.asm | |
| parent | Use ANY_DIR, UP_DOWN, and LEFT_RIGHT for map objects (diff) | |
| parent | Comments explain the def_warps_to macros (diff) | |
| download | pokeyellow-7e9ccbb5b254f794a79c4d0f9d816b3cbfb81f3f.tar.gz pokeyellow-7e9ccbb5b254f794a79c4d0f9d816b3cbfb81f3f.tar.xz pokeyellow-7e9ccbb5b254f794a79c4d0f9d816b3cbfb81f3f.zip | |
Merge pull request #287 from Rangi42/master
Simplify map event definitions
Diffstat (limited to 'data/maps/objects/ChampionsRoom.asm')
| -rwxr-xr-x | data/maps/objects/ChampionsRoom.asm | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/data/maps/objects/ChampionsRoom.asm b/data/maps/objects/ChampionsRoom.asm index 1e0cb7f4..53f4ca33 100755 --- a/data/maps/objects/ChampionsRoom.asm +++ b/data/maps/objects/ChampionsRoom.asm @@ -1,20 +1,16 @@ ChampionsRoom_Object: db $3 ; border block - db 4 ; warps + def_warps warp 3, 7, 1, LANCES_ROOM warp 4, 7, 2, LANCES_ROOM warp 3, 0, 0, HALL_OF_FAME warp 4, 0, 0, HALL_OF_FAME - db 0 ; signs + def_signs - db 2 ; objects + def_objects object SPRITE_BLUE, 4, 2, STAY, DOWN, 1 ; person object SPRITE_OAK, 3, 7, STAY, UP, 2 ; person - ; warp-to - warp_to 3, 7, CHAMPIONS_ROOM_WIDTH ; LANCES_ROOM - warp_to 4, 7, CHAMPIONS_ROOM_WIDTH ; LANCES_ROOM - warp_to 3, 0, CHAMPIONS_ROOM_WIDTH ; HALL_OF_FAME - warp_to 4, 0, CHAMPIONS_ROOM_WIDTH ; HALL_OF_FAME + def_warps_to CHAMPIONS_ROOM |