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/Route12.asm | |
| parent | 45c039801916713e4066644086de4d4940d5fa1d (diff) | |
| parent | 30acb46b988d4bb54af761696123778acd8517e3 (diff) | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'data/maps/objects/Route12.asm')
| -rw-r--r-- | data/maps/objects/Route12.asm | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/data/maps/objects/Route12.asm b/data/maps/objects/Route12.asm index bdb74d68..c9bb87bb 100644 --- a/data/maps/objects/Route12.asm +++ b/data/maps/objects/Route12.asm @@ -1,26 +1,26 @@ Route12_Object: db $43 ; border block - def_warps - warp 10, 15, 0, ROUTE_12_GATE_1F - warp 11, 15, 0, ROUTE_12_GATE_1F - warp 10, 21, 2, ROUTE_12_GATE_1F - warp 11, 77, 0, ROUTE_12_SUPER_ROD_HOUSE + def_warp_events + warp_event 10, 15, ROUTE_12_GATE_1F, 0 + warp_event 11, 15, ROUTE_12_GATE_1F, 0 + warp_event 10, 21, ROUTE_12_GATE_1F, 2 + warp_event 11, 77, ROUTE_12_SUPER_ROD_HOUSE, 0 - def_signs - sign 13, 13, 11 ; Route12Text11 - sign 11, 63, 12 ; Route12Text12 + def_bg_events + bg_event 13, 13, 11 ; Route12Text11 + bg_event 11, 63, 12 ; Route12Text12 - def_objects - object SPRITE_SNORLAX, 10, 62, STAY, DOWN, 1 ; person - object SPRITE_FISHER, 14, 31, STAY, LEFT, 2, OPP_FISHER, 3 - object SPRITE_FISHER, 5, 39, STAY, UP, 3, OPP_FISHER, 4 - object SPRITE_COOLTRAINER_M, 11, 92, STAY, LEFT, 4, OPP_JR_TRAINER_M, 9 - object SPRITE_SUPER_NERD, 14, 76, STAY, UP, 5, OPP_ROCKER, 2 - object SPRITE_FISHER, 12, 40, STAY, LEFT, 6, OPP_FISHER, 5 - object SPRITE_FISHER, 9, 52, STAY, RIGHT, 7, OPP_FISHER, 6 - object SPRITE_FISHER, 6, 87, STAY, DOWN, 8, OPP_FISHER, 11 - object SPRITE_POKE_BALL, 14, 35, STAY, NONE, 9, TM_PAY_DAY - object SPRITE_POKE_BALL, 5, 89, STAY, NONE, 10, IRON + def_object_events + object_event 10, 62, SPRITE_SNORLAX, STAY, DOWN, 1 ; person + object_event 14, 31, SPRITE_FISHER, STAY, LEFT, 2, OPP_FISHER, 3 + object_event 5, 39, SPRITE_FISHER, STAY, UP, 3, OPP_FISHER, 4 + object_event 11, 92, SPRITE_COOLTRAINER_M, STAY, LEFT, 4, OPP_JR_TRAINER_M, 9 + object_event 14, 76, SPRITE_SUPER_NERD, STAY, UP, 5, OPP_ROCKER, 2 + object_event 12, 40, SPRITE_FISHER, STAY, LEFT, 6, OPP_FISHER, 5 + object_event 9, 52, SPRITE_FISHER, STAY, RIGHT, 7, OPP_FISHER, 6 + object_event 6, 87, SPRITE_FISHER, STAY, DOWN, 8, OPP_FISHER, 11 + object_event 14, 35, SPRITE_POKE_BALL, STAY, NONE, 9, TM_PAY_DAY + object_event 5, 89, SPRITE_POKE_BALL, STAY, NONE, 10, IRON def_warps_to ROUTE_12 |