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/LavenderTown.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/LavenderTown.asm')
| -rwxr-xr-x | data/maps/objects/LavenderTown.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/maps/objects/LavenderTown.asm b/data/maps/objects/LavenderTown.asm index 46fcaec5..16f881d8 100755 --- a/data/maps/objects/LavenderTown.asm +++ b/data/maps/objects/LavenderTown.asm @@ -1,7 +1,7 @@ LavenderTown_Object: db $2c ; border block - db 6 ; warps + def_warps warp 3, 5, 0, LAVENDER_POKECENTER warp 14, 5, 0, POKEMON_TOWER_1F warp 7, 9, 0, MR_FUJIS_HOUSE @@ -9,7 +9,7 @@ LavenderTown_Object: warp 3, 13, 0, LAVENDER_CUBONE_HOUSE warp 7, 13, 0, NAME_RATERS_HOUSE - db 6 ; signs + def_signs sign 11, 9, 4 ; LavenderTownText4 sign 9, 3, 5 ; LavenderTownText5 sign 16, 13, 6 ; MartSignText @@ -17,7 +17,7 @@ LavenderTown_Object: sign 5, 9, 8 ; LavenderTownText8 sign 17, 7, 9 ; LavenderTownText9 - db 3 ; objects + def_objects object SPRITE_LITTLE_GIRL, 15, 9, WALK, ANY_DIR, 1 ; person object SPRITE_COOLTRAINER_M, 9, 10, STAY, NONE, 2 ; person object SPRITE_SUPER_NERD, 8, 7, WALK, LEFT_RIGHT, 3 ; person |