diff options
| author | yenatch <yenatch@gmail.com> | 2013-08-03 16:34:51 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2013-08-03 16:34:51 -0400 |
| commit | a2242e1b9d95dcaf21ecdb5ae27a497c6ee6c27a (patch) | |
| tree | a30798efa48b616dc655387ba8f3c1cdd8afd466 /maps/SoulHouse.asm | |
| parent | bb8990dc3cb19787e08c29409cfc674e2478fbc9 (diff) | |
| parent | 0ee006a145dbe45a8844ad2dc6d8bf04b51f63bc (diff) | |
Merge branch 'sprites'
Diffstat (limited to 'maps/SoulHouse.asm')
| -rw-r--r-- | maps/SoulHouse.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/maps/SoulHouse.asm b/maps/SoulHouse.asm index da0e747fb..23682dd4b 100644 --- a/maps/SoulHouse.asm +++ b/maps/SoulHouse.asm @@ -6,19 +6,19 @@ SoulHouse_MapScriptHeader: ; 0x7ec45 db 0 ; 0x7ec47 -UnknownScript_0x7ec47: ; 0x7ec47 +GrampsScript_0x7ec47: ; 0x7ec47 jumptextfaceplayer UnknownText_0x7ec53 ; 0x7ec4a -UnknownScript_0x7ec4a: ; 0x7ec4a +TeacherScript_0x7ec4a: ; 0x7ec4a jumptextfaceplayer UnknownText_0x7ed4d ; 0x7ec4d -UnknownScript_0x7ec4d: ; 0x7ec4d +LassScript_0x7ec4d: ; 0x7ec4d jumptextfaceplayer UnknownText_0x7edb1 ; 0x7ec50 -UnknownScript_0x7ec50: ; 0x7ec50 +GrannyScript_0x7ec50: ; 0x7ec50 jumptextfaceplayer UnknownText_0x7eddb ; 0x7ec53 @@ -79,9 +79,9 @@ SoulHouse_MapEventHeader: ; 0x7ee1d ; people-events db 4 - person_event $2f, 6, 8, $6, $0, 255, 255, $90, 0, UnknownScript_0x7ec47, $ffff - person_event $29, 7, 11, $5, $1, 255, 255, $90, 0, UnknownScript_0x7ec4a, $ffff - person_event $28, 9, 6, $7, $0, 255, 255, $90, 0, UnknownScript_0x7ec4d, $ffff - person_event $30, 7, 5, $7, $0, 255, 255, $90, 0, UnknownScript_0x7ec50, $ffff + person_event SPRITE_GRAMPS, 6, 8, $6, $0, 255, 255, $90, 0, GrampsScript_0x7ec47, $ffff + person_event SPRITE_TEACHER, 7, 11, $5, $1, 255, 255, $90, 0, TeacherScript_0x7ec4a, $ffff + person_event SPRITE_LASS, 9, 6, $7, $0, 255, 255, $90, 0, LassScript_0x7ec4d, $ffff + person_event SPRITE_GRANNY, 7, 5, $7, $0, 255, 255, $90, 0, GrannyScript_0x7ec50, $ffff ; 0x7ee61 |