diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2013-08-12 15:16:23 -0500 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2013-08-12 15:16:23 -0500 |
| commit | 1cb19a03a3c57c85d27495f95483b30ae37f0976 (patch) | |
| tree | 0f798841fdf32e9ee4fdee93fb0b43d8cb73fa5b /maps/GuideGentsHouse.asm | |
| parent | b676c24aefc3213d844fba9572dcb327be16a4d9 (diff) | |
| parent | 8d75f962e45694555b10ac78a3e78e3f53682db0 (diff) | |
Merge commit '8d75f96' into master
Mostly sprite stuff.
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 |