summaryrefslogtreecommitdiff
path: root/maps/Route24.asm
diff options
context:
space:
mode:
authorBryan Bishop <kanzure@gmail.com>2013-08-12 15:16:23 -0500
committerBryan Bishop <kanzure@gmail.com>2013-08-12 15:16:23 -0500
commit1cb19a03a3c57c85d27495f95483b30ae37f0976 (patch)
tree0f798841fdf32e9ee4fdee93fb0b43d8cb73fa5b /maps/Route24.asm
parentb676c24aefc3213d844fba9572dcb327be16a4d9 (diff)
parent8d75f962e45694555b10ac78a3e78e3f53682db0 (diff)
Merge commit '8d75f96' into master
Mostly sprite stuff.
Diffstat (limited to 'maps/Route24.asm')
-rw-r--r--maps/Route24.asm4
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