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/museum1f.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/museum1f.asm')
| -rwxr-xr-x | data/mapObjects/museum1f.asm | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/data/mapObjects/museum1f.asm b/data/mapObjects/museum1f.asm index 56932af8..3034dc74 100755 --- a/data/mapObjects/museum1f.asm +++ b/data/mapObjects/museum1f.asm @@ -1,25 +1,25 @@ Museum1FObject: db $a ; border block - db $5 ; warps - db $7, $a, $0, $ff - db $7, $b, $0, $ff - db $7, $10, $1, $ff - db $7, $11, $1, $ff - db $7, $7, $0, MUSEUM_2F + db 5 ; warps + warp 10, 7, 0, -1 + warp 11, 7, 0, -1 + warp 16, 7, 1, -1 + warp 17, 7, 1, -1 + warp 7, 7, 0, MUSEUM_2F - db $0 ; signs + db 0 ; signs - db $5 ; objects - object SPRITE_OAK_AIDE, $c, $4, STAY, LEFT, $1 ; person - object SPRITE_GAMBLER, $1, $4, STAY, NONE, $2 ; person - object SPRITE_OAK_AIDE, $f, $2, STAY, DOWN, $3 ; person - object SPRITE_OAK_AIDE, $11, $4, STAY, NONE, $4 ; person - object SPRITE_OLD_AMBER, $10, $2, STAY, NONE, $5 ; person + db 5 ; objects + object SPRITE_OAK_AIDE, 12, 4, STAY, LEFT, 1 ; person + object SPRITE_GAMBLER, 1, 4, STAY, NONE, 2 ; person + object SPRITE_OAK_AIDE, 15, 2, STAY, DOWN, 3 ; person + object SPRITE_OAK_AIDE, 17, 4, STAY, NONE, 4 ; person + object SPRITE_OLD_AMBER, 16, 2, STAY, NONE, 5 ; person ; warp-to - EVENT_DISP MUSEUM_1F_WIDTH, $7, $a - EVENT_DISP MUSEUM_1F_WIDTH, $7, $b - EVENT_DISP MUSEUM_1F_WIDTH, $7, $10 - EVENT_DISP MUSEUM_1F_WIDTH, $7, $11 - EVENT_DISP MUSEUM_1F_WIDTH, $7, $7 ; MUSEUM_2F + warp_to 10, 7, MUSEUM_1F_WIDTH + warp_to 11, 7, MUSEUM_1F_WIDTH + warp_to 16, 7, MUSEUM_1F_WIDTH + warp_to 17, 7, MUSEUM_1F_WIDTH + warp_to 7, 7, MUSEUM_1F_WIDTH ; MUSEUM_2F |