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/redshouse2f.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/redshouse2f.asm')
| -rwxr-xr-x | data/mapObjects/redshouse2f.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/data/mapObjects/redshouse2f.asm b/data/mapObjects/redshouse2f.asm index ebd57e59..af3c4b6b 100755 --- a/data/mapObjects/redshouse2f.asm +++ b/data/mapObjects/redshouse2f.asm @@ -1,12 +1,12 @@ RedsHouse2FObject: - db $0A ; border block + db $a ; border block - db $1 ; warps - db $1, $7, $2, REDS_HOUSE_1F + db 1 ; warps + warp 7, 1, 2, REDS_HOUSE_1F - db $0 ; signs + db 0 ; signs - db $0 ; objects + db 0 ; objects ; warp-to - EVENT_DISP REDS_HOUSE_2F_WIDTH, $1, $7 + warp_to 7, 1, REDS_HOUSE_2F_WIDTH |