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/Route15.asm | |
| parent | 45c039801916713e4066644086de4d4940d5fa1d (diff) | |
| parent | 30acb46b988d4bb54af761696123778acd8517e3 (diff) | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'data/maps/objects/Route15.asm')
| -rw-r--r-- | data/maps/objects/Route15.asm | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/data/maps/objects/Route15.asm b/data/maps/objects/Route15.asm index 884e1704..915db18e 100644 --- a/data/maps/objects/Route15.asm +++ b/data/maps/objects/Route15.asm @@ -1,26 +1,26 @@ Route15_Object: db $43 ; border block - def_warps - warp 7, 8, 0, ROUTE_15_GATE_1F - warp 7, 9, 0, ROUTE_15_GATE_1F - warp 14, 8, 2, ROUTE_15_GATE_1F - warp 14, 9, 2, ROUTE_15_GATE_1F + def_warp_events + warp_event 7, 8, ROUTE_15_GATE_1F, 0 + warp_event 7, 9, ROUTE_15_GATE_1F, 0 + warp_event 14, 8, ROUTE_15_GATE_1F, 2 + warp_event 14, 9, ROUTE_15_GATE_1F, 2 - def_signs - sign 39, 9, 12 ; Route15Text12 + def_bg_events + bg_event 39, 9, 12 ; Route15Text12 - def_objects - object SPRITE_COOLTRAINER_F, 41, 11, STAY, DOWN, 1, OPP_JR_TRAINER_F, 20 - object SPRITE_COOLTRAINER_F, 53, 10, STAY, LEFT, 2, OPP_JR_TRAINER_F, 21 - object SPRITE_COOLTRAINER_M, 31, 13, STAY, UP, 3, OPP_BIRD_KEEPER, 6 - object SPRITE_COOLTRAINER_M, 35, 13, STAY, UP, 4, OPP_BIRD_KEEPER, 7 - object SPRITE_BEAUTY, 53, 11, STAY, DOWN, 5, OPP_BEAUTY, 9 - object SPRITE_BEAUTY, 41, 10, STAY, RIGHT, 6, OPP_BEAUTY, 10 - object SPRITE_BIKER, 48, 10, STAY, DOWN, 7, OPP_BIKER, 3 - object SPRITE_BIKER, 46, 10, STAY, DOWN, 8, OPP_BIKER, 4 - object SPRITE_COOLTRAINER_F, 37, 5, STAY, RIGHT, 9, OPP_JR_TRAINER_F, 22 - object SPRITE_COOLTRAINER_F, 18, 13, STAY, UP, 10, OPP_JR_TRAINER_F, 23 - object SPRITE_POKE_BALL, 18, 5, STAY, NONE, 11, TM_RAGE + def_object_events + object_event 41, 11, SPRITE_COOLTRAINER_F, STAY, DOWN, 1, OPP_JR_TRAINER_F, 20 + object_event 53, 10, SPRITE_COOLTRAINER_F, STAY, LEFT, 2, OPP_JR_TRAINER_F, 21 + object_event 31, 13, SPRITE_COOLTRAINER_M, STAY, UP, 3, OPP_BIRD_KEEPER, 6 + object_event 35, 13, SPRITE_COOLTRAINER_M, STAY, UP, 4, OPP_BIRD_KEEPER, 7 + object_event 53, 11, SPRITE_BEAUTY, STAY, DOWN, 5, OPP_BEAUTY, 9 + object_event 41, 10, SPRITE_BEAUTY, STAY, RIGHT, 6, OPP_BEAUTY, 10 + object_event 48, 10, SPRITE_BIKER, STAY, DOWN, 7, OPP_BIKER, 3 + object_event 46, 10, SPRITE_BIKER, STAY, DOWN, 8, OPP_BIKER, 4 + object_event 37, 5, SPRITE_COOLTRAINER_F, STAY, RIGHT, 9, OPP_JR_TRAINER_F, 22 + object_event 18, 13, SPRITE_COOLTRAINER_F, STAY, UP, 10, OPP_JR_TRAINER_F, 23 + object_event 18, 5, SPRITE_POKE_BALL, STAY, NONE, 11, TM_RAGE def_warps_to ROUTE_15 |