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/LancesRoom.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/LancesRoom.asm')
| -rw-r--r-- | data/maps/objects/LancesRoom.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/data/maps/objects/LancesRoom.asm b/data/maps/objects/LancesRoom.asm index a8dc4777..3e055fde 100644 --- a/data/maps/objects/LancesRoom.asm +++ b/data/maps/objects/LancesRoom.asm @@ -1,14 +1,14 @@ LancesRoom_Object: db $3 ; border block - def_warps - warp 24, 16, 2, AGATHAS_ROOM - warp 5, 0, 0, CHAMPIONS_ROOM - warp 6, 0, 0, CHAMPIONS_ROOM + def_warp_events + warp_event 24, 16, AGATHAS_ROOM, 2 + warp_event 5, 0, CHAMPIONS_ROOM, 0 + warp_event 6, 0, CHAMPIONS_ROOM, 0 - def_signs + def_bg_events - def_objects - object SPRITE_LANCE, 6, 1, STAY, DOWN, 1, OPP_LANCE, 1 + def_object_events + object_event 6, 1, SPRITE_LANCE, STAY, DOWN, 1, OPP_LANCE, 1 def_warps_to LANCES_ROOM |