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/cinnabarisland.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/cinnabarisland.asm')
| -rwxr-xr-x | data/mapObjects/cinnabarisland.asm | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/data/mapObjects/cinnabarisland.asm b/data/mapObjects/cinnabarisland.asm index 05f4c06c..a66d6444 100755 --- a/data/mapObjects/cinnabarisland.asm +++ b/data/mapObjects/cinnabarisland.asm @@ -1,27 +1,27 @@ CinnabarIslandObject: db $43 ; border block - db $5 ; warps - db $3, $6, $1, MANSION_1 - db $3, $12, $0, CINNABAR_GYM - db $9, $6, $0, CINNABAR_LAB_1 - db $b, $b, $0, CINNABAR_POKECENTER - db $b, $f, $0, CINNABAR_MART + db 5 ; warps + warp 6, 3, 1, MANSION_1 + warp 18, 3, 0, CINNABAR_GYM + warp 6, 9, 0, CINNABAR_LAB_1 + warp 11, 11, 0, CINNABAR_POKECENTER + warp 15, 11, 0, CINNABAR_MART - db $5 ; signs - db $5, $9, $3 ; CinnabarIslandText3 - db $b, $10, $4 ; MartSignText - db $b, $c, $5 ; PokeCenterSignText - db $b, $9, $6 ; CinnabarIslandText6 - db $3, $d, $7 ; CinnabarIslandText7 + db 5 ; signs + sign 9, 5, 3 ; CinnabarIslandText3 + sign 16, 11, 4 ; MartSignText + sign 12, 11, 5 ; PokeCenterSignText + sign 9, 11, 6 ; CinnabarIslandText6 + sign 13, 3, 7 ; CinnabarIslandText7 - db $2 ; objects - object SPRITE_GIRL, $c, $5, WALK, $2, $1 ; person - object SPRITE_GAMBLER, $e, $6, STAY, NONE, $2 ; person + db 2 ; objects + object SPRITE_GIRL, 12, 5, WALK, 2, 1 ; person + object SPRITE_GAMBLER, 14, 6, STAY, NONE, 2 ; person ; warp-to - EVENT_DISP CINNABAR_ISLAND_WIDTH, $3, $6 ; MANSION_1 - EVENT_DISP CINNABAR_ISLAND_WIDTH, $3, $12 ; CINNABAR_GYM - EVENT_DISP CINNABAR_ISLAND_WIDTH, $9, $6 ; CINNABAR_LAB_1 - EVENT_DISP CINNABAR_ISLAND_WIDTH, $b, $b ; CINNABAR_POKECENTER - EVENT_DISP CINNABAR_ISLAND_WIDTH, $b, $f ; CINNABAR_MART + warp_to 6, 3, CINNABAR_ISLAND_WIDTH ; MANSION_1 + warp_to 18, 3, CINNABAR_ISLAND_WIDTH ; CINNABAR_GYM + warp_to 6, 9, CINNABAR_ISLAND_WIDTH ; CINNABAR_LAB_1 + warp_to 11, 11, CINNABAR_ISLAND_WIDTH ; CINNABAR_POKECENTER + warp_to 15, 11, CINNABAR_ISLAND_WIDTH ; CINNABAR_MART |