diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-08-17 16:54:59 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-08-17 16:54:59 -0400 |
| commit | e2c99f19103856426966e30cf1910d07995bb936 (patch) | |
| tree | 513ecaba5794061a71ffcc9dbff5b3d426eade21 /data/maps/objects/CeladonMart3F.asm | |
| parent | Use ANY_DIR, UP_DOWN, and LEFT_RIGHT for map objects (diff) | |
| download | pokeyellow-e2c99f19103856426966e30cf1910d07995bb936.tar.gz pokeyellow-e2c99f19103856426966e30cf1910d07995bb936.tar.xz pokeyellow-e2c99f19103856426966e30cf1910d07995bb936.zip | |
Use def_* macros for automatic map event counts
Diffstat (limited to 'data/maps/objects/CeladonMart3F.asm')
| -rwxr-xr-x | data/maps/objects/CeladonMart3F.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/maps/objects/CeladonMart3F.asm b/data/maps/objects/CeladonMart3F.asm index 04a4c2f0..4eb7bfe0 100755 --- a/data/maps/objects/CeladonMart3F.asm +++ b/data/maps/objects/CeladonMart3F.asm @@ -1,12 +1,12 @@ CeladonMart3F_Object: db $f ; border block - db 3 ; warps + def_warps warp 12, 1, 0, CELADON_MART_4F warp 16, 1, 1, CELADON_MART_2F warp 1, 1, 0, CELADON_MART_ELEVATOR - db 12 ; signs + def_signs sign 2, 4, 6 ; CeladonMart3Text6 sign 3, 4, 7 ; CeladonMart3Text7 sign 5, 4, 8 ; CeladonMart3Text8 @@ -20,7 +20,7 @@ CeladonMart3F_Object: sign 6, 1, 16 ; CeladonMart3Text16 sign 10, 1, 17 ; CeladonMart3Text17 - db 5 ; objects + def_objects object SPRITE_CLERK, 16, 5, STAY, NONE, 1 ; person object SPRITE_GAMEBOY_KID, 11, 6, STAY, RIGHT, 2 ; person object SPRITE_GAMEBOY_KID, 7, 2, STAY, DOWN, 3 ; person |