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/museum2f.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/museum2f.asm')
| -rwxr-xr-x | data/mapObjects/museum2f.asm | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/data/mapObjects/museum2f.asm b/data/mapObjects/museum2f.asm index 689391d9..11fad941 100755 --- a/data/mapObjects/museum2f.asm +++ b/data/mapObjects/museum2f.asm @@ -1,19 +1,19 @@ Museum2FObject: db $a ; border block - db $1 ; warps - db $7, $7, $4, MUSEUM_1F + db 1 ; warps + warp 7, 7, 4, MUSEUM_1F - db $2 ; signs - db $2, $b, $6 ; Museum2FText6 - db $5, $2, $7 ; Museum2FText7 + db 2 ; signs + sign 11, 2, 6 ; Museum2FText6 + sign 2, 5, 7 ; Museum2FText7 - db $5 ; objects - object SPRITE_BUG_CATCHER, $1, $7, WALK, $2, $1 ; person - object SPRITE_OLD_PERSON, $0, $5, STAY, DOWN, $2 ; person - object SPRITE_OAK_AIDE, $7, $5, STAY, DOWN, $3 ; person - object SPRITE_BRUNETTE_GIRL, $b, $5, STAY, NONE, $4 ; person - object SPRITE_HIKER, $c, $5, STAY, DOWN, $5 ; person + db 5 ; objects + object SPRITE_BUG_CATCHER, 1, 7, WALK, 2, 1 ; person + object SPRITE_OLD_PERSON, 0, 5, STAY, DOWN, 2 ; person + object SPRITE_OAK_AIDE, 7, 5, STAY, DOWN, 3 ; person + object SPRITE_BRUNETTE_GIRL, 11, 5, STAY, NONE, 4 ; person + object SPRITE_HIKER, 12, 5, STAY, DOWN, 5 ; person ; warp-to - EVENT_DISP MUSEUM_2F_WIDTH, $7, $7 ; MUSEUM_1F + warp_to 7, 7, MUSEUM_2F_WIDTH ; MUSEUM_1F |