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/PewterCity.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/PewterCity.asm')
| -rwxr-xr-x | data/maps/objects/PewterCity.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/maps/objects/PewterCity.asm b/data/maps/objects/PewterCity.asm index 804ded7f..74e1aff7 100755 --- a/data/maps/objects/PewterCity.asm +++ b/data/maps/objects/PewterCity.asm @@ -1,7 +1,7 @@ PewterCity_Object: db $a ; border block - db 7 ; warps + def_warps warp 14, 7, 0, MUSEUM_1F warp 19, 5, 2, MUSEUM_1F warp 16, 17, 0, PEWTER_GYM @@ -10,7 +10,7 @@ PewterCity_Object: warp 7, 29, 0, PEWTER_SPEECH_HOUSE warp 13, 25, 0, PEWTER_POKECENTER - db 7 ; signs + def_signs sign 19, 29, 6 ; PewterCityText6 sign 33, 19, 7 ; PewterCityText7 sign 24, 17, 8 ; MartSignText @@ -19,7 +19,7 @@ PewterCity_Object: sign 11, 17, 11 ; PewterCityText11 sign 25, 23, 12 ; PewterCityText12 - db 5 ; objects + def_objects object SPRITE_COOLTRAINER_F, 8, 15, STAY, NONE, 1 ; person object SPRITE_COOLTRAINER_M, 17, 25, STAY, NONE, 2 ; person object SPRITE_SUPER_NERD, 27, 17, STAY, NONE, 3 ; person |