aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/CinnabarIsland.asm
diff options
context:
space:
mode:
Diffstat (limited to '')
-rwxr-xr-xdata/mapObjects/CinnabarIsland.asm (renamed from data/mapObjects/cinnabarisland.asm)10
1 files changed, 5 insertions, 5 deletions
diff --git a/data/mapObjects/cinnabarisland.asm b/data/mapObjects/CinnabarIsland.asm
index a66d6444..1932e134 100755
--- a/data/mapObjects/cinnabarisland.asm
+++ b/data/mapObjects/CinnabarIsland.asm
@@ -1,10 +1,10 @@
-CinnabarIslandObject:
+CinnabarIsland_Object:
db $43 ; border block
db 5 ; warps
- warp 6, 3, 1, MANSION_1
+ warp 6, 3, 1, POKEMON_MANSION_1F
warp 18, 3, 0, CINNABAR_GYM
- warp 6, 9, 0, CINNABAR_LAB_1
+ warp 6, 9, 0, CINNABAR_LAB
warp 11, 11, 0, CINNABAR_POKECENTER
warp 15, 11, 0, CINNABAR_MART
@@ -20,8 +20,8 @@ CinnabarIslandObject:
object SPRITE_GAMBLER, 14, 6, STAY, NONE, 2 ; person
; warp-to
- warp_to 6, 3, CINNABAR_ISLAND_WIDTH ; MANSION_1
+ warp_to 6, 3, CINNABAR_ISLAND_WIDTH ; POKEMON_MANSION_1F
warp_to 18, 3, CINNABAR_ISLAND_WIDTH ; CINNABAR_GYM
- warp_to 6, 9, CINNABAR_ISLAND_WIDTH ; CINNABAR_LAB_1
+ warp_to 6, 9, CINNABAR_ISLAND_WIDTH ; CINNABAR_LAB
warp_to 11, 11, CINNABAR_ISLAND_WIDTH ; CINNABAR_POKECENTER
warp_to 15, 11, CINNABAR_ISLAND_WIDTH ; CINNABAR_MART