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/CeruleanMart.asm | |
| parent | bb8990dc3cb19787e08c29409cfc674e2478fbc9 (diff) | |
| parent | 0ee006a145dbe45a8844ad2dc6d8bf04b51f63bc (diff) | |
Merge branch 'sprites'
Diffstat (limited to 'maps/CeruleanMart.asm')
| -rw-r--r-- | maps/CeruleanMart.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/maps/CeruleanMart.asm b/maps/CeruleanMart.asm index 14bd3e3b5..79d6927f8 100644 --- a/maps/CeruleanMart.asm +++ b/maps/CeruleanMart.asm @@ -6,18 +6,18 @@ CeruleanMart_MapScriptHeader: ; 0x188abe db 0 ; 0x188ac0 -UnknownScript_0x188ac0: ; 0x188ac0 +ClerkScript_0x188ac0: ; 0x188ac0 loadfont pokemart $0, $0014 loadmovesprites end ; 0x188ac7 -UnknownScript_0x188ac7: ; 0x188ac7 +CooltrainerMScript_0x188ac7: ; 0x188ac7 jumptextfaceplayer UnknownText_0x188acd ; 0x188aca -UnknownScript_0x188aca: ; 0x188aca +CooltrainerFScript_0x188aca: ; 0x188aca jumptextfaceplayer UnknownText_0x188b46 ; 0x188acd @@ -57,8 +57,8 @@ CeruleanMart_MapEventHeader: ; 0x188b9b ; people-events db 3 - person_event $39, 7, 5, $9, $0, 255, 255, $0, 0, UnknownScript_0x188ac0, $ffff - person_event $23, 10, 5, $6, $0, 255, 255, $a0, 0, UnknownScript_0x188ac7, $ffff - person_event $24, 6, 11, $5, $2, 255, 255, $80, 0, UnknownScript_0x188aca, $ffff + person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x188ac0, $ffff + person_event SPRITE_COOLTRAINER_M, 10, 5, $6, $0, 255, 255, $a0, 0, CooltrainerMScript_0x188ac7, $ffff + person_event SPRITE_COOLTRAINER_F, 6, 11, $5, $2, 255, 255, $80, 0, CooltrainerFScript_0x188aca, $ffff ; 0x188bd2 |