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/Route19FuchsiaGate.asm | |
| parent | b676c24aefc3213d844fba9572dcb327be16a4d9 (diff) | |
| parent | 8d75f962e45694555b10ac78a3e78e3f53682db0 (diff) | |
Merge commit '8d75f96' into master
Mostly sprite stuff.
Diffstat (limited to 'maps/Route19FuchsiaGate.asm')
| -rw-r--r-- | maps/Route19FuchsiaGate.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/maps/Route19FuchsiaGate.asm b/maps/Route19FuchsiaGate.asm index 40a1b3e61..acb1fc761 100644 --- a/maps/Route19FuchsiaGate.asm +++ b/maps/Route19FuchsiaGate.asm @@ -6,7 +6,7 @@ Route19FuchsiaGate_MapScriptHeader: ; 0x1ab3f4 db 0 ; 0x1ab3f6 -UnknownScript_0x1ab3f6: ; 0x1ab3f6 +OfficerScript_0x1ab3f6: ; 0x1ab3f6 faceplayer loadfont checkbit1 $00d7 @@ -61,6 +61,6 @@ Route19FuchsiaGate_MapEventHeader: ; 0x1ab4cd ; people-events db 1 - person_event $43, 8, 4, $9, $0, 255, 255, $90, 0, UnknownScript_0x1ab3f6, $ffff + person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $90, 0, OfficerScript_0x1ab3f6, $ffff ; 0x1ab4f4 |