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/SSAnne1FRooms.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/SSAnne1FRooms.asm')
| -rw-r--r-- | data/maps/objects/SSAnne1FRooms.asm | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/data/maps/objects/SSAnne1FRooms.asm b/data/maps/objects/SSAnne1FRooms.asm index afb30af4..e5ebfd29 100644 --- a/data/maps/objects/SSAnne1FRooms.asm +++ b/data/maps/objects/SSAnne1FRooms.asm @@ -1,27 +1,27 @@ SSAnne1FRooms_Object: db $c ; border block - def_warps - warp 0, 0, 2, SS_ANNE_1F - warp 10, 0, 3, SS_ANNE_1F - warp 20, 0, 4, SS_ANNE_1F - warp 0, 10, 5, SS_ANNE_1F - warp 10, 10, 6, SS_ANNE_1F - warp 20, 10, 7, SS_ANNE_1F + def_warp_events + warp_event 0, 0, SS_ANNE_1F, 2 + warp_event 10, 0, SS_ANNE_1F, 3 + warp_event 20, 0, SS_ANNE_1F, 4 + warp_event 0, 10, SS_ANNE_1F, 5 + warp_event 10, 10, SS_ANNE_1F, 6 + warp_event 20, 10, SS_ANNE_1F, 7 - def_signs + def_bg_events - def_objects - object SPRITE_GENTLEMAN, 2, 3, STAY, LEFT, 1, OPP_GENTLEMAN, 1 - object SPRITE_GENTLEMAN, 11, 4, STAY, UP, 2, OPP_GENTLEMAN, 2 - object SPRITE_YOUNGSTER, 11, 14, STAY, UP, 3, OPP_YOUNGSTER, 8 - object SPRITE_COOLTRAINER_F, 13, 11, STAY, LEFT, 4, OPP_LASS, 11 - object SPRITE_GIRL, 22, 3, WALK, UP_DOWN, 5 ; person - object SPRITE_MIDDLE_AGED_MAN, 0, 14, STAY, NONE, 6 ; person - object SPRITE_LITTLE_GIRL, 2, 11, STAY, DOWN, 7 ; person - object SPRITE_JIGGLYPUFF, 3, 11, STAY, DOWN, 8 ; person - object SPRITE_GIRL, 10, 13, STAY, RIGHT, 9 ; person - object SPRITE_POKE_BALL, 12, 15, STAY, NONE, 10, TM_BODY_SLAM - object SPRITE_GENTLEMAN, 21, 13, WALK, LEFT_RIGHT, 11 ; person + def_object_events + object_event 2, 3, SPRITE_GENTLEMAN, STAY, LEFT, 1, OPP_GENTLEMAN, 1 + object_event 11, 4, SPRITE_GENTLEMAN, STAY, UP, 2, OPP_GENTLEMAN, 2 + object_event 11, 14, SPRITE_YOUNGSTER, STAY, UP, 3, OPP_YOUNGSTER, 8 + object_event 13, 11, SPRITE_COOLTRAINER_F, STAY, LEFT, 4, OPP_LASS, 11 + object_event 22, 3, SPRITE_GIRL, WALK, UP_DOWN, 5 ; person + object_event 0, 14, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, 6 ; person + object_event 2, 11, SPRITE_LITTLE_GIRL, STAY, DOWN, 7 ; person + object_event 3, 11, SPRITE_JIGGLYPUFF, STAY, DOWN, 8 ; person + object_event 10, 13, SPRITE_GIRL, STAY, RIGHT, 9 ; person + object_event 12, 15, SPRITE_POKE_BALL, STAY, NONE, 10, TM_BODY_SLAM + object_event 21, 13, SPRITE_GENTLEMAN, WALK, LEFT_RIGHT, 11 ; person def_warps_to SS_ANNE_1F_ROOMS |