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/celadonprizeroom.asm | |
| parent | c84667c4df36918071bb7487c456d7adafb921ca (diff) | |
| parent | 819b6789099947e83b7e3f0b0e2f6d39cf901807 (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/celadonprizeroom.asm')
| -rwxr-xr-x | data/mapObjects/celadonprizeroom.asm | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/data/mapObjects/celadonprizeroom.asm b/data/mapObjects/celadonprizeroom.asm index c440bad5..bdaafe02 100755 --- a/data/mapObjects/celadonprizeroom.asm +++ b/data/mapObjects/celadonprizeroom.asm @@ -1,19 +1,19 @@ CeladonPrizeRoomObject: db $f ; border block - db $2 ; warps - db $7, $4, $9, $ff - db $7, $5, $9, $ff + db 2 ; warps + warp 4, 7, 9, -1 + warp 5, 7, 9, -1 - db $3 ; signs - db $2, $2, $3 ; CeladonPrizeRoomText3 - db $2, $4, $4 ; CeladonPrizeRoomText4 - db $2, $6, $5 ; CeladonPrizeRoomText5 + db 3 ; signs + sign 2, 2, 3 ; CeladonPrizeRoomText3 + sign 4, 2, 4 ; CeladonPrizeRoomText4 + sign 6, 2, 5 ; CeladonPrizeRoomText5 - db $2 ; objects - object SPRITE_BALDING_GUY, $1, $4, STAY, NONE, $1 ; person - object SPRITE_GAMBLER, $7, $3, WALK, $2, $2 ; person + db 2 ; objects + object SPRITE_BALDING_GUY, 1, 4, STAY, NONE, 1 ; person + object SPRITE_GAMBLER, 7, 3, WALK, 2, 2 ; person ; warp-to - EVENT_DISP CELADON_PRIZE_ROOM_WIDTH, $7, $4 - EVENT_DISP CELADON_PRIZE_ROOM_WIDTH, $7, $5 + warp_to 4, 7, CELADON_PRIZE_ROOM_WIDTH + warp_to 5, 7, CELADON_PRIZE_ROOM_WIDTH |