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/Route6SaffronGate.asm | |
parent | bb8990dc3cb19787e08c29409cfc674e2478fbc9 (diff) | |
parent | 0ee006a145dbe45a8844ad2dc6d8bf04b51f63bc (diff) |
Merge branch 'sprites'
Diffstat (limited to 'maps/Route6SaffronGate.asm')
-rw-r--r-- | maps/Route6SaffronGate.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/maps/Route6SaffronGate.asm b/maps/Route6SaffronGate.asm index 0b73cf3d7..7ebb3b07e 100644 --- a/maps/Route6SaffronGate.asm +++ b/maps/Route6SaffronGate.asm @@ -13,7 +13,7 @@ UnknownScript_0x1926e9: ; 0x1926e9 end ; 0x1926ea -UnknownScript_0x1926ea: ; 0x1926ea +OfficerScript_0x1926ea: ; 0x1926ea faceplayer loadfont checkbit1 $00c9 @@ -73,6 +73,6 @@ Route6SaffronGate_MapEventHeader: ; 0x192807 ; people-events db 1 - person_event $43, 8, 4, $9, $0, 255, 255, $90, 0, UnknownScript_0x1926ea, $ffff + person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $90, 0, OfficerScript_0x1926ea, $ffff ; 0x19282e |