aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/SaffronCity.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/SaffronCity.asm')
-rwxr-xr-xdata/maps/objects/SaffronCity.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/data/maps/objects/SaffronCity.asm b/data/maps/objects/SaffronCity.asm
index 4dcc7a71..48329891 100755
--- a/data/maps/objects/SaffronCity.asm
+++ b/data/maps/objects/SaffronCity.asm
@@ -1,7 +1,7 @@
SaffronCity_Object:
db $f ; border block
- db 8 ; warps
+ def_warps
warp 7, 5, 0, COPYCATS_HOUSE_1F
warp 26, 3, 0, FIGHTING_DOJO
warp 34, 3, 0, SAFFRON_GYM
@@ -11,7 +11,7 @@ SaffronCity_Object:
warp 9, 29, 0, SAFFRON_POKECENTER
warp 29, 29, 0, MR_PSYCHICS_HOUSE
- db 10 ; signs
+ def_signs
sign 17, 5, 16 ; SaffronCityText16
sign 27, 5, 17 ; SaffronCityText17
sign 35, 5, 18 ; SaffronCityText18
@@ -23,7 +23,7 @@ SaffronCity_Object:
sign 27, 29, 24 ; SaffronCityText24
sign 1, 19, 25 ; SaffronCityText25
- db 15 ; objects
+ def_objects
object SPRITE_ROCKET, 7, 6, STAY, NONE, 1 ; person
object SPRITE_ROCKET, 20, 8, WALK, LEFT_RIGHT, 2 ; person
object SPRITE_ROCKET, 34, 4, STAY, NONE, 3 ; person