summaryrefslogtreecommitdiff
path: root/maps/AzaleaMart.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/AzaleaMart.asm')
-rw-r--r--maps/AzaleaMart.asm39
1 files changed, 16 insertions, 23 deletions
diff --git a/maps/AzaleaMart.asm b/maps/AzaleaMart.asm
index ef1f03dd7..ab03d588f 100644
--- a/maps/AzaleaMart.asm
+++ b/maps/AzaleaMart.asm
@@ -1,27 +1,23 @@
-AzaleaMart_MapScriptHeader: ; 0x18e03e
- ; trigger count
+AzaleaMart_MapScriptHeader:
+.MapTriggers:
db 0
- ; callback count
+.MapCallbacks:
db 0
-; 0x18e040
-ClerkScript_0x18e040: ; 0x18e040
+ClerkScript_0x18e040:
loadfont
pokemart $0, $0003
loadmovesprites
end
-; 0x18e047
-CooltrainerMScript_0x18e047: ; 0x18e047
+CooltrainerMScript_0x18e047:
jumptextfaceplayer UnknownText_0x18e04d
-; 0x18e04a
-BugCatcherScript_0x18e04a: ; 0x18e04a
+BugCatcherScript_0x18e04a:
jumptextfaceplayer UnknownText_0x18e0b6
-; 0x18e04d
-UnknownText_0x18e04d: ; 0x18e04d
+UnknownText_0x18e04d:
text "There's no GREAT"
line "BALL here. #"
@@ -32,9 +28,8 @@ UnknownText_0x18e04d: ; 0x18e04d
line "make me some of"
cont "his custom BALLS."
done
-; 0x18e0b6
-UnknownText_0x18e0b6: ; 0x18e0b6
+UnknownText_0x18e0b6:
text "A GREAT BALL is"
line "better for catch-"
cont "ing #MON than a"
@@ -44,26 +39,24 @@ UnknownText_0x18e0b6: ; 0x18e0b6
line "be better some-"
cont "times."
done
-; 0x18e118
-AzaleaMart_MapEventHeader: ; 0x18e118
+AzaleaMart_MapEventHeader:
; filler
db 0, 0
- ; warps
+.Warps:
db 2
warp_def $7, $2, 3, GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN
warp_def $7, $3, 3, GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN
- ; 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_0x18e040, $ffff
- person_event SPRITE_COOLTRAINER_M, 9, 6, $7, $0, 255, 255, $0, 0, CooltrainerMScript_0x18e047, $ffff
- person_event SPRITE_BUG_CATCHER, 6, 11, $5, $2, 255, 255, $80, 0, BugCatcherScript_0x18e04a, $ffff
-; 0x18e14f
+ person_event SPRITE_CLERK, 7, 5, OW_LEFT | $1, $0, -1, -1, $0, 0, ClerkScript_0x18e040, -1
+ person_event SPRITE_COOLTRAINER_M, 9, 6, OW_UP | $3, $0, -1, -1, $0, 0, CooltrainerMScript_0x18e047, -1
+ person_event SPRITE_BUG_CATCHER, 6, 11, OW_UP | $1, $2, -1, -1, (PAL_OW_RED << 4) | $80, 0, BugCatcherScript_0x18e04a, -1