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/BrunosRoom.asm | |
| parent | bb8990dc3cb19787e08c29409cfc674e2478fbc9 (diff) | |
| parent | 0ee006a145dbe45a8844ad2dc6d8bf04b51f63bc (diff) | |
Merge branch 'sprites'
Diffstat (limited to 'maps/BrunosRoom.asm')
| -rw-r--r-- | maps/BrunosRoom.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm index 9bf6d24fd..9669b1090 100644 --- a/maps/BrunosRoom.asm +++ b/maps/BrunosRoom.asm @@ -49,7 +49,7 @@ UnknownScript_0x1809ad: ; 0x1809ad end ; 0x1809c5 -UnknownScript_0x1809c5: ; 0x1809c5 +BrunoScript_0x1809c5: ; 0x1809c5 faceplayer loadfont checkbit1 $05ba @@ -144,6 +144,6 @@ BrunosRoom_MapEventHeader: ; 0x180b88 ; people-events db 1 - person_event $1c, 11, 9, $6, $0, 255, 255, $b0, 0, UnknownScript_0x1809c5, $ffff + person_event SPRITE_BRUNO, 11, 9, $6, $0, 255, 255, $b0, 0, BrunoScript_0x1809c5, $ffff ; 0x180baf |