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/route22.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/route22.asm')
| -rwxr-xr-x | data/mapObjects/route22.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/data/mapObjects/route22.asm b/data/mapObjects/route22.asm index ef568ae8..e91eb792 100755 --- a/data/mapObjects/route22.asm +++ b/data/mapObjects/route22.asm @@ -1,15 +1,15 @@ Route22Object: db $2c ; border block - db $1 ; warps - db $5, $8, $0, ROUTE_22_GATE + db 1 ; warps + warp 8, 5, 0, ROUTE_22_GATE - db $1 ; signs - db $b, $7, $3 ; Route22FrontGateText + db 1 ; signs + sign 7, 11, 3 ; Route22FrontGateText - db $2 ; objects - object SPRITE_BLUE, $19, $5, STAY, NONE, $1 ; person - object SPRITE_BLUE, $19, $5, STAY, NONE, $2 ; person + db 2 ; objects + object SPRITE_BLUE, 25, 5, STAY, NONE, 1 ; person + object SPRITE_BLUE, 25, 5, STAY, NONE, 2 ; person ; warp-to - EVENT_DISP ROUTE_22_WIDTH, $5, $8 ; ROUTE_22_GATE + warp_to 8, 5, ROUTE_22_WIDTH ; ROUTE_22_GATE |