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/Route16Gate.asm | |
parent | b676c24aefc3213d844fba9572dcb327be16a4d9 (diff) | |
parent | 8d75f962e45694555b10ac78a3e78e3f53682db0 (diff) |
Merge commit '8d75f96' into master
Mostly sprite stuff.
Diffstat (limited to 'maps/Route16Gate.asm')
-rw-r--r-- | maps/Route16Gate.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/maps/Route16Gate.asm b/maps/Route16Gate.asm index 91287d138..a8cfef36c 100644 --- a/maps/Route16Gate.asm +++ b/maps/Route16Gate.asm @@ -13,7 +13,7 @@ UnknownScript_0x733e9: ; 0x733e9 end ; 0x733ea -UnknownScript_0x733ea: ; 0x733ea +OfficerScript_0x733ea: ; 0x733ea jumptextfaceplayer UnknownText_0x73408 ; 0x733ed @@ -81,6 +81,6 @@ Route16Gate_MapEventHeader: ; 0x734df ; people-events db 1 - person_event $43, 6, 9, $6, $0, 255, 255, $90, 0, UnknownScript_0x733ea, $ffff + person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x733ea, $ffff ; 0x73516 |