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/Museum1F.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/Museum1F.asm')
| -rw-r--r-- | data/maps/objects/Museum1F.asm | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/data/maps/objects/Museum1F.asm b/data/maps/objects/Museum1F.asm index 3628173c..4c6e7ebe 100644 --- a/data/maps/objects/Museum1F.asm +++ b/data/maps/objects/Museum1F.asm @@ -1,20 +1,20 @@ Museum1F_Object: db $a ; border block - def_warps - warp 10, 7, 0, LAST_MAP - warp 11, 7, 0, LAST_MAP - warp 16, 7, 1, LAST_MAP - warp 17, 7, 1, LAST_MAP - warp 7, 7, 0, MUSEUM_2F + def_warp_events + warp_event 10, 7, LAST_MAP, 0 + warp_event 11, 7, LAST_MAP, 0 + warp_event 16, 7, LAST_MAP, 1 + warp_event 17, 7, LAST_MAP, 1 + warp_event 7, 7, MUSEUM_2F, 0 - def_signs + def_bg_events - def_objects - object SPRITE_SCIENTIST, 12, 4, STAY, LEFT, 1 ; person - object SPRITE_GAMBLER, 1, 4, STAY, NONE, 2 ; person - object SPRITE_SCIENTIST, 15, 2, STAY, DOWN, 3 ; person - object SPRITE_SCIENTIST, 17, 4, STAY, NONE, 4 ; person - object SPRITE_OLD_AMBER, 16, 2, STAY, NONE, 5 ; person + def_object_events + object_event 12, 4, SPRITE_SCIENTIST, STAY, LEFT, 1 ; person + object_event 1, 4, SPRITE_GAMBLER, STAY, NONE, 2 ; person + object_event 15, 2, SPRITE_SCIENTIST, STAY, DOWN, 3 ; person + object_event 17, 4, SPRITE_SCIENTIST, STAY, NONE, 4 ; person + object_event 16, 2, SPRITE_OLD_AMBER, STAY, NONE, 5 ; person def_warps_to MUSEUM_1F |