diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-29 02:31:32 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-29 02:31:32 -0500 |
| commit | d271d6917549074e721f3e5064b77e1ad1dbe44a (patch) | |
| tree | cee0f1b9a44aa7394dbf36ee3ad3654dde08df06 /data/mapObjects/cinnabarisland.asm | |
| parent | Add pokegold and pokefirered. (diff) | |
| download | pokeyellow-d271d6917549074e721f3e5064b77e1ad1dbe44a.tar.gz pokeyellow-d271d6917549074e721f3e5064b77e1ad1dbe44a.tar.xz pokeyellow-d271d6917549074e721f3e5064b77e1ad1dbe44a.zip | |
Add warp, sign, and warp_to macros for data/mapObjects definitions
Diffstat (limited to 'data/mapObjects/cinnabarisland.asm')
| -rwxr-xr-x | data/mapObjects/cinnabarisland.asm | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/data/mapObjects/cinnabarisland.asm b/data/mapObjects/cinnabarisland.asm index 05f4c06c..27a425f2 100755 --- a/data/mapObjects/cinnabarisland.asm +++ b/data/mapObjects/cinnabarisland.asm @@ -2,26 +2,26 @@ 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 + warp $6, $3, $1, MANSION_1 + warp $12, $3, $0, CINNABAR_GYM + warp $6, $9, $0, CINNABAR_LAB_1 + warp $b, $b, $0, CINNABAR_POKECENTER + warp $f, $b, $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 + sign $9, $5, $3 ; CinnabarIslandText3 + sign $10, $b, $4 ; MartSignText + sign $c, $b, $5 ; PokeCenterSignText + sign $9, $b, $6 ; CinnabarIslandText6 + sign $d, $3, $7 ; CinnabarIslandText7 db $2 ; objects object SPRITE_GIRL, $c, $5, WALK, $2, $1 ; person object SPRITE_GAMBLER, $e, $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 $12, $3, CINNABAR_ISLAND_WIDTH ; CINNABAR_GYM + warp_to $6, $9, CINNABAR_ISLAND_WIDTH ; CINNABAR_LAB_1 + warp_to $b, $b, CINNABAR_ISLAND_WIDTH ; CINNABAR_POKECENTER + warp_to $f, $b, CINNABAR_ISLAND_WIDTH ; CINNABAR_MART |