diff options
| author | Yoann Fievez <yoann.fievez@gmail.com> | 2021-09-27 04:56:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-26 21:56:09 -0500 |
| commit | 2c4f35848b786864822a3f211df91de30a2857c9 (patch) | |
| tree | fcf65394ef3a2361d4dce8bd6cadaac8c9d021d3 /data/maps/objects/CeladonMansion2F.asm | |
| parent | `ASSERT LOW(wSpriteStateData1) == 0 && LOW(wSpriteStateData2) == 0` (diff) | |
| download | pokeyellow-2c4f35848b786864822a3f211df91de30a2857c9.tar.gz pokeyellow-2c4f35848b786864822a3f211df91de30a2857c9.tar.xz pokeyellow-2c4f35848b786864822a3f211df91de30a2857c9.zip | |
Unify map event gen1 gen2 (#335)
* Update sign to bg_event #289
* Rename warp to warp_event
* Replace object to object_event
* Move warp macro parameter from warp x, y, id, map to warp_event x, y, map, id
Diffstat (limited to 'data/maps/objects/CeladonMansion2F.asm')
| -rw-r--r-- | data/maps/objects/CeladonMansion2F.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/data/maps/objects/CeladonMansion2F.asm b/data/maps/objects/CeladonMansion2F.asm index 211abbda..c0d431d2 100644 --- a/data/maps/objects/CeladonMansion2F.asm +++ b/data/maps/objects/CeladonMansion2F.asm @@ -1,15 +1,15 @@ CeladonMansion2F_Object: db $f ; border block - def_warps - warp 6, 1, 0, CELADON_MANSION_3F - warp 7, 1, 3, CELADON_MANSION_1F - warp 2, 1, 4, CELADON_MANSION_1F - warp 4, 1, 3, CELADON_MANSION_3F + def_warp_events + warp_event 6, 1, CELADON_MANSION_3F, 0 + warp_event 7, 1, CELADON_MANSION_1F, 3 + warp_event 2, 1, CELADON_MANSION_1F, 4 + warp_event 4, 1, CELADON_MANSION_3F, 3 - def_signs - sign 4, 9, 1 ; CeladonMansion2Text1 + def_bg_events + bg_event 4, 9, 1 ; CeladonMansion2Text1 - def_objects + def_object_events def_warps_to CELADON_MANSION_2F |