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/GuideGentsHouse.asm | |
parent | bb8990dc3cb19787e08c29409cfc674e2478fbc9 (diff) | |
parent | 0ee006a145dbe45a8844ad2dc6d8bf04b51f63bc (diff) |
Merge branch 'sprites'
Diffstat (limited to 'maps/GuideGentsHouse.asm')
-rw-r--r-- | maps/GuideGentsHouse.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/maps/GuideGentsHouse.asm b/maps/GuideGentsHouse.asm index 7f0ac3030..11357169e 100644 --- a/maps/GuideGentsHouse.asm +++ b/maps/GuideGentsHouse.asm @@ -6,7 +6,7 @@ GuideGentsHouse_MapScriptHeader: ; 0x196c05 db 0 ; 0x196c07 -UnknownScript_0x196c07: ; 0x196c07 +GrampsScript_0x196c07: ; 0x196c07 jumptextfaceplayer UnknownText_0x196c0d ; 0x196c0a @@ -44,6 +44,6 @@ GuideGentsHouse_MapEventHeader: ; 0x196c89 ; people-events db 1 - person_event $2f, 7, 6, $9, $0, 255, 255, $0, 0, UnknownScript_0x196c07, $06ff + person_event SPRITE_GRAMPS, 7, 6, $9, $0, 255, 255, $0, 0, GrampsScript_0x196c07, $06ff ; 0x196cb0 |