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/copycatshouse2f.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/copycatshouse2f.asm')
| -rwxr-xr-x | data/mapObjects/copycatshouse2f.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/data/mapObjects/copycatshouse2f.asm b/data/mapObjects/copycatshouse2f.asm index 0d53965a..5d2de9ef 100755 --- a/data/mapObjects/copycatshouse2f.asm +++ b/data/mapObjects/copycatshouse2f.asm @@ -2,11 +2,11 @@ CopycatsHouse2FObject: db $a ; border block db $1 ; warps - db $1, $7, $2, COPYCATS_HOUSE_1F + warp $7, $1, $2, COPYCATS_HOUSE_1F db $2 ; signs - db $5, $3, $6 ; CopycatsHouse2FText6 - db $1, $0, $7 ; CopycatsHouse2FText7 + sign $3, $5, $6 ; CopycatsHouse2FText6 + sign $0, $1, $7 ; CopycatsHouse2FText7 db $5 ; objects object SPRITE_BRUNETTE_GIRL, $4, $3, WALK, $0, $1 ; person @@ -16,4 +16,4 @@ CopycatsHouse2FObject: object SPRITE_CLEFAIRY, $1, $6, STAY, RIGHT, $5 ; person ; warp-to - EVENT_DISP COPYCATS_HOUSE_2F_WIDTH, $1, $7 ; COPYCATS_HOUSE_1F + warp_to $7, $1, COPYCATS_HOUSE_2F_WIDTH ; COPYCATS_HOUSE_1F |