diff options
| author | dannye <33dannye@gmail.com> | 2021-09-26 22:38:47 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2021-09-26 22:43:09 -0500 |
| commit | 501a21fa5dc6f01c0563316c9cd209cccb1eef45 (patch) | |
| tree | c2fe5cc6caa9d8117df3008031d7a26317058acb /data/maps/objects/CinnabarIsland.asm | |
| parent | Switch from Travis CI to GitHub Actions (diff) | |
| parent | Fix typos (#334) (diff) | |
| download | pokeyellow-501a21fa5dc6f01c0563316c9cd209cccb1eef45.tar.gz pokeyellow-501a21fa5dc6f01c0563316c9cd209cccb1eef45.tar.xz pokeyellow-501a21fa5dc6f01c0563316c9cd209cccb1eef45.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'data/maps/objects/CinnabarIsland.asm')
| -rw-r--r-- | data/maps/objects/CinnabarIsland.asm | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/data/maps/objects/CinnabarIsland.asm b/data/maps/objects/CinnabarIsland.asm index 1dd11a43..c2decff6 100644 --- a/data/maps/objects/CinnabarIsland.asm +++ b/data/maps/objects/CinnabarIsland.asm @@ -1,22 +1,22 @@ CinnabarIsland_Object: db $43 ; border block - def_warps - warp 6, 3, 1, POKEMON_MANSION_1F - warp 18, 3, 0, CINNABAR_GYM - warp 6, 9, 0, CINNABAR_LAB - warp 11, 11, 0, CINNABAR_POKECENTER - warp 15, 11, 0, CINNABAR_MART + 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 - def_signs - sign 9, 5, 3 ; CinnabarIslandText3 - sign 16, 11, 4 ; MartSignText - sign 12, 11, 5 ; PokeCenterSignText - sign 9, 11, 6 ; CinnabarIslandText6 - sign 13, 3, 7 ; CinnabarIslandText7 + def_bg_events + bg_event 9, 5, 3 ; CinnabarIslandText3 + bg_event 16, 11, 4 ; MartSignText + bg_event 12, 11, 5 ; PokeCenterSignText + bg_event 9, 11, 6 ; CinnabarIslandText6 + bg_event 13, 3, 7 ; CinnabarIslandText7 - def_objects - object SPRITE_GIRL, 12, 5, WALK, LEFT_RIGHT, 1 ; person - object SPRITE_GAMBLER, 14, 6, STAY, NONE, 2 ; person + def_object_events + object_event 12, 5, SPRITE_GIRL, WALK, LEFT_RIGHT, 1 ; person + object_event 14, 6, SPRITE_GAMBLER, STAY, NONE, 2 ; person def_warps_to CINNABAR_ISLAND |