diff options
| author | Daniel Harding <33dannye@gmail.com> | 2018-02-05 10:57:14 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-05 10:57:14 -0600 |
| commit | b8aa9ec80e43257a9e3a487b46a33f99c999a940 (patch) | |
| tree | 3813e75239070dbb3d549e8c03297cc28b2551e3 /data/mapObjects/ceruleangym.asm | |
| parent | c84667c4df36918071bb7487c456d7adafb921ca (diff) | |
| parent | 819b6789099947e83b7e3f0b0e2f6d39cf901807 (diff) | |
Merge pull request #174 from Rangi42/master
Add warp, sign, and warp_to macros for data/mapObjects definitions; use base 10 numbers
Diffstat (limited to 'data/mapObjects/ceruleangym.asm')
| -rwxr-xr-x | data/mapObjects/ceruleangym.asm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/data/mapObjects/ceruleangym.asm b/data/mapObjects/ceruleangym.asm index 66d22260..d774c5dd 100755 --- a/data/mapObjects/ceruleangym.asm +++ b/data/mapObjects/ceruleangym.asm @@ -1,18 +1,18 @@ CeruleanGymObject: db $3 ; border block - db $2 ; warps - db $d, $4, $3, $ff - db $d, $5, $3, $ff + db 2 ; warps + warp 4, 13, 3, -1 + warp 5, 13, 3, -1 - db $0 ; signs + db 0 ; signs - db $4 ; objects - object SPRITE_BRUNETTE_GIRL, $4, $2, STAY, DOWN, $1, OPP_MISTY, $1 - object SPRITE_LASS, $2, $3, STAY, RIGHT, $2, OPP_JR_TRAINER_F, $1 - object SPRITE_SWIMMER, $8, $7, STAY, LEFT, $3, OPP_SWIMMER, $1 - object SPRITE_GYM_HELPER, $7, $a, STAY, DOWN, $4 ; person + db 4 ; objects + object SPRITE_BRUNETTE_GIRL, 4, 2, STAY, DOWN, 1, OPP_MISTY, 1 + object SPRITE_LASS, 2, 3, STAY, RIGHT, 2, OPP_JR_TRAINER_F, 1 + object SPRITE_SWIMMER, 8, 7, STAY, LEFT, 3, OPP_SWIMMER, 1 + object SPRITE_GYM_HELPER, 7, 10, STAY, DOWN, 4 ; person ; warp-to - EVENT_DISP CERULEAN_GYM_WIDTH, $d, $4 - EVENT_DISP CERULEAN_GYM_WIDTH, $d, $5 + warp_to 4, 13, CERULEAN_GYM_WIDTH + warp_to 5, 13, CERULEAN_GYM_WIDTH |