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/SilphCo11F.asm | |
| parent | 45c039801916713e4066644086de4d4940d5fa1d (diff) | |
| parent | 30acb46b988d4bb54af761696123778acd8517e3 (diff) | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'data/maps/objects/SilphCo11F.asm')
| -rw-r--r-- | data/maps/objects/SilphCo11F.asm | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/data/maps/objects/SilphCo11F.asm b/data/maps/objects/SilphCo11F.asm index dab1144c..75f1bae8 100644 --- a/data/maps/objects/SilphCo11F.asm +++ b/data/maps/objects/SilphCo11F.asm @@ -1,20 +1,20 @@ SilphCo11F_Object: db $d ; border block - def_warps - warp 9, 0, 1, SILPH_CO_10F - warp 13, 0, 0, SILPH_CO_ELEVATOR - warp 5, 5, 9, LAST_MAP - warp 3, 2, 3, SILPH_CO_7F + def_warp_events + warp_event 9, 0, SILPH_CO_10F, 1 + warp_event 13, 0, SILPH_CO_ELEVATOR, 0 + warp_event 5, 5, LAST_MAP, 9 + warp_event 3, 2, SILPH_CO_7F, 3 - def_signs + def_bg_events - def_objects - object SPRITE_SILPH_PRESIDENT, 7, 5, STAY, DOWN, 1 ; person - object SPRITE_BEAUTY, 10, 5, STAY, DOWN, 2 ; person - object SPRITE_GIOVANNI, 6, 9, STAY, DOWN, 3, OPP_GIOVANNI, 2 - object SPRITE_JAMES, 2, 8, STAY, UP, 4 - object SPRITE_ROCKET, 15, 9, STAY, UP, 5, OPP_ROCKET, 40 - object SPRITE_JESSIE, 3, 8, STAY, UP, 6 + def_object_events + object_event 7, 5, SPRITE_SILPH_PRESIDENT, STAY, DOWN, 1 ; person + object_event 10, 5, SPRITE_BEAUTY, STAY, DOWN, 2 ; person + object_event 6, 9, SPRITE_GIOVANNI, STAY, DOWN, 3, OPP_GIOVANNI, 2 + object_event 2, 8, SPRITE_JAMES, STAY, UP, 4 + object_event 15, 9, SPRITE_ROCKET, STAY, UP, 5, OPP_ROCKET, 40 + object_event 3, 8, SPRITE_JESSIE, STAY, UP, 6 def_warps_to SILPH_CO_11F |