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/ssanne7.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/ssanne7.asm')
| -rwxr-xr-x | data/mapObjects/ssanne7.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/data/mapObjects/ssanne7.asm b/data/mapObjects/ssanne7.asm index 6002e85b..7657170e 100755 --- a/data/mapObjects/ssanne7.asm +++ b/data/mapObjects/ssanne7.asm @@ -1,15 +1,15 @@ SSAnne7Object: db $c ; border block - db $1 ; warps - db $7, $0, $8, SS_ANNE_2 + db 1 ; warps + warp 0, 7, 8, SS_ANNE_2 - db $2 ; signs - db $1, $4, $2 ; SSAnne7Text2 - db $2, $1, $3 ; SSAnne7Text3 + db 2 ; signs + sign 4, 1, 2 ; SSAnne7Text2 + sign 1, 2, 3 ; SSAnne7Text3 - db $1 ; objects - object SPRITE_SS_CAPTAIN, $4, $2, STAY, UP, $1 ; person + db 1 ; objects + object SPRITE_SS_CAPTAIN, 4, 2, STAY, UP, 1 ; person ; warp-to - EVENT_DISP SS_ANNE_7_WIDTH, $7, $0 ; SS_ANNE_2 + warp_to 0, 7, SS_ANNE_7_WIDTH ; SS_ANNE_2 |