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/pokemontower7.asm | |
| parent | Add pokegold and pokefirered. (diff) | |
| parent | INCBIN don't start with tabs (diff) | |
| download | pokeyellow-b8aa9ec80e43257a9e3a487b46a33f99c999a940.tar.gz pokeyellow-b8aa9ec80e43257a9e3a487b46a33f99c999a940.tar.xz pokeyellow-b8aa9ec80e43257a9e3a487b46a33f99c999a940.zip | |
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/pokemontower7.asm')
| -rwxr-xr-x | data/mapObjects/pokemontower7.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/data/mapObjects/pokemontower7.asm b/data/mapObjects/pokemontower7.asm index 6ee1e8fd..9609253f 100755 --- a/data/mapObjects/pokemontower7.asm +++ b/data/mapObjects/pokemontower7.asm @@ -1,16 +1,16 @@ PokemonTower7Object: db $1 ; border block - db $1 ; warps - db $10, $9, $1, POKEMONTOWER_6 + db 1 ; warps + warp 9, 16, 1, POKEMONTOWER_6 - db $0 ; signs + db 0 ; signs db 4 ; objects - object SPRITE_ROCKET, $9, $b, STAY, RIGHT, $1, OPP_ROCKET, $13 - object SPRITE_ROCKET, $c, $9, STAY, LEFT, $2, OPP_ROCKET, $14 - object SPRITE_ROCKET, $9, $7, STAY, RIGHT, $3, OPP_ROCKET, $15 - object SPRITE_MR_FUJI, $a, $3, STAY, DOWN, $4 ; person + object SPRITE_ROCKET, 9, 11, STAY, RIGHT, 1, OPP_ROCKET, 19 + object SPRITE_ROCKET, 12, 9, STAY, LEFT, 2, OPP_ROCKET, 20 + object SPRITE_ROCKET, 9, 7, STAY, RIGHT, 3, OPP_ROCKET, 21 + object SPRITE_MR_FUJI, 10, 3, STAY, DOWN, 4 ; person ; warp-to - EVENT_DISP POKEMONTOWER_7_WIDTH, $10, $9 ; POKEMONTOWER_6 + warp_to 9, 16, POKEMONTOWER_7_WIDTH ; POKEMONTOWER_6 |