summaryrefslogtreecommitdiff
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.asm18
1 files changed, 9 insertions, 9 deletions
diff --git a/data/maps/objects/SaffronCity.asm b/data/maps/objects/SaffronCity.asm
index 04e75c31..f69b3333 100755
--- a/data/maps/objects/SaffronCity.asm
+++ b/data/maps/objects/SaffronCity.asm
@@ -2,26 +2,26 @@ SaffronCity_Object:
db $f ; border block
def_warps
- warp 7, 5, 0, COPYCATS_HOUSE_1F
- warp 26, 3, 0, FIGHTING_DOJO
- warp 34, 3, 0, SAFFRON_GYM
+ warp 7, 5, 0, COPYCATS_HOUSE_1F
+ warp 26, 3, 0, FIGHTING_DOJO
+ warp 34, 3, 0, SAFFRON_GYM
warp 13, 11, 0, SAFFRON_PIDGEY_HOUSE
warp 25, 11, 0, SAFFRON_MART
warp 18, 21, 0, SILPH_CO_1F
- warp 9, 29, 0, SAFFRON_POKECENTER
+ warp 9, 29, 0, SAFFRON_POKECENTER
warp 29, 29, 0, MR_PSYCHICS_HOUSE
def_signs
- sign 17, 5, 16 ; SaffronCityText16
- sign 27, 5, 17 ; SaffronCityText17
- sign 35, 5, 18 ; SaffronCityText18
+ sign 17, 5, 16 ; SaffronCityText16
+ sign 27, 5, 17 ; SaffronCityText17
+ sign 35, 5, 18 ; SaffronCityText18
sign 26, 11, 19 ; MartSignText
sign 39, 19, 20 ; SaffronCityText20
- sign 5, 21, 21 ; SaffronCityText21
+ sign 5, 21, 21 ; SaffronCityText21
sign 15, 21, 22 ; SaffronCityText22
sign 10, 29, 23 ; PokeCenterSignText
sign 27, 29, 24 ; SaffronCityText24
- sign 1, 19, 25 ; SaffronCityText25
+ sign 1, 19, 25 ; SaffronCityText25
def_objects
object SPRITE_ROCKET, 7, 6, STAY, NONE, 1 ; person