aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/CeruleanCity.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2021-10-05 21:20:41 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2021-10-05 21:20:41 -0400
commit0fdefbc9602f0e6f14f723c89d42673e974181e3 (patch)
tree21f39edfd76ee08ff00a22a6337ffd48c6eff47f /data/maps/objects/CeruleanCity.asm
parentClean up some redundant or unusual event comments (diff)
downloadpokeyellow-0fdefbc9602f0e6f14f723c89d42673e974181e3.tar.gz
pokeyellow-0fdefbc9602f0e6f14f723c89d42673e974181e3.tar.xz
pokeyellow-0fdefbc9602f0e6f14f723c89d42673e974181e3.zip
`warp_event` warp IDs start at 1, like in pokegold/pokecrystal
Diffstat (limited to 'data/maps/objects/CeruleanCity.asm')
-rw-r--r--data/maps/objects/CeruleanCity.asm20
1 files changed, 10 insertions, 10 deletions
diff --git a/data/maps/objects/CeruleanCity.asm b/data/maps/objects/CeruleanCity.asm
index e45bfbda..a709cccd 100644
--- a/data/maps/objects/CeruleanCity.asm
+++ b/data/maps/objects/CeruleanCity.asm
@@ -2,16 +2,16 @@ CeruleanCity_Object:
db $a ; border block
def_warp_events
- warp_event 27, 11, CERULEAN_TRASHED_HOUSE, 0
- warp_event 13, 15, CERULEAN_MELANIES_HOUSE, 0
- warp_event 19, 17, CERULEAN_POKECENTER, 0
- warp_event 30, 19, CERULEAN_GYM, 0
- warp_event 13, 25, BIKE_SHOP, 0
- warp_event 25, 25, CERULEAN_MART, 0
- warp_event 4, 11, CERULEAN_CAVE_1F, 0
- warp_event 27, 9, CERULEAN_TRASHED_HOUSE, 2
- warp_event 9, 11, CERULEAN_BADGE_HOUSE, 1
- warp_event 9, 9, CERULEAN_BADGE_HOUSE, 0
+ warp_event 27, 11, CERULEAN_TRASHED_HOUSE, 1
+ warp_event 13, 15, CERULEAN_MELANIES_HOUSE, 1
+ warp_event 19, 17, CERULEAN_POKECENTER, 1
+ warp_event 30, 19, CERULEAN_GYM, 1
+ warp_event 13, 25, BIKE_SHOP, 1
+ warp_event 25, 25, CERULEAN_MART, 1
+ warp_event 4, 11, CERULEAN_CAVE_1F, 1
+ warp_event 27, 9, CERULEAN_TRASHED_HOUSE, 3
+ warp_event 9, 11, CERULEAN_BADGE_HOUSE, 2
+ warp_event 9, 9, CERULEAN_BADGE_HOUSE, 1
def_bg_events
bg_event 23, 19, 12 ; CeruleanCityText12