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/Route1718Gate.asm | |
| parent | b676c24aefc3213d844fba9572dcb327be16a4d9 (diff) | |
| parent | 8d75f962e45694555b10ac78a3e78e3f53682db0 (diff) | |
Merge commit '8d75f96' into master
Mostly sprite stuff.
Diffstat (limited to 'maps/Route1718Gate.asm')
| -rw-r--r-- | maps/Route1718Gate.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/maps/Route1718Gate.asm b/maps/Route1718Gate.asm index dff48d7d3..55c9cb438 100644 --- a/maps/Route1718Gate.asm +++ b/maps/Route1718Gate.asm @@ -13,7 +13,7 @@ UnknownScript_0x7360d: ; 0x7360d end ; 0x7360e -UnknownScript_0x7360e: ; 0x7360e +OfficerScript_0x7360e: ; 0x7360e jumptextfaceplayer UnknownText_0x7362c ; 0x73611 @@ -75,7 +75,7 @@ Route1718Gate_MapEventHeader: ; 0x736b6 ; people-events db 1 - person_event $43, 6, 9, $6, $0, 255, 255, $90, 0, UnknownScript_0x7360e, $ffff + person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x7360e, $ffff ; 0x736ed |