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/LancesRoom.asm | |
| parent | b676c24aefc3213d844fba9572dcb327be16a4d9 (diff) | |
| parent | 8d75f962e45694555b10ac78a3e78e3f53682db0 (diff) | |
Merge commit '8d75f96' into master
Mostly sprite stuff.
Diffstat (limited to 'maps/LancesRoom.asm')
| -rw-r--r-- | maps/LancesRoom.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index 55b1d28c6..4db16287d 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -348,8 +348,8 @@ LancesRoom_MapEventHeader: ; 0x1813f4 ; people-events db 3 - person_event $1e, 7, 9, $6, $0, 255, 255, $0, 0, $4e7b, $ffff - person_event $29, 11, 8, $7, $0, 255, 255, $a0, 0, ObjectEvent, $075f - person_event $5, 11, 8, $7, $0, 255, 255, $0, 0, ObjectEvent, $075f + person_event SPRITE_LANCE, 7, 9, $6, $0, 255, 255, $0, 0, $4e7b, $ffff + person_event SPRITE_TEACHER, 11, 8, $7, $0, 255, 255, $a0, 0, ObjectEvent, $075f + person_event SPRITE_OAK, 11, 8, $7, $0, 255, 255, $0, 0, ObjectEvent, $075f ; 0x181445 |