diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2013-08-12 15:16:23 -0500 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2013-08-12 15:16:23 -0500 |
| commit | 1cb19a03a3c57c85d27495f95483b30ae37f0976 (patch) | |
| tree | 0f798841fdf32e9ee4fdee93fb0b43d8cb73fa5b /maps/VioletMart.asm | |
| parent | b676c24aefc3213d844fba9572dcb327be16a4d9 (diff) | |
| parent | 8d75f962e45694555b10ac78a3e78e3f53682db0 (diff) | |
Merge commit '8d75f96' into master
Mostly sprite stuff.
Diffstat (limited to 'maps/VioletMart.asm')
| -rw-r--r-- | maps/VioletMart.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/maps/VioletMart.asm b/maps/VioletMart.asm index ac5b39a81..dc76ba391 100644 --- a/maps/VioletMart.asm +++ b/maps/VioletMart.asm @@ -6,18 +6,18 @@ VioletMart_MapScriptHeader: ; 0x68293 db 0 ; 0x68295 -UnknownScript_0x68295: ; 0x68295 +ClerkScript_0x68295: ; 0x68295 loadfont pokemart $0, $0002 loadmovesprites end ; 0x6829c -UnknownScript_0x6829c: ; 0x6829c +GrannyScript_0x6829c: ; 0x6829c jumptextfaceplayer UnknownText_0x682a2 ; 0x6829f -UnknownScript_0x6829f: ; 0x6829f +CooltrainerMScript_0x6829f: ; 0x6829f jumptextfaceplayer UnknownText_0x68323 ; 0x682a2 @@ -60,8 +60,8 @@ VioletMart_MapEventHeader: ; 0x68389 ; people-events db 3 - person_event $39, 7, 5, $9, $0, 255, 255, $0, 0, UnknownScript_0x68295, $ffff - person_event $30, 10, 11, $5, $1, 255, 255, $0, 0, UnknownScript_0x6829c, $ffff - person_event $23, 6, 9, $3, $0, 255, 255, $80, 0, UnknownScript_0x6829f, $ffff + person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x68295, $ffff + person_event SPRITE_GRANNY, 10, 11, $5, $1, 255, 255, $0, 0, GrannyScript_0x6829c, $ffff + person_event SPRITE_COOLTRAINER_M, 6, 9, $3, $0, 255, 255, $80, 0, CooltrainerMScript_0x6829f, $ffff ; 0x683c0 |