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/route1.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/route1.asm')
| -rwxr-xr-x | data/mapObjects/route1.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/data/mapObjects/route1.asm b/data/mapObjects/route1.asm index 0e6237e7..26505ea6 100755 --- a/data/mapObjects/route1.asm +++ b/data/mapObjects/route1.asm @@ -1,14 +1,14 @@ Route1Object: db $b ; border block - db $0 ; warps + db 0 ; warps - db $1 ; signs - db $1b, $9, $3 ; Route1Text3 + db 1 ; signs + sign 9, 27, 3 ; Route1Text3 - db $2 ; objects - object SPRITE_BUG_CATCHER, $5, $18, WALK, $1, $1 ; person - object SPRITE_BUG_CATCHER, $f, $d, WALK, $2, $2 ; person + db 2 ; objects + object SPRITE_BUG_CATCHER, 5, 24, WALK, 1, 1 ; person + object SPRITE_BUG_CATCHER, 15, 13, WALK, 2, 2 ; person ; warp-to (unused) - EVENT_DISP $4, $7, $2 + warp_to 2, 7, 4 |