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/WillsRoom.asm | |
parent | bb8990dc3cb19787e08c29409cfc674e2478fbc9 (diff) | |
parent | 0ee006a145dbe45a8844ad2dc6d8bf04b51f63bc (diff) |
Merge branch 'sprites'
Diffstat (limited to 'maps/WillsRoom.asm')
-rw-r--r-- | maps/WillsRoom.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm index 7fdfd8126..e59a1ac62 100644 --- a/maps/WillsRoom.asm +++ b/maps/WillsRoom.asm @@ -49,7 +49,7 @@ UnknownScript_0x1804e0: ; 0x1804e0 end ; 0x1804f8 -UnknownScript_0x1804f8: ; 0x1804f8 +WillScript_0x1804f8: ; 0x1804f8 faceplayer loadfont checkbit1 $05b8 @@ -146,6 +146,6 @@ WillsRoom_MapEventHeader: ; 0x1806f9 ; people-events db 1 - person_event $11, 11, 9, $6, $0, 255, 255, $80, 0, UnknownScript_0x1804f8, $ffff + person_event SPRITE_WILL, 11, 9, $6, $0, 255, 255, $80, 0, WillScript_0x1804f8, $ffff ; 0x18071b |