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/fuchsiameetingroom.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/fuchsiameetingroom.asm')
| -rwxr-xr-x | data/mapObjects/fuchsiameetingroom.asm | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/data/mapObjects/fuchsiameetingroom.asm b/data/mapObjects/fuchsiameetingroom.asm index 8106b9ec..c6c10415 100755 --- a/data/mapObjects/fuchsiameetingroom.asm +++ b/data/mapObjects/fuchsiameetingroom.asm @@ -1,17 +1,17 @@ FuchsiaMeetingRoomObject: db $17 ; border block - db $2 ; warps - db $7, $4, $6, $ff - db $7, $5, $6, $ff + db 2 ; warps + warp 4, 7, 6, -1 + warp 5, 7, 6, -1 - db $0 ; signs + db 0 ; signs - db $3 ; objects - object SPRITE_WHITE_PLAYER, $4, $1, STAY, DOWN, $1 ; person - object SPRITE_WHITE_PLAYER, $0, $2, STAY, UP, $2 ; person - object SPRITE_WHITE_PLAYER, $a, $1, STAY, DOWN, $3 ; person + db 3 ; objects + object SPRITE_WHITE_PLAYER, 4, 1, STAY, DOWN, 1 ; person + object SPRITE_WHITE_PLAYER, 0, 2, STAY, UP, 2 ; person + object SPRITE_WHITE_PLAYER, 10, 1, STAY, DOWN, 3 ; person ; warp-to - EVENT_DISP FUCHSIA_MEETING_ROOM_WIDTH, $7, $4 - EVENT_DISP FUCHSIA_MEETING_ROOM_WIDTH, $7, $5 + warp_to 4, 7, FUCHSIA_MEETING_ROOM_WIDTH + warp_to 5, 7, FUCHSIA_MEETING_ROOM_WIDTH |