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/BluesHouse.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/BluesHouse.asm')
| -rw-r--r-- | data/maps/objects/BluesHouse.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/data/maps/objects/BluesHouse.asm b/data/maps/objects/BluesHouse.asm index 4858b785..36d96058 100644 --- a/data/maps/objects/BluesHouse.asm +++ b/data/maps/objects/BluesHouse.asm @@ -1,15 +1,15 @@ BluesHouse_Object: db $a ; border block - def_warps - warp 2, 7, 1, LAST_MAP - warp 3, 7, 1, LAST_MAP + def_warp_events + warp_event 2, 7, LAST_MAP, 1 + warp_event 3, 7, LAST_MAP, 1 - def_signs + def_bg_events - def_objects - object SPRITE_DAISY, 2, 3, STAY, RIGHT, 1 ; Daisy, sitting by map - object SPRITE_DAISY, 6, 4, WALK, UP_DOWN, 2, 0 ; Daisy, walking around - object SPRITE_POKEDEX, 3, 3, STAY, NONE, 3, 0 ; map on table + def_object_events + object_event 2, 3, SPRITE_DAISY, STAY, RIGHT, 1 ; Daisy, sitting by map + object_event 6, 4, SPRITE_DAISY, WALK, UP_DOWN, 2, 0 ; Daisy, walking around + object_event 3, 3, SPRITE_POKEDEX, STAY, NONE, 3, 0 ; map on table def_warps_to BLUES_HOUSE |