diff options
| author | yenatch <yenatch@gmail.com> | 2015-11-03 07:56:05 -0500 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2015-11-03 07:56:05 -0500 |
| commit | 1c1fe276ca59726bb0008c60006c6b48cd093573 (patch) | |
| tree | 817fb9c92dd798e89a891c3924bda3df955344e0 /maps/ElmsHouse.asm | |
| parent | 25c126c69beebfdf26d0de286e25c65f6f3db16e (diff) | |
| parent | 2faa4a0f70edd91bde908139b3fd5b6b5aebf017 (diff) | |
Merge pull request #324 from PikalaxALT/master
Movement and map objects
Diffstat (limited to 'maps/ElmsHouse.asm')
| -rw-r--r-- | maps/ElmsHouse.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/maps/ElmsHouse.asm b/maps/ElmsHouse.asm index e8673a693..1c303a5f7 100644 --- a/maps/ElmsHouse.asm +++ b/maps/ElmsHouse.asm @@ -99,5 +99,5 @@ ElmsHouse_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_TEACHER, 5, 1, $4, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ElmsWife, -1 - person_event SPRITE_BUG_CATCHER, 4, 5, $7, 0, 0, -1, -1, 0, 0, 0, ElmsSon, -1 + person_event SPRITE_TEACHER, 5, 1, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ElmsWife, -1 + person_event SPRITE_BUG_CATCHER, 4, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, 0, 0, ElmsSon, -1 |