summaryrefslogtreecommitdiff
path: root/data/mapObjects/route2house.asm
diff options
context:
space:
mode:
authorDaniel Harding <33dannye@gmail.com>2018-02-05 10:57:14 -0600
committerGitHub <noreply@github.com>2018-02-05 10:57:14 -0600
commitb8aa9ec80e43257a9e3a487b46a33f99c999a940 (patch)
tree3813e75239070dbb3d549e8c03297cc28b2551e3 /data/mapObjects/route2house.asm
parentc84667c4df36918071bb7487c456d7adafb921ca (diff)
parent819b6789099947e83b7e3f0b0e2f6d39cf901807 (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/route2house.asm')
-rwxr-xr-xdata/mapObjects/route2house.asm18
1 files changed, 9 insertions, 9 deletions
diff --git a/data/mapObjects/route2house.asm b/data/mapObjects/route2house.asm
index d6665020..b27b65ef 100755
--- a/data/mapObjects/route2house.asm
+++ b/data/mapObjects/route2house.asm
@@ -1,16 +1,16 @@
Route2HouseObject:
db $a ; border block
- db $2 ; warps
- db $7, $2, $2, $ff
- db $7, $3, $2, $ff
+ db 2 ; warps
+ warp 2, 7, 2, -1
+ warp 3, 7, 2, -1
- db $0 ; signs
+ db 0 ; signs
- db $2 ; objects
- object SPRITE_OAK_AIDE, $2, $4, STAY, RIGHT, $1 ; person
- object SPRITE_GAMEBOY_KID_COPY, $4, $1, STAY, DOWN, $2 ; person
+ db 2 ; objects
+ object SPRITE_OAK_AIDE, 2, 4, STAY, RIGHT, 1 ; person
+ object SPRITE_GAMEBOY_KID_COPY, 4, 1, STAY, DOWN, 2 ; person
; warp-to
- EVENT_DISP ROUTE_2_HOUSE_WIDTH, $7, $2
- EVENT_DISP ROUTE_2_HOUSE_WIDTH, $7, $3
+ warp_to 2, 7, ROUTE_2_HOUSE_WIDTH
+ warp_to 3, 7, ROUTE_2_HOUSE_WIDTH