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/PewterMart.asm | |
| parent | bb8990dc3cb19787e08c29409cfc674e2478fbc9 (diff) | |
| parent | 0ee006a145dbe45a8844ad2dc6d8bf04b51f63bc (diff) | |
Merge branch 'sprites'
Diffstat (limited to 'maps/PewterMart.asm')
| -rw-r--r-- | maps/PewterMart.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/maps/PewterMart.asm b/maps/PewterMart.asm index d066de36a..0c51f080f 100644 --- a/maps/PewterMart.asm +++ b/maps/PewterMart.asm @@ -6,18 +6,18 @@ PewterMart_MapScriptHeader: ; 0x1a2dc9 db 0 ; 0x1a2dcb -UnknownScript_0x1a2dcb: ; 0x1a2dcb +ClerkScript_0x1a2dcb: ; 0x1a2dcb loadfont pokemart $0, $0013 loadmovesprites end ; 0x1a2dd2 -UnknownScript_0x1a2dd2: ; 0x1a2dd2 +YoungsterScript_0x1a2dd2: ; 0x1a2dd2 jumptextfaceplayer UnknownText_0x1a2dd8 ; 0x1a2dd5 -UnknownScript_0x1a2dd5: ; 0x1a2dd5 +SuperNerdScript_0x1a2dd5: ; 0x1a2dd5 jumptextfaceplayer UnknownText_0x1a2e3a ; 0x1a2dd8 @@ -57,8 +57,8 @@ PewterMart_MapEventHeader: ; 0x1a2eae ; people-events db 3 - person_event $39, 7, 5, $9, $0, 255, 255, $0, 0, UnknownScript_0x1a2dcb, $ffff - person_event $27, 6, 13, $5, $2, 255, 255, $0, 0, UnknownScript_0x1a2dd2, $ffff - person_event $2b, 10, 10, $3, $0, 255, 255, $80, 0, UnknownScript_0x1a2dd5, $ffff + person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x1a2dcb, $ffff + person_event SPRITE_YOUNGSTER, 6, 13, $5, $2, 255, 255, $0, 0, YoungsterScript_0x1a2dd2, $ffff + person_event SPRITE_SUPER_NERD, 10, 10, $3, $0, 255, 255, $80, 0, SuperNerdScript_0x1a2dd5, $ffff ; 0x1a2ee5 |