aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/SaffronCity.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2021-10-05 21:02:42 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2021-10-05 21:02:42 -0400
commitfc899e1906a9a245e94dafa7c0da2ef1697b7335 (patch)
tree2e8694dca33f7b1c3eae1d878b8112c0ff07537f /data/maps/objects/SaffronCity.asm
parentClean up some redundant or unusual event comments (diff)
downloadpokeyellow-fc899e1906a9a245e94dafa7c0da2ef1697b7335.tar.gz
pokeyellow-fc899e1906a9a245e94dafa7c0da2ef1697b7335.tar.xz
pokeyellow-fc899e1906a9a245e94dafa7c0da2ef1697b7335.zip
`warp_event` warp IDs start at 1, like in pokegold/pokecrystal
Diffstat (limited to 'data/maps/objects/SaffronCity.asm')
-rw-r--r--data/maps/objects/SaffronCity.asm16
1 files changed, 8 insertions, 8 deletions
diff --git a/data/maps/objects/SaffronCity.asm b/data/maps/objects/SaffronCity.asm
index 4c11417a..2fddfd5e 100644
--- a/data/maps/objects/SaffronCity.asm
+++ b/data/maps/objects/SaffronCity.asm
@@ -2,14 +2,14 @@ SaffronCity_Object:
db $f ; border block
def_warp_events
- warp_event 7, 5, COPYCATS_HOUSE_1F, 0
- warp_event 26, 3, FIGHTING_DOJO, 0
- warp_event 34, 3, SAFFRON_GYM, 0
- warp_event 13, 11, SAFFRON_PIDGEY_HOUSE, 0
- warp_event 25, 11, SAFFRON_MART, 0
- warp_event 18, 21, SILPH_CO_1F, 0
- warp_event 9, 29, SAFFRON_POKECENTER, 0
- warp_event 29, 29, MR_PSYCHICS_HOUSE, 0
+ warp_event 7, 5, COPYCATS_HOUSE_1F, 1
+ warp_event 26, 3, FIGHTING_DOJO, 1
+ warp_event 34, 3, SAFFRON_GYM, 1
+ warp_event 13, 11, SAFFRON_PIDGEY_HOUSE, 1
+ warp_event 25, 11, SAFFRON_MART, 1
+ warp_event 18, 21, SILPH_CO_1F, 1
+ warp_event 9, 29, SAFFRON_POKECENTER, 1
+ warp_event 29, 29, MR_PSYCHICS_HOUSE, 1
def_bg_events
bg_event 17, 5, 16 ; SaffronCityText16