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/FuchsiaBillSpeechHouse.asm | |
parent | bb8990dc3cb19787e08c29409cfc674e2478fbc9 (diff) | |
parent | 0ee006a145dbe45a8844ad2dc6d8bf04b51f63bc (diff) |
Merge branch 'sprites'
Diffstat (limited to 'maps/FuchsiaBillSpeechHouse.asm')
-rw-r--r-- | maps/FuchsiaBillSpeechHouse.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/maps/FuchsiaBillSpeechHouse.asm b/maps/FuchsiaBillSpeechHouse.asm index 268207e15..0f5bbe634 100644 --- a/maps/FuchsiaBillSpeechHouse.asm +++ b/maps/FuchsiaBillSpeechHouse.asm @@ -6,11 +6,11 @@ FuchsiaBillSpeechHouse_MapScriptHeader: ; 0x1963bb db 0 ; 0x1963bd -UnknownScript_0x1963bd: ; 0x1963bd +PokefanFScript_0x1963bd: ; 0x1963bd jumptextfaceplayer UnknownText_0x1963c3 ; 0x1963c0 -UnknownScript_0x1963c0: ; 0x1963c0 +YoungsterScript_0x1963c0: ; 0x1963c0 jumptextfaceplayer UnknownText_0x1963f9 ; 0x1963c3 @@ -43,7 +43,7 @@ FuchsiaBillSpeechHouse_MapEventHeader: ; 0x196428 ; people-events db 2 - person_event $2e, 7, 6, $9, $0, 255, 255, $80, 0, UnknownScript_0x1963bd, $ffff - person_event $27, 8, 10, $4, $10, 255, 255, $0, 0, UnknownScript_0x1963c0, $ffff + person_event SPRITE_POKEFAN_F, 7, 6, $9, $0, 255, 255, $80, 0, PokefanFScript_0x1963bd, $ffff + person_event SPRITE_YOUNGSTER, 8, 10, $4, $10, 255, 255, $0, 0, YoungsterScript_0x1963c0, $ffff ; 0x196452 |