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/CopycatsHouse1F.asm | |
| parent | 45c039801916713e4066644086de4d4940d5fa1d (diff) | |
| parent | 30acb46b988d4bb54af761696123778acd8517e3 (diff) | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'data/maps/objects/CopycatsHouse1F.asm')
| -rw-r--r-- | data/maps/objects/CopycatsHouse1F.asm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/data/maps/objects/CopycatsHouse1F.asm b/data/maps/objects/CopycatsHouse1F.asm index bc635385..f4f195c1 100644 --- a/data/maps/objects/CopycatsHouse1F.asm +++ b/data/maps/objects/CopycatsHouse1F.asm @@ -1,16 +1,16 @@ CopycatsHouse1F_Object: db $a ; border block - def_warps - warp 2, 7, 0, LAST_MAP - warp 3, 7, 0, LAST_MAP - warp 7, 1, 0, COPYCATS_HOUSE_2F + def_warp_events + warp_event 2, 7, LAST_MAP, 0 + warp_event 3, 7, LAST_MAP, 0 + warp_event 7, 1, COPYCATS_HOUSE_2F, 0 - def_signs + def_bg_events - def_objects - object SPRITE_MIDDLE_AGED_WOMAN, 2, 2, STAY, DOWN, 1 ; person - object SPRITE_MIDDLE_AGED_MAN, 5, 4, STAY, LEFT, 2 ; person - object SPRITE_CHANSEY, 1, 4, STAY, NONE, 3 ; person + def_object_events + object_event 2, 2, SPRITE_MIDDLE_AGED_WOMAN, STAY, DOWN, 1 ; person + object_event 5, 4, SPRITE_MIDDLE_AGED_MAN, STAY, LEFT, 2 ; person + object_event 1, 4, SPRITE_CHANSEY, STAY, NONE, 3 ; person def_warps_to COPYCATS_HOUSE_1F |