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/ElmsHouse.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/ElmsHouse.asm')
| -rw-r--r-- | maps/ElmsHouse.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/ElmsHouse.asm b/maps/ElmsHouse.asm index c8dcb1b29..72e3f68e2 100644 --- a/maps/ElmsHouse.asm +++ b/maps/ElmsHouse.asm @@ -89,19 +89,19 @@ ElmsHouse_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 4, NEW_BARK_TOWN - warp_def $7, $3, 4, NEW_BARK_TOWN + warp_def 2, 7, 4, NEW_BARK_TOWN + warp_def 3, 7, 4, NEW_BARK_TOWN .CoordEvents: db 0 .BGEvents: db 3 - bg_event 1, 0, BGEVENT_READ, ElmsHousePC - bg_event 1, 6, BGEVENT_READ, ElmsHouseBookshelf - bg_event 1, 7, BGEVENT_READ, ElmsHouseBookshelf + bg_event 0, 1, BGEVENT_READ, ElmsHousePC + bg_event 6, 1, BGEVENT_READ, ElmsHouseBookshelf + bg_event 7, 1, BGEVENT_READ, ElmsHouseBookshelf .ObjectEvents: db 2 - object_event SPRITE_TEACHER, 5, 1, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ElmsWife, -1 - object_event SPRITE_BUG_CATCHER, 4, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ElmsSon, -1 + object_event 1, 5, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ElmsWife, -1 + object_event 5, 4, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ElmsSon, -1 |