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/ViridianGym.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/ViridianGym.asm')
| -rwxr-xr-x | data/maps/objects/ViridianGym.asm | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/data/maps/objects/ViridianGym.asm b/data/maps/objects/ViridianGym.asm index d6ee127c..cc158928 100755 --- a/data/maps/objects/ViridianGym.asm +++ b/data/maps/objects/ViridianGym.asm @@ -1,13 +1,13 @@ ViridianGym_Object: db $3 ; border block - db 2 ; warps + def_warps warp 16, 17, 4, LAST_MAP warp 17, 17, 4, LAST_MAP - db 0 ; signs + def_signs - db 11 ; objects + def_objects object SPRITE_GIOVANNI, 2, 1, STAY, DOWN, 1, OPP_GIOVANNI, 3 object SPRITE_COOLTRAINER_M, 12, 7, STAY, DOWN, 2, OPP_COOLTRAINER_M, 9 object SPRITE_HIKER, 11, 11, STAY, UP, 3, OPP_BLACKBELT, 6 @@ -20,6 +20,4 @@ ViridianGym_Object: object SPRITE_GYM_GUIDE, 16, 15, STAY, DOWN, 10 ; person object SPRITE_POKE_BALL, 16, 9, STAY, NONE, 11, REVIVE - ; warp-to - warp_to 16, 17, VIRIDIAN_GYM_WIDTH - warp_to 17, 17, VIRIDIAN_GYM_WIDTH + def_warps_to VIRIDIAN_GYM |