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/BluesHouse.asm | |
| parent | bb8990dc3cb19787e08c29409cfc674e2478fbc9 (diff) | |
| parent | 0ee006a145dbe45a8844ad2dc6d8bf04b51f63bc (diff) | |
Merge branch 'sprites'
Diffstat (limited to 'maps/BluesHouse.asm')
| -rw-r--r-- | maps/BluesHouse.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm index 3b79b485d..dcc5815fa 100644 --- a/maps/BluesHouse.asm +++ b/maps/BluesHouse.asm @@ -6,7 +6,7 @@ BluesHouse_MapScriptHeader: ; 0x19b0ce db 0 ; 0x19b0d0 -UnknownScript_0x19b0d0: ; 0x19b0d0 +DaisyScript_0x19b0d0: ; 0x19b0d0 faceplayer loadfont checkcode $a @@ -154,6 +154,6 @@ BluesHouse_MapEventHeader: ; 0x19b3a8 ; people-events db 1 - person_event $f, 7, 6, $3, $0, 255, 255, $0, 0, UnknownScript_0x19b0d0, $ffff + person_event SPRITE_DAISY, 7, 6, $3, $0, 255, 255, $0, 0, DaisyScript_0x19b0d0, $ffff ; 0x19b3c5 |