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/route16gateupstairs.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/route16gateupstairs.asm')
| -rwxr-xr-x | data/mapObjects/route16gateupstairs.asm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/data/mapObjects/route16gateupstairs.asm b/data/mapObjects/route16gateupstairs.asm index 9119bf5e..41487e6e 100755 --- a/data/mapObjects/route16gateupstairs.asm +++ b/data/mapObjects/route16gateupstairs.asm @@ -1,16 +1,16 @@ Route16GateUpstairsObject: db $a ; border block - db $1 ; warps - db $7, $7, $8, ROUTE_16_GATE_1F + db 1 ; warps + warp 7, 7, 8, ROUTE_16_GATE_1F - db $2 ; signs - db $2, $1, $3 ; Route16GateUpstairsText3 - db $2, $6, $4 ; Route16GateUpstairsText4 + db 2 ; signs + sign 1, 2, 3 ; Route16GateUpstairsText3 + sign 6, 2, 4 ; Route16GateUpstairsText4 - db $2 ; objects - object SPRITE_YOUNG_BOY, $4, $2, STAY, NONE, $1 ; person - object SPRITE_LITTLE_GIRL, $2, $5, WALK, $2, $2 ; person + db 2 ; objects + object SPRITE_YOUNG_BOY, 4, 2, STAY, NONE, 1 ; person + object SPRITE_LITTLE_GIRL, 2, 5, WALK, 2, 2 ; person ; warp-to - EVENT_DISP ROUTE_16_GATE_2F_WIDTH, $7, $7 ; ROUTE_16_GATE_1F + warp_to 7, 7, ROUTE_16_GATE_2F_WIDTH ; ROUTE_16_GATE_1F |