diff options
author | yenatch <yenatch@gmail.com> | 2013-08-03 16:34:51 -0400 |
---|---|---|
committer | yenatch <yenatch@gmail.com> | 2013-08-03 16:34:51 -0400 |
commit | a2242e1b9d95dcaf21ecdb5ae27a497c6ee6c27a (patch) | |
tree | a30798efa48b616dc655387ba8f3c1cdd8afd466 /maps/Route24.asm | |
parent | bb8990dc3cb19787e08c29409cfc674e2478fbc9 (diff) | |
parent | 0ee006a145dbe45a8844ad2dc6d8bf04b51f63bc (diff) |
Merge branch 'sprites'
Diffstat (limited to 'maps/Route24.asm')
-rw-r--r-- | maps/Route24.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/maps/Route24.asm b/maps/Route24.asm index c2f1d0127..466a8d835 100644 --- a/maps/Route24.asm +++ b/maps/Route24.asm @@ -6,7 +6,7 @@ Route24_MapScriptHeader: ; 0x1adbf8 db 0 ; 0x1adbfa -UnknownScript_0x1adbfa: ; 0x1adbfa +RocketScript_0x1adbfa: ; 0x1adbfa faceplayer playmusic $0039 loadfont @@ -113,6 +113,6 @@ Route24_MapEventHeader: ; 0x1adf50 ; people-events db 1 - person_event $35, 11, 12, $3, $0, 255, 255, $0, 0, UnknownScript_0x1adbfa, $076c + person_event SPRITE_ROCKET, 11, 12, $3, $0, 255, 255, $0, 0, RocketScript_0x1adbfa, $076c ; 0x1adf63 |