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/ViridianCity.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/ViridianCity.asm')
| -rwxr-xr-x | data/maps/objects/ViridianCity.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/maps/objects/ViridianCity.asm b/data/maps/objects/ViridianCity.asm index 540dadd6..9f7938e9 100755 --- a/data/maps/objects/ViridianCity.asm +++ b/data/maps/objects/ViridianCity.asm @@ -1,14 +1,14 @@ ViridianCity_Object: db $f ; border block - db 5 ; warps + def_warps warp 23, 25, 0, VIRIDIAN_POKECENTER warp 29, 19, 0, VIRIDIAN_MART warp 21, 15, 0, VIRIDIAN_SCHOOL_HOUSE warp 21, 9, 0, VIRIDIAN_NICKNAME_HOUSE warp 32, 7, 0, VIRIDIAN_GYM - db 6 ; signs + def_signs sign 17, 17, 8 ; ViridianCityText8 sign 19, 1, 9 ; ViridianCityText9 sign 21, 29, 10 ; ViridianCityText10 @@ -16,7 +16,7 @@ ViridianCity_Object: sign 24, 25, 12 ; PokeCenterSignText sign 27, 7, 13 ; ViridianCityText13 - db 7 ; objects + def_objects object SPRITE_YOUNGSTER, 13, 20, WALK, ANY_DIR, 1 ; person object SPRITE_GAMBLER, 30, 8, STAY, NONE, 2 ; person object SPRITE_YOUNGSTER, 30, 25, WALK, ANY_DIR, 3 ; person |