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/VermilionCity.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/VermilionCity.asm')
| -rwxr-xr-x | data/maps/objects/VermilionCity.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/maps/objects/VermilionCity.asm b/data/maps/objects/VermilionCity.asm index c23db7c6..7d39e369 100755 --- a/data/maps/objects/VermilionCity.asm +++ b/data/maps/objects/VermilionCity.asm @@ -1,7 +1,7 @@ VermilionCity_Object: db $43 ; border block - db 9 ; warps + def_warps warp 11, 3, 0, VERMILION_POKECENTER warp 9, 13, 0, POKEMON_FAN_CLUB warp 23, 13, 0, VERMILION_MART @@ -12,7 +12,7 @@ VermilionCity_Object: warp 15, 13, 0, VERMILION_TRADE_HOUSE warp 7, 3, 0, VERMILION_OLD_ROD_HOUSE - db 7 ; signs + def_signs sign 27, 3, 7 ; VermilionCityText7 sign 37, 13, 8 ; VermilionCityText8 sign 24, 13, 9 ; MartSignText @@ -21,7 +21,7 @@ VermilionCity_Object: sign 7, 19, 12 ; VermilionCityText12 sign 29, 15, 13 ; VermilionCityText13 - db 6 ; objects + def_objects object SPRITE_BEAUTY, 19, 7, WALK, LEFT_RIGHT, 1 ; person object SPRITE_GAMBLER, 14, 6, STAY, NONE, 2 ; person object SPRITE_SAILOR, 19, 30, STAY, UP, 3 ; person |