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/Route8SaffronGate.asm | |
| parent | b676c24aefc3213d844fba9572dcb327be16a4d9 (diff) | |
| parent | 8d75f962e45694555b10ac78a3e78e3f53682db0 (diff) | |
Merge commit '8d75f96' into master
Mostly sprite stuff.
Diffstat (limited to 'maps/Route8SaffronGate.asm')
| -rw-r--r-- | maps/Route8SaffronGate.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/maps/Route8SaffronGate.asm b/maps/Route8SaffronGate.asm index 5b617979b..f96a3a424 100644 --- a/maps/Route8SaffronGate.asm +++ b/maps/Route8SaffronGate.asm @@ -6,7 +6,7 @@ Route8SaffronGate_MapScriptHeader: ; 0x7f414 db 0 ; 0x7f416 -UnknownScript_0x7f416: ; 0x7f416 +OfficerScript_0x7f416: ; 0x7f416 jumptextfaceplayer UnknownText_0x7f419 ; 0x7f419 @@ -36,6 +36,6 @@ Route8SaffronGate_MapEventHeader: ; 0x7f45b ; people-events db 1 - person_event $43, 6, 9, $6, $0, 255, 255, $90, 0, UnknownScript_0x7f416, $ffff + person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x7f416, $ffff ; 0x7f482 |