diff options
| author | dannye <33dannye@gmail.com> | 2020-05-20 19:40:33 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2020-05-20 20:02:53 -0500 |
| commit | 10f9559eab8c93b94abb8ae8d1083704ad4e169a (patch) | |
| tree | 7dbe7b152dde8a6e9b56664b5b8cdfc0d6be1253 /data/mapObjects/CinnabarIsland.asm | |
| parent | Merge pull request #39 from TiKevin83/master (diff) | |
| download | pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.gz pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.xz pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.zip | |
Sync with pokered
Diffstat (limited to '')
| -rwxr-xr-x | data/mapObjects/CinnabarIsland.asm (renamed from data/mapObjects/cinnabarisland.asm) | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/mapObjects/cinnabarisland.asm b/data/mapObjects/CinnabarIsland.asm index 264a59f8..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 |