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/CopycatsHouse2F.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/CopycatsHouse2F.asm')
| -rw-r--r-- | data/maps/objects/CopycatsHouse2F.asm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/data/maps/objects/CopycatsHouse2F.asm b/data/maps/objects/CopycatsHouse2F.asm index e04edee7..5e5df0a5 100644 --- a/data/maps/objects/CopycatsHouse2F.asm +++ b/data/maps/objects/CopycatsHouse2F.asm @@ -1,18 +1,18 @@ CopycatsHouse2F_Object: db $a ; border block - def_warps - warp 7, 1, 2, COPYCATS_HOUSE_1F + def_warp_events + warp_event 7, 1, COPYCATS_HOUSE_1F, 2 - def_signs - sign 3, 5, 6 ; CopycatsHouse2FText6 - sign 0, 1, 7 ; CopycatsHouse2FText7 + def_bg_events + bg_event 3, 5, 6 ; CopycatsHouse2FText6 + bg_event 0, 1, 7 ; CopycatsHouse2FText7 - def_objects - object SPRITE_BRUNETTE_GIRL, 4, 3, WALK, ANY_DIR, 1 ; person - object SPRITE_BIRD, 4, 6, WALK, LEFT_RIGHT, 2 ; person - object SPRITE_MONSTER, 5, 1, STAY, DOWN, 3 ; person - object SPRITE_BIRD, 2, 0, STAY, DOWN, 4 ; person - object SPRITE_FAIRY, 1, 6, STAY, RIGHT, 5 ; person + def_object_events + object_event 4, 3, SPRITE_BRUNETTE_GIRL, WALK, ANY_DIR, 1 ; person + object_event 4, 6, SPRITE_BIRD, WALK, LEFT_RIGHT, 2 ; person + object_event 5, 1, SPRITE_MONSTER, STAY, DOWN, 3 ; person + object_event 2, 0, SPRITE_BIRD, STAY, DOWN, 4 ; person + object_event 1, 6, SPRITE_FAIRY, STAY, RIGHT, 5 ; person def_warps_to COPYCATS_HOUSE_2F |