diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-07-16 18:10:10 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-07-16 18:10:10 -0400 |
| commit | 894955f9d922de5fc33e6c0aa7af9795dbcbc158 (patch) | |
| tree | 67dd99bdc03ba493937ed00876d5cd0229a83369 /maps/LancesRoom.asm | |
| parent | 7054bfe71718d5b327bbd3725c82d2431c7fcfb1 (diff) | |
Special script annotation, trainer constant enumeration, person-event structure update
Diffstat (limited to 'maps/LancesRoom.asm')
| -rw-r--r-- | maps/LancesRoom.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index ce2043ea0..29cb5bc70 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -25,7 +25,7 @@ UnknownScript_0x180e3e: iffalse UnknownScript_0x180e48 changeblock $4, $16, $34 UnknownScript_0x180e48: - checkevent EVENT_312 + checkevent EVENT_LANCES_ROOM_EXIT_OPEN iffalse UnknownScript_0x180e52 changeblock $4, $0, $b UnknownScript_0x180e52: @@ -358,6 +358,6 @@ LancesRoom_MapEventHeader: ; people-events db 3 - person_event SPRITE_LANCE, 7, 9, $6, $0, 255, 255, $0, 0, LanceScript_0x180e7b, -1 - person_event SPRITE_TEACHER, 11, 8, $7, $0, 255, 255, $a0, 0, ObjectEvent, EVENT_75F - person_event SPRITE_OAK, 11, 8, $7, $0, 255, 255, $0, 0, ObjectEvent, EVENT_75F + person_event SPRITE_LANCE, 7, 9, UP << 2 | $2, $0, -1, -1, $0, 0, LanceScript_0x180e7b, -1 + person_event SPRITE_TEACHER, 11, 8, UP << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ObjectEvent, EVENT_75F + person_event SPRITE_OAK, 11, 8, UP << 2 | $3, $0, -1, -1, $0, 0, ObjectEvent, EVENT_75F |