diff options
| author | dannye <33dannye@gmail.com> | 2021-09-26 22:56:02 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2021-09-26 22:56:02 -0500 |
| commit | 94ed208164c3f6484a26923c5bc7664b9a3c4002 (patch) | |
| tree | e6141c9f312ae0edf4b4741a729b03fea1ddebf5 /data/maps/objects/OaksLab.asm | |
| parent | Merge branch 'master' of https://github.com/pret/pokered (diff) | |
| parent | Align `object_event` coordinates (diff) | |
| download | pokeyellow-94ed208164c3f6484a26923c5bc7664b9a3c4002.tar.gz pokeyellow-94ed208164c3f6484a26923c5bc7664b9a3c4002.tar.xz pokeyellow-94ed208164c3f6484a26923c5bc7664b9a3c4002.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'data/maps/objects/OaksLab.asm')
| -rw-r--r-- | data/maps/objects/OaksLab.asm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/data/maps/objects/OaksLab.asm b/data/maps/objects/OaksLab.asm index 7da4ea9c..63eac9f7 100644 --- a/data/maps/objects/OaksLab.asm +++ b/data/maps/objects/OaksLab.asm @@ -8,14 +8,14 @@ OaksLab_Object: def_bg_events def_object_events - object_event 4, 3, SPRITE_BLUE, STAY, NONE, 1, OPP_RIVAL1, 1 - object_event 7, 3, SPRITE_POKE_BALL, STAY, NONE, 2 ; person - object_event 5, 2, SPRITE_OAK, STAY, DOWN, 3 ; person - object_event 2, 1, SPRITE_POKEDEX, STAY, NONE, 4 ; person - object_event 3, 1, SPRITE_POKEDEX, STAY, NONE, 5 ; person - object_event 5, 10, SPRITE_OAK, STAY, UP, 6 ; person - object_event 1, 9, SPRITE_GIRL, WALK, UP_DOWN, 7 ; person - object_event 2, 10, SPRITE_SCIENTIST, STAY, NONE, 8 ; person - object_event 8, 10, SPRITE_SCIENTIST, STAY, NONE, 9 ; person + object_event 4, 3, SPRITE_BLUE, STAY, NONE, 1, OPP_RIVAL1, 1 + object_event 7, 3, SPRITE_POKE_BALL, STAY, NONE, 2 ; person + object_event 5, 2, SPRITE_OAK, STAY, DOWN, 3 ; person + object_event 2, 1, SPRITE_POKEDEX, STAY, NONE, 4 ; person + object_event 3, 1, SPRITE_POKEDEX, STAY, NONE, 5 ; person + object_event 5, 10, SPRITE_OAK, STAY, UP, 6 ; person + object_event 1, 9, SPRITE_GIRL, WALK, UP_DOWN, 7 ; person + object_event 2, 10, SPRITE_SCIENTIST, STAY, NONE, 8 ; person + object_event 8, 10, SPRITE_SCIENTIST, STAY, NONE, 9 ; person def_warps_to OAKS_LAB |