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/HallOfFame.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/HallOfFame.asm')
| -rwxr-xr-x | data/maps/objects/HallOfFame.asm | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/data/maps/objects/HallOfFame.asm b/data/maps/objects/HallOfFame.asm index 3762d871..613efccf 100755 --- a/data/maps/objects/HallOfFame.asm +++ b/data/maps/objects/HallOfFame.asm @@ -1,15 +1,13 @@ HallOfFame_Object: db $3 ; border block - db 2 ; warps + def_warps warp 4, 7, 2, CHAMPIONS_ROOM warp 5, 7, 3, CHAMPIONS_ROOM - db 0 ; signs + def_signs - db 1 ; objects + def_objects object SPRITE_OAK, 5, 2, STAY, DOWN, 1 ; person - ; warp-to - warp_to 4, 7, HALL_OF_FAME_WIDTH ; CHAMPIONS_ROOM - warp_to 5, 7, HALL_OF_FAME_WIDTH ; CHAMPIONS_ROOM + def_warps_to HALL_OF_FAME |