diff options
Diffstat (limited to 'data/maps/objects/CinnabarGym.asm')
| -rwxr-xr-x | data/maps/objects/CinnabarGym.asm | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/data/maps/objects/CinnabarGym.asm b/data/maps/objects/CinnabarGym.asm index 6548ddb8..b2dccbd3 100755 --- a/data/maps/objects/CinnabarGym.asm +++ b/data/maps/objects/CinnabarGym.asm @@ -1,13 +1,13 @@ CinnabarGym_Object: db $2e ; border block - db 2 ; warps + def_warps warp 16, 17, 1, LAST_MAP warp 17, 17, 1, LAST_MAP - db 0 ; signs + def_signs - db 9 ; objects + def_objects object SPRITE_MIDDLE_AGED_MAN, 3, 3, STAY, DOWN, 1, OPP_BLAINE, 1 object SPRITE_SUPER_NERD, 17, 2, STAY, DOWN, 2, OPP_SUPER_NERD, 9 object SPRITE_SUPER_NERD, 17, 8, STAY, DOWN, 3, OPP_BURGLAR, 4 @@ -18,6 +18,4 @@ CinnabarGym_Object: object SPRITE_SUPER_NERD, 3, 8, STAY, DOWN, 8, OPP_SUPER_NERD, 12 object SPRITE_GYM_GUIDE, 16, 13, STAY, DOWN, 9 ; person - ; warp-to - warp_to 16, 17, CINNABAR_GYM_WIDTH - warp_to 17, 17, CINNABAR_GYM_WIDTH + def_warps_to CINNABAR_GYM |