aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/CinnabarIsland.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/CinnabarIsland.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/CinnabarIsland.asm')
-rw-r--r--data/maps/objects/CinnabarIsland.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/objects/CinnabarIsland.asm b/data/maps/objects/CinnabarIsland.asm
index cdfb5ba2..f3ca64fb 100644
--- a/data/maps/objects/CinnabarIsland.asm
+++ b/data/maps/objects/CinnabarIsland.asm
@@ -2,11 +2,11 @@ CinnabarIsland_Object:
db $43 ; border block
def_warp_events
- warp_event 6, 3, POKEMON_MANSION_1F, 1
- warp_event 18, 3, CINNABAR_GYM, 0
- warp_event 6, 9, CINNABAR_LAB, 0
- warp_event 11, 11, CINNABAR_POKECENTER, 0
- warp_event 15, 11, CINNABAR_MART, 0
+ warp_event 6, 3, POKEMON_MANSION_1F, 2
+ warp_event 18, 3, CINNABAR_GYM, 1
+ warp_event 6, 9, CINNABAR_LAB, 1
+ warp_event 11, 11, CINNABAR_POKECENTER, 1
+ warp_event 15, 11, CINNABAR_MART, 1
def_bg_events
bg_event 9, 5, 3 ; CinnabarIslandText3