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/celadonmansion2.asm | |
| parent | Add pokegold and pokefirered. (diff) | |
| parent | INCBIN don't start with tabs (diff) | |
| download | pokeyellow-b8aa9ec80e43257a9e3a487b46a33f99c999a940.tar.gz pokeyellow-b8aa9ec80e43257a9e3a487b46a33f99c999a940.tar.xz pokeyellow-b8aa9ec80e43257a9e3a487b46a33f99c999a940.zip | |
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/celadonmansion2.asm')
| -rwxr-xr-x | data/mapObjects/celadonmansion2.asm | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/data/mapObjects/celadonmansion2.asm b/data/mapObjects/celadonmansion2.asm index 883cae36..f2b96d89 100755 --- a/data/mapObjects/celadonmansion2.asm +++ b/data/mapObjects/celadonmansion2.asm @@ -1,19 +1,19 @@ CeladonMansion2Object: db $f ; border block - db $4 ; warps - db $1, $6, $0, CELADON_MANSION_3 - db $1, $7, $3, CELADON_MANSION_1 - db $1, $2, $4, CELADON_MANSION_1 - db $1, $4, $3, CELADON_MANSION_3 + db 4 ; warps + warp 6, 1, 0, CELADON_MANSION_3 + warp 7, 1, 3, CELADON_MANSION_1 + warp 2, 1, 4, CELADON_MANSION_1 + warp 4, 1, 3, CELADON_MANSION_3 - db $1 ; signs - db $9, $4, $1 ; CeladonMansion2Text1 + db 1 ; signs + sign 4, 9, 1 ; CeladonMansion2Text1 - db $0 ; objects + db 0 ; objects ; warp-to - EVENT_DISP CELADON_MANSION_2_WIDTH, $1, $6 ; CELADON_MANSION_3 - EVENT_DISP CELADON_MANSION_2_WIDTH, $1, $7 ; CELADON_MANSION_1 - EVENT_DISP CELADON_MANSION_2_WIDTH, $1, $2 ; CELADON_MANSION_1 - EVENT_DISP CELADON_MANSION_2_WIDTH, $1, $4 ; CELADON_MANSION_3 + warp_to 6, 1, CELADON_MANSION_2_WIDTH ; CELADON_MANSION_3 + warp_to 7, 1, CELADON_MANSION_2_WIDTH ; CELADON_MANSION_1 + warp_to 2, 1, CELADON_MANSION_2_WIDTH ; CELADON_MANSION_1 + warp_to 4, 1, CELADON_MANSION_2_WIDTH ; CELADON_MANSION_3 |