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/Museum2F.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/Museum2F.asm')
| -rw-r--r-- | data/maps/objects/Museum2F.asm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/data/maps/objects/Museum2F.asm b/data/maps/objects/Museum2F.asm index 72f98f9b..8dcc229f 100644 --- a/data/maps/objects/Museum2F.asm +++ b/data/maps/objects/Museum2F.asm @@ -1,18 +1,18 @@ Museum2F_Object: db $a ; border block - def_warps - warp 7, 7, 4, MUSEUM_1F + def_warp_events + warp_event 7, 7, MUSEUM_1F, 4 - def_signs - sign 11, 2, 6 ; Museum2FText6 - sign 2, 5, 7 ; Museum2FText7 + def_bg_events + bg_event 11, 2, 6 ; Museum2FText6 + bg_event 2, 5, 7 ; Museum2FText7 - def_objects - object SPRITE_YOUNGSTER, 1, 7, WALK, LEFT_RIGHT, 1 ; person - object SPRITE_GRAMPS, 0, 5, STAY, DOWN, 2 ; person - object SPRITE_SCIENTIST, 7, 5, STAY, DOWN, 3 ; person - object SPRITE_BRUNETTE_GIRL, 11, 5, STAY, NONE, 4 ; person - object SPRITE_HIKER, 12, 5, STAY, DOWN, 5 ; person + def_object_events + object_event 1, 7, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, 1 ; person + object_event 0, 5, SPRITE_GRAMPS, STAY, DOWN, 2 ; person + object_event 7, 5, SPRITE_SCIENTIST, STAY, DOWN, 3 ; person + object_event 11, 5, SPRITE_BRUNETTE_GIRL, STAY, NONE, 4 ; person + object_event 12, 5, SPRITE_HIKER, STAY, DOWN, 5 ; person def_warps_to MUSEUM_2F |