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/SSAnneKitchen.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/SSAnneKitchen.asm')
| -rw-r--r-- | data/maps/objects/SSAnneKitchen.asm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/data/maps/objects/SSAnneKitchen.asm b/data/maps/objects/SSAnneKitchen.asm index 75fc497f..bf6434e3 100644 --- a/data/maps/objects/SSAnneKitchen.asm +++ b/data/maps/objects/SSAnneKitchen.asm @@ -1,18 +1,18 @@ SSAnneKitchen_Object: db $c ; border block - def_warps - warp 6, 0, 10, SS_ANNE_1F + def_warp_events + warp_event 6, 0, SS_ANNE_1F, 10 - def_signs + def_bg_events - def_objects - object SPRITE_COOK, 1, 8, WALK, UP_DOWN, 1 ; person - object SPRITE_COOK, 5, 8, WALK, UP_DOWN, 2 ; person - object SPRITE_COOK, 9, 7, WALK, UP_DOWN, 3 ; person - object SPRITE_COOK, 13, 6, STAY, NONE, 4 ; person - object SPRITE_COOK, 13, 8, STAY, NONE, 5 ; person - object SPRITE_COOK, 13, 10, STAY, NONE, 6 ; person - object SPRITE_COOK, 11, 13, STAY, UP, 7 ; person + def_object_events + object_event 1, 8, SPRITE_COOK, WALK, UP_DOWN, 1 ; person + object_event 5, 8, SPRITE_COOK, WALK, UP_DOWN, 2 ; person + object_event 9, 7, SPRITE_COOK, WALK, UP_DOWN, 3 ; person + object_event 13, 6, SPRITE_COOK, STAY, NONE, 4 ; person + object_event 13, 8, SPRITE_COOK, STAY, NONE, 5 ; person + object_event 13, 10, SPRITE_COOK, STAY, NONE, 6 ; person + object_event 11, 13, SPRITE_COOK, STAY, UP, 7 ; person def_warps_to SS_ANNE_KITCHEN |