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/Route36RuinsofAlphgate.asm | |
| parent | b676c24aefc3213d844fba9572dcb327be16a4d9 (diff) | |
| parent | 8d75f962e45694555b10ac78a3e78e3f53682db0 (diff) | |
Merge commit '8d75f96' into master
Mostly sprite stuff.
Diffstat (limited to 'maps/Route36RuinsofAlphgate.asm')
| -rw-r--r-- | maps/Route36RuinsofAlphgate.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/maps/Route36RuinsofAlphgate.asm b/maps/Route36RuinsofAlphgate.asm index b19aacbc0..aed24de5e 100644 --- a/maps/Route36RuinsofAlphgate.asm +++ b/maps/Route36RuinsofAlphgate.asm @@ -6,11 +6,11 @@ Route36RuinsofAlphgate_MapScriptHeader: ; 0x6aa18 db 0 ; 0x6aa1a -UnknownScript_0x6aa1a: ; 0x6aa1a +OfficerScript_0x6aa1a: ; 0x6aa1a jumptextfaceplayer UnknownText_0x6aa20 ; 0x6aa1d -UnknownScript_0x6aa1d: ; 0x6aa1d +GrampsScript_0x6aa1d: ; 0x6aa1d jumptextfaceplayer UnknownText_0x6aa5b ; 0x6aa20 @@ -50,7 +50,7 @@ Route36RuinsofAlphgate_MapEventHeader: ; 0x6aac9 ; people-events db 2 - person_event $43, 8, 4, $9, $0, 255, 255, $80, 0, UnknownScript_0x6aa1a, $ffff - person_event $2f, 9, 11, $2, $21, 255, 255, $b0, 0, UnknownScript_0x6aa1d, $ffff + person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $80, 0, OfficerScript_0x6aa1a, $ffff + person_event SPRITE_GRAMPS, 9, 11, $2, $21, 255, 255, $b0, 0, GrampsScript_0x6aa1d, $ffff ; 0x6aafd |