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/safarizonenorth.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/safarizonenorth.asm')
| -rwxr-xr-x | data/mapObjects/safarizonenorth.asm | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/data/mapObjects/safarizonenorth.asm b/data/mapObjects/safarizonenorth.asm index d0305507..421cd4e2 100755 --- a/data/mapObjects/safarizonenorth.asm +++ b/data/mapObjects/safarizonenorth.asm @@ -2,34 +2,34 @@ SafariZoneNorthObject: db $0 ; border block db $9 ; warps - db $23, $2, $0, SAFARI_ZONE_WEST - db $23, $3, $1, SAFARI_ZONE_WEST - db $23, $8, $2, SAFARI_ZONE_WEST - db $23, $9, $3, SAFARI_ZONE_WEST - db $23, $14, $4, SAFARI_ZONE_CENTER - db $23, $15, $5, SAFARI_ZONE_CENTER - db $1e, $27, $0, SAFARI_ZONE_EAST - db $1f, $27, $1, SAFARI_ZONE_EAST - db $3, $23, $0, SAFARI_ZONE_REST_HOUSE_4 + warp $2, $23, $0, SAFARI_ZONE_WEST + warp $3, $23, $1, SAFARI_ZONE_WEST + warp $8, $23, $2, SAFARI_ZONE_WEST + warp $9, $23, $3, SAFARI_ZONE_WEST + warp $14, $23, $4, SAFARI_ZONE_CENTER + warp $15, $23, $5, SAFARI_ZONE_CENTER + warp $27, $1e, $0, SAFARI_ZONE_EAST + warp $27, $1f, $1, SAFARI_ZONE_EAST + warp $23, $3, $0, SAFARI_ZONE_REST_HOUSE_4 db $5 ; signs - db $4, $24, $3 ; SafariZoneNorthText3 - db $19, $4, $4 ; SafariZoneNorthText4 - db $1f, $d, $5 ; SafariZoneNorthText5 - db $21, $13, $6 ; SafariZoneNorthText6 - db $1c, $1a, $7 ; SafariZoneNorthText7 + sign $24, $4, $3 ; SafariZoneNorthText3 + sign $4, $19, $4 ; SafariZoneNorthText4 + sign $d, $1f, $5 ; SafariZoneNorthText5 + sign $13, $21, $6 ; SafariZoneNorthText6 + sign $1a, $1c, $7 ; SafariZoneNorthText7 db $2 ; objects object SPRITE_BALL, $19, $1, STAY, NONE, $1, PROTEIN object SPRITE_BALL, $13, $7, STAY, NONE, $2, TM_40 ; warp-to - EVENT_DISP SAFARI_ZONE_NORTH_WIDTH, $23, $2 ; SAFARI_ZONE_WEST - EVENT_DISP SAFARI_ZONE_NORTH_WIDTH, $23, $3 ; SAFARI_ZONE_WEST - EVENT_DISP SAFARI_ZONE_NORTH_WIDTH, $23, $8 ; SAFARI_ZONE_WEST - EVENT_DISP SAFARI_ZONE_NORTH_WIDTH, $23, $9 ; SAFARI_ZONE_WEST - EVENT_DISP SAFARI_ZONE_NORTH_WIDTH, $23, $14 ; SAFARI_ZONE_CENTER - EVENT_DISP SAFARI_ZONE_NORTH_WIDTH, $23, $15 ; SAFARI_ZONE_CENTER - EVENT_DISP SAFARI_ZONE_NORTH_WIDTH, $1e, $27 ; SAFARI_ZONE_EAST - EVENT_DISP SAFARI_ZONE_NORTH_WIDTH, $1f, $27 ; SAFARI_ZONE_EAST - EVENT_DISP SAFARI_ZONE_NORTH_WIDTH, $3, $23 ; SAFARI_ZONE_REST_HOUSE_4 + warp_to $2, $23, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_WEST + warp_to $3, $23, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_WEST + warp_to $8, $23, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_WEST + warp_to $9, $23, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_WEST + warp_to $14, $23, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_CENTER + warp_to $15, $23, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_CENTER + warp_to $27, $1e, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_EAST + warp_to $27, $1f, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_EAST + warp_to $23, $3, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_REST_HOUSE_4 |