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/ElmsHouse.asm | |
| parent | b676c24aefc3213d844fba9572dcb327be16a4d9 (diff) | |
| parent | 8d75f962e45694555b10ac78a3e78e3f53682db0 (diff) | |
Merge commit '8d75f96' into master
Mostly sprite stuff.
Diffstat (limited to 'maps/ElmsHouse.asm')
| -rw-r--r-- | maps/ElmsHouse.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/maps/ElmsHouse.asm b/maps/ElmsHouse.asm index 1998d6639..ac8fa01db 100644 --- a/maps/ElmsHouse.asm +++ b/maps/ElmsHouse.asm @@ -6,11 +6,11 @@ ElmsHouse_MapScriptHeader: ; 0x7aee9 db 0 ; 0x7aeeb -UnknownScript_0x7aeeb: ; 0x7aeeb +TeacherScript_0x7aeeb: ; 0x7aeeb jumptextfaceplayer UnknownText_0x7aef7 ; 0x7aeee -UnknownScript_0x7aeee: ; 0x7aeee +BugCatcherScript_0x7aeee: ; 0x7aeee jumptextfaceplayer UnknownText_0x7af6b ; 0x7aef1 @@ -92,7 +92,7 @@ ElmsHouse_MapEventHeader: ; 0x7b0ea ; people-events db 2 - person_event $29, 9, 5, $4, $10, 255, 255, $a0, 0, UnknownScript_0x7aeeb, $ffff - person_event $25, 8, 9, $7, $0, 255, 255, $0, 0, UnknownScript_0x7aeee, $ffff + person_event SPRITE_TEACHER, 9, 5, $4, $10, 255, 255, $a0, 0, TeacherScript_0x7aeeb, $ffff + person_event SPRITE_BUG_CATCHER, 8, 9, $7, $0, 255, 255, $0, 0, BugCatcherScript_0x7aeee, $ffff ; 0x7b123 |