summaryrefslogtreecommitdiff
path: root/maps/BlackthornMart.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/BlackthornMart.asm')
-rw-r--r--maps/BlackthornMart.asm39
1 files changed, 16 insertions, 23 deletions
diff --git a/maps/BlackthornMart.asm b/maps/BlackthornMart.asm
index 641aedb38..784e97203 100644
--- a/maps/BlackthornMart.asm
+++ b/maps/BlackthornMart.asm
@@ -1,27 +1,23 @@
-BlackthornMart_MapScriptHeader: ; 0x195a5b
- ; trigger count
+BlackthornMart_MapScriptHeader:
+.MapTriggers:
db 0
- ; callback count
+.MapCallbacks:
db 0
-; 0x195a5d
-ClerkScript_0x195a5d: ; 0x195a5d
+ClerkScript_0x195a5d:
loadfont
pokemart $0, $0011
loadmovesprites
end
-; 0x195a64
-CooltrainerMScript_0x195a64: ; 0x195a64
+CooltrainerMScript_0x195a64:
jumptextfaceplayer UnknownText_0x195a6a
-; 0x195a67
-BlackBeltScript_0x195a67: ; 0x195a67
+BlackBeltScript_0x195a67:
jumptextfaceplayer UnknownText_0x195ae9
-; 0x195a6a
-UnknownText_0x195a6a: ; 0x195a6a
+UnknownText_0x195a6a:
text "You can't buy MAX"
line "REVIVE, but it"
@@ -34,9 +30,8 @@ UnknownText_0x195a6a: ; 0x195a6a
para "POWER POINTS"
line "needed for moves."
done
-; 0x195ae9
-UnknownText_0x195ae9: ; 0x195ae9
+UnknownText_0x195ae9:
text "MAX REPEL keeps"
line "weak #MON away"
cont "from you."
@@ -45,26 +40,24 @@ UnknownText_0x195ae9: ; 0x195ae9
line "lasting of the"
cont "REPEL sprays."
done
-; 0x195b40
-BlackthornMart_MapEventHeader: ; 0x195b40
+BlackthornMart_MapEventHeader:
; filler
db 0, 0
- ; warps
+.Warps:
db 2
warp_def $7, $2, 4, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY
warp_def $7, $3, 4, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY
- ; xy triggers
+.XYTriggers:
db 0
- ; signposts
+.Signposts:
db 0
- ; people-events
+.PersonEvents:
db 3
- person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x195a5d, $ffff
- person_event SPRITE_COOLTRAINER_M, 10, 11, $5, $2, 255, 255, $0, 0, CooltrainerMScript_0x195a64, $ffff
- person_event SPRITE_BLACK_BELT, 6, 9, $6, $0, 255, 255, $a0, 0, BlackBeltScript_0x195a67, $ffff
-; 0x195b77
+ person_event SPRITE_CLERK, 7, 5, OW_LEFT | $1, $0, -1, -1, $0, 0, ClerkScript_0x195a5d, -1
+ person_event SPRITE_COOLTRAINER_M, 10, 11, OW_UP | $1, $2, -1, -1, $0, 0, CooltrainerMScript_0x195a64, -1
+ person_event SPRITE_BLACK_BELT, 6, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, BlackBeltScript_0x195a67, -1