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/Route15FuchsiaGate.asm | |
parent | bb8990dc3cb19787e08c29409cfc674e2478fbc9 (diff) | |
parent | 0ee006a145dbe45a8844ad2dc6d8bf04b51f63bc (diff) |
Merge branch 'sprites'
Diffstat (limited to 'maps/Route15FuchsiaGate.asm')
-rw-r--r-- | maps/Route15FuchsiaGate.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/maps/Route15FuchsiaGate.asm b/maps/Route15FuchsiaGate.asm index 406a32e6b..b4993d161 100644 --- a/maps/Route15FuchsiaGate.asm +++ b/maps/Route15FuchsiaGate.asm @@ -6,7 +6,7 @@ Route15FuchsiaGate_MapScriptHeader: ; 0x19679c db 0 ; 0x19679e -UnknownScript_0x19679e: ; 0x19679e +OfficerScript_0x19679e: ; 0x19679e jumptextfaceplayer UnknownText_0x1967a1 ; 0x1967a1 @@ -36,6 +36,6 @@ Route15FuchsiaGate_MapEventHeader: ; 0x1967e1 ; people-events db 1 - person_event $43, 6, 9, $6, $0, 255, 255, $90, 0, UnknownScript_0x19679e, $ffff + person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x19679e, $ffff ; 0x196808 |