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/FuchsiaMart.asm | |
| parent | b676c24aefc3213d844fba9572dcb327be16a4d9 (diff) | |
| parent | 8d75f962e45694555b10ac78a3e78e3f53682db0 (diff) | |
Merge commit '8d75f96' into master
Mostly sprite stuff.
Diffstat (limited to 'maps/FuchsiaMart.asm')
| -rw-r--r-- | maps/FuchsiaMart.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/maps/FuchsiaMart.asm b/maps/FuchsiaMart.asm index c3f6ec5de..9f4b22add 100644 --- a/maps/FuchsiaMart.asm +++ b/maps/FuchsiaMart.asm @@ -6,18 +6,18 @@ FuchsiaMart_MapScriptHeader: ; 0x195ce6 db 0 ; 0x195ce8 -UnknownScript_0x195ce8: ; 0x195ce8 +ClerkScript_0x195ce8: ; 0x195ce8 loadfont pokemart $0, $001d loadmovesprites end ; 0x195cef -UnknownScript_0x195cef: ; 0x195cef +FisherScript_0x195cef: ; 0x195cef jumptextfaceplayer UnknownText_0x195cf5 ; 0x195cf2 -UnknownScript_0x195cf2: ; 0x195cf2 +CooltrainerFScript_0x195cf2: ; 0x195cf2 jumptextfaceplayer UnknownText_0x195d36 ; 0x195cf5 @@ -52,8 +52,8 @@ FuchsiaMart_MapEventHeader: ; 0x195d6e ; people-events db 3 - person_event $39, 7, 5, $9, $0, 255, 255, $0, 0, UnknownScript_0x195ce8, $ffff - person_event $3a, 6, 7, $8, $0, 255, 255, $80, 0, UnknownScript_0x195cef, $ffff - person_event $24, 10, 11, $5, $2, 255, 255, $a0, 0, UnknownScript_0x195cf2, $ffff + person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x195ce8, $ffff + person_event SPRITE_FISHER, 6, 7, $8, $0, 255, 255, $80, 0, FisherScript_0x195cef, $ffff + person_event SPRITE_COOLTRAINER_F, 10, 11, $5, $2, 255, 255, $a0, 0, CooltrainerFScript_0x195cf2, $ffff ; 0x195da5 |