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/Route43Gate.asm | |
| parent | b676c24aefc3213d844fba9572dcb327be16a4d9 (diff) | |
| parent | 8d75f962e45694555b10ac78a3e78e3f53682db0 (diff) | |
Merge commit '8d75f96' into master
Mostly sprite stuff.
Diffstat (limited to 'maps/Route43Gate.asm')
| -rw-r--r-- | maps/Route43Gate.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm index 7feff412b..d70a8fdf8 100644 --- a/maps/Route43Gate.asm +++ b/maps/Route43Gate.asm @@ -117,11 +117,11 @@ UnknownScript_0x19ac72: ; 0x19ac72 end ; 0x19ac82 -UnknownScript_0x19ac82: ; 0x19ac82 +RocketScript_0x19ac82: ; 0x19ac82 jumptextfaceplayer UnknownText_0x19ad41 ; 0x19ac85 -UnknownScript_0x19ac85: ; 0x19ac85 +OfficerScript_0x19ac85: ; 0x19ac85 faceplayer loadfont checkbit1 $0059 @@ -285,8 +285,8 @@ Route43Gate_MapEventHeader: ; 0x19ae5b ; people-events db 3 - person_event $43, 8, 4, $9, $0, 255, 255, $80, 0, UnknownScript_0x19ac85, $0735 - person_event $35, 8, 6, $6, $0, 255, 255, $0, 0, UnknownScript_0x19ac82, $06dc - person_event $35, 8, 11, $7, $0, 255, 255, $0, 0, UnknownScript_0x19ac82, $06dc + person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $80, 0, OfficerScript_0x19ac85, $0735 + person_event SPRITE_ROCKET, 8, 6, $6, $0, 255, 255, $0, 0, RocketScript_0x19ac82, $06dc + person_event SPRITE_ROCKET, 8, 11, $7, $0, 255, 255, $0, 0, RocketScript_0x19ac82, $06dc ; 0x19ae9c |