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/AzaleaMart.asm | |
| parent | bb8990dc3cb19787e08c29409cfc674e2478fbc9 (diff) | |
| parent | 0ee006a145dbe45a8844ad2dc6d8bf04b51f63bc (diff) | |
Merge branch 'sprites'
Diffstat (limited to 'maps/AzaleaMart.asm')
| -rw-r--r-- | maps/AzaleaMart.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/maps/AzaleaMart.asm b/maps/AzaleaMart.asm index 4dffd48ea..56d1f60a4 100644 --- a/maps/AzaleaMart.asm +++ b/maps/AzaleaMart.asm @@ -6,18 +6,18 @@ AzaleaMart_MapScriptHeader: ; 0x18e03e db 0 ; 0x18e040 -UnknownScript_0x18e040: ; 0x18e040 +ClerkScript_0x18e040: ; 0x18e040 loadfont pokemart $0, $0003 loadmovesprites end ; 0x18e047 -UnknownScript_0x18e047: ; 0x18e047 +CooltrainerMScript_0x18e047: ; 0x18e047 jumptextfaceplayer UnknownText_0x18e04d ; 0x18e04a -UnknownScript_0x18e04a: ; 0x18e04a +BugCatcherScript_0x18e04a: ; 0x18e04a jumptextfaceplayer UnknownText_0x18e0b6 ; 0x18e04d @@ -58,8 +58,8 @@ AzaleaMart_MapEventHeader: ; 0x18e118 ; people-events db 3 - person_event $39, 7, 5, $9, $0, 255, 255, $0, 0, UnknownScript_0x18e040, $ffff - person_event $23, 9, 6, $7, $0, 255, 255, $0, 0, UnknownScript_0x18e047, $ffff - person_event $25, 6, 11, $5, $2, 255, 255, $80, 0, UnknownScript_0x18e04a, $ffff + person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x18e040, $ffff + person_event SPRITE_COOLTRAINER_M, 9, 6, $7, $0, 255, 255, $0, 0, CooltrainerMScript_0x18e047, $ffff + person_event SPRITE_BUG_CATCHER, 6, 11, $5, $2, 255, 255, $80, 0, BugCatcherScript_0x18e04a, $ffff ; 0x18e14f |