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/WillsRoom.asm | |
| parent | b676c24aefc3213d844fba9572dcb327be16a4d9 (diff) | |
| parent | 8d75f962e45694555b10ac78a3e78e3f53682db0 (diff) | |
Merge commit '8d75f96' into master
Mostly sprite stuff.
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 |