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/CeladonMansionRoof.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/CeladonMansionRoof.asm')
| -rw-r--r-- | data/maps/objects/CeladonMansionRoof.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/data/maps/objects/CeladonMansionRoof.asm b/data/maps/objects/CeladonMansionRoof.asm index e3eb8aa7..89f60ac2 100644 --- a/data/maps/objects/CeladonMansionRoof.asm +++ b/data/maps/objects/CeladonMansionRoof.asm @@ -1,14 +1,14 @@ CeladonMansionRoof_Object: db $9 ; border block - def_warps - warp 6, 1, 1, CELADON_MANSION_3F - warp 2, 1, 2, CELADON_MANSION_3F - warp 2, 7, 0, CELADON_MANSION_ROOF_HOUSE + def_warp_events + warp_event 6, 1, CELADON_MANSION_3F, 1 + warp_event 2, 1, CELADON_MANSION_3F, 2 + warp_event 2, 7, CELADON_MANSION_ROOF_HOUSE, 0 - def_signs - sign 3, 7, 1 ; CeladonMansion4Text1 + def_bg_events + bg_event 3, 7, 1 ; CeladonMansion4Text1 - def_objects + def_object_events def_warps_to CELADON_MANSION_ROOF |