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/pokemontower1.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/pokemontower1.asm')
| -rwxr-xr-x | data/mapObjects/pokemontower1.asm | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/data/mapObjects/pokemontower1.asm b/data/mapObjects/pokemontower1.asm index 54af9efc..f15299da 100755 --- a/data/mapObjects/pokemontower1.asm +++ b/data/mapObjects/pokemontower1.asm @@ -1,21 +1,21 @@ PokemonTower1Object: db $1 ; border block - db $3 ; warps - db $11, $a, $1, $ff - db $11, $b, $1, $ff - db $9, $12, $1, POKEMONTOWER_2 + db 3 ; warps + warp 10, 17, 1, -1 + warp 11, 17, 1, -1 + warp 18, 9, 1, POKEMONTOWER_2 - db $0 ; signs + db 0 ; signs - db $5 ; objects - object SPRITE_CABLE_CLUB_WOMAN, $f, $d, STAY, UP, $1 ; person - object SPRITE_MOM_GEISHA, $6, $8, STAY, NONE, $2 ; person - object SPRITE_BALDING_GUY, $8, $c, STAY, NONE, $3 ; person - object SPRITE_GIRL, $d, $7, STAY, NONE, $4 ; person - object SPRITE_MEDIUM, $11, $7, STAY, LEFT, $5 ; person + db 5 ; objects + object SPRITE_CABLE_CLUB_WOMAN, 15, 13, STAY, UP, 1 ; person + object SPRITE_MOM_GEISHA, 6, 8, STAY, NONE, 2 ; person + object SPRITE_BALDING_GUY, 8, 12, STAY, NONE, 3 ; person + object SPRITE_GIRL, 13, 7, STAY, NONE, 4 ; person + object SPRITE_MEDIUM, 17, 7, STAY, LEFT, 5 ; person ; warp-to - EVENT_DISP POKEMONTOWER_1_WIDTH, $11, $a - EVENT_DISP POKEMONTOWER_1_WIDTH, $11, $b - EVENT_DISP POKEMONTOWER_1_WIDTH, $9, $12 ; POKEMONTOWER_2 + warp_to 10, 17, POKEMONTOWER_1_WIDTH + warp_to 11, 17, POKEMONTOWER_1_WIDTH + warp_to 18, 9, POKEMONTOWER_1_WIDTH ; POKEMONTOWER_2 |