diff options
| author | yenatch <yenatch@gmail.com> | 2017-12-28 22:17:13 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-28 22:17:13 -0500 |
| commit | b97a1acf3d676ca1c776e37ff4cfa48164ffc92b (patch) | |
| tree | 59b5db70690a9f9041e4964adae1722b4d178a1b /maps/OaksLab.asm | |
| parent | 82a05a1752b476caab8951fe03f539dcc1a63669 (diff) | |
| parent | b9a68fec2589eb6969be63e6ed1eb3fca312c307 (diff) | |
Merge pull request #445 from roukaour/master
Rename Pokémon animation files; consistent (x, y) coords; document design flaws
Diffstat (limited to 'maps/OaksLab.asm')
| -rw-r--r-- | maps/OaksLab.asm | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/maps/OaksLab.asm b/maps/OaksLab.asm index d2b67c0a0..17da0485d 100644 --- a/maps/OaksLab.asm +++ b/maps/OaksLab.asm @@ -262,34 +262,34 @@ OaksLab_MapEventHeader: .Warps: db 2 - warp_def $b, $4, 3, PALLET_TOWN - warp_def $b, $5, 3, PALLET_TOWN + warp_def 4, 11, 3, PALLET_TOWN + warp_def 5, 11, 3, PALLET_TOWN .CoordEvents: db 0 .BGEvents: db 16 - bg_event 1, 6, BGEVENT_READ, OaksLabBookshelf - bg_event 1, 7, BGEVENT_READ, OaksLabBookshelf - bg_event 1, 8, BGEVENT_READ, OaksLabBookshelf - bg_event 1, 9, BGEVENT_READ, OaksLabBookshelf - bg_event 7, 0, BGEVENT_READ, OaksLabBookshelf + bg_event 6, 1, BGEVENT_READ, OaksLabBookshelf bg_event 7, 1, BGEVENT_READ, OaksLabBookshelf - bg_event 7, 2, BGEVENT_READ, OaksLabBookshelf - bg_event 7, 3, BGEVENT_READ, OaksLabBookshelf - bg_event 7, 6, BGEVENT_READ, OaksLabBookshelf + bg_event 8, 1, BGEVENT_READ, OaksLabBookshelf + bg_event 9, 1, BGEVENT_READ, OaksLabBookshelf + bg_event 0, 7, BGEVENT_READ, OaksLabBookshelf + bg_event 1, 7, BGEVENT_READ, OaksLabBookshelf + bg_event 2, 7, BGEVENT_READ, OaksLabBookshelf + bg_event 3, 7, BGEVENT_READ, OaksLabBookshelf + bg_event 6, 7, BGEVENT_READ, OaksLabBookshelf bg_event 7, 7, BGEVENT_READ, OaksLabBookshelf - bg_event 7, 8, BGEVENT_READ, OaksLabBookshelf - bg_event 7, 9, BGEVENT_READ, OaksLabBookshelf - bg_event 0, 4, BGEVENT_READ, OaksLabPoster1 - bg_event 0, 5, BGEVENT_READ, OaksLabPoster2 - bg_event 3, 9, BGEVENT_READ, OaksLabTrashcan - bg_event 1, 0, BGEVENT_READ, OaksLabPC + bg_event 8, 7, BGEVENT_READ, OaksLabBookshelf + bg_event 9, 7, BGEVENT_READ, OaksLabBookshelf + bg_event 4, 0, BGEVENT_READ, OaksLabPoster1 + bg_event 5, 0, BGEVENT_READ, OaksLabPoster2 + bg_event 9, 3, BGEVENT_READ, OaksLabTrashcan + bg_event 0, 1, BGEVENT_READ, OaksLabPC .ObjectEvents: db 4 - object_event SPRITE_OAK, 2, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Oak, -1 - object_event SPRITE_SCIENTIST, 8, 1, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OaksAssistant1Script, -1 - object_event SPRITE_SCIENTIST, 9, 8, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OaksAssistant2Script, -1 - object_event SPRITE_SCIENTIST, 4, 1, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OaksAssistant3Script, -1 + object_event 4, 2, SPRITE_OAK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Oak, -1 + object_event 1, 8, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OaksAssistant1Script, -1 + object_event 8, 9, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OaksAssistant2Script, -1 + object_event 1, 4, SPRITE_SCIENTIST, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OaksAssistant3Script, -1 |