summaryrefslogtreecommitdiff
path: root/maps/SaffronMart.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/SaffronMart.asm')
-rw-r--r--maps/SaffronMart.asm21
1 files changed, 7 insertions, 14 deletions
diff --git a/maps/SaffronMart.asm b/maps/SaffronMart.asm
index fe798909b..62225d944 100644
--- a/maps/SaffronMart.asm
+++ b/maps/SaffronMart.asm
@@ -1,34 +1,29 @@
-SaffronMart_MapScriptHeader: ; 0x18a3bd
+SaffronMart_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x18a3bf
-ClerkScript_0x18a3bf: ; 0x18a3bf
+ClerkScript_0x18a3bf:
loadfont
pokemart $0, $001e
loadmovesprites
end
-; 0x18a3c6
-CooltrainerMScript_0x18a3c6: ; 0x18a3c6
+CooltrainerMScript_0x18a3c6:
jumptextfaceplayer UnknownText_0x18a3cc
-; 0x18a3c9
-CooltrainerFScript_0x18a3c9: ; 0x18a3c9
+CooltrainerFScript_0x18a3c9:
jumptextfaceplayer UnknownText_0x18a3f3
-; 0x18a3cc
-UnknownText_0x18a3cc: ; 0x18a3cc
+UnknownText_0x18a3cc:
text "There's a big"
line "RADIO TOWER in"
cont "LAVENDER."
done
-; 0x18a3f3
-UnknownText_0x18a3f3: ; 0x18a3f3
+UnknownText_0x18a3f3:
text "I want to become"
line "stronger, but I'm"
cont "not good yet…"
@@ -36,9 +31,8 @@ UnknownText_0x18a3f3: ; 0x18a3f3
para "Could you show me"
line "how sometime?"
done
-; 0x18a444
-SaffronMart_MapEventHeader: ; 0x18a444
+SaffronMart_MapEventHeader:
; filler
db 0, 0
@@ -58,4 +52,3 @@ SaffronMart_MapEventHeader: ; 0x18a444
person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x18a3bf, $ffff
person_event SPRITE_COOLTRAINER_M, 6, 11, $3, $0, 255, 255, $b0, 0, CooltrainerMScript_0x18a3c6, $ffff
person_event SPRITE_COOLTRAINER_F, 10, 11, $5, $1, 255, 255, $a0, 0, CooltrainerFScript_0x18a3c9, $ffff
-; 0x18a47b