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/Route3.asm | |
| parent | 45c039801916713e4066644086de4d4940d5fa1d (diff) | |
| parent | 30acb46b988d4bb54af761696123778acd8517e3 (diff) | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'data/maps/objects/Route3.asm')
| -rw-r--r-- | data/maps/objects/Route3.asm | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/data/maps/objects/Route3.asm b/data/maps/objects/Route3.asm index 153fa795..c60f78a9 100644 --- a/data/maps/objects/Route3.asm +++ b/data/maps/objects/Route3.asm @@ -1,20 +1,20 @@ Route3_Object: db $2c ; border block - def_warps + def_warp_events - def_signs - sign 59, 9, 10 ; Route3Text10 + def_bg_events + bg_event 59, 9, 10 ; Route3Text10 - def_objects - object SPRITE_SUPER_NERD, 57, 11, STAY, NONE, 1 ; person - object SPRITE_YOUNGSTER, 10, 6, STAY, RIGHT, 2, OPP_BUG_CATCHER, 4 - object SPRITE_YOUNGSTER, 14, 4, STAY, DOWN, 3, OPP_YOUNGSTER, 1 - object SPRITE_COOLTRAINER_F, 16, 9, STAY, LEFT, 4, OPP_LASS, 1 - object SPRITE_YOUNGSTER, 19, 5, STAY, DOWN, 5, OPP_BUG_CATCHER, 5 - object SPRITE_COOLTRAINER_F, 23, 4, STAY, LEFT, 6, OPP_LASS, 2 - object SPRITE_YOUNGSTER, 22, 9, STAY, LEFT, 7, OPP_YOUNGSTER, 2 - object SPRITE_YOUNGSTER, 24, 6, STAY, RIGHT, 8, OPP_BUG_CATCHER, 6 - object SPRITE_COOLTRAINER_F, 33, 10, STAY, UP, 9, OPP_LASS, 3 + def_object_events + object_event 57, 11, SPRITE_SUPER_NERD, STAY, NONE, 1 ; person + object_event 10, 6, SPRITE_YOUNGSTER, STAY, RIGHT, 2, OPP_BUG_CATCHER, 4 + object_event 14, 4, SPRITE_YOUNGSTER, STAY, DOWN, 3, OPP_YOUNGSTER, 1 + object_event 16, 9, SPRITE_COOLTRAINER_F, STAY, LEFT, 4, OPP_LASS, 1 + object_event 19, 5, SPRITE_YOUNGSTER, STAY, DOWN, 5, OPP_BUG_CATCHER, 5 + object_event 23, 4, SPRITE_COOLTRAINER_F, STAY, LEFT, 6, OPP_LASS, 2 + object_event 22, 9, SPRITE_YOUNGSTER, STAY, LEFT, 7, OPP_YOUNGSTER, 2 + object_event 24, 6, SPRITE_YOUNGSTER, STAY, RIGHT, 8, OPP_BUG_CATCHER, 6 + object_event 33, 10, SPRITE_COOLTRAINER_F, STAY, UP, 9, OPP_LASS, 3 def_warps_to ROUTE_3 |