summaryrefslogtreecommitdiff
path: root/maps/Route46.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/Route46.asm')
-rw-r--r--maps/Route46.asm242
1 files changed, 78 insertions, 164 deletions
diff --git a/maps/Route46.asm b/maps/Route46.asm
index 2853cdd9a..58cd08645 100644
--- a/maps/Route46.asm
+++ b/maps/Route46.asm
@@ -1,299 +1,217 @@
-Route46_MapScriptHeader: ; 0x1a967e
- ; trigger count
+Route46_MapScriptHeader:
+.MapTriggers:
db 0
- ; callback count
+.MapCallbacks:
db 0
-; 0x1a9680
-TrainerCamperTed: ; 0x1a9680
- ; bit/flag number
- dw $424
+TrainerCamperTed:
+ trainer EVENT_BEAT_CAMPER_TED, CAMPER, TED, CamperTedSeenText, CamperTedBeatenText, $0000, CamperTedScript
- ; trainer group && trainer id
- db CAMPER, TED
-
- ; text when seen
- dw CamperTedSeenText
-
- ; text when trainer beaten
- dw CamperTedBeatenText
-
- ; script when lost
- dw $0000
-
- ; script when talk again
- dw CamperTedScript
-; 0x1a968c
-
-CamperTedScript: ; 0x1a968c
+CamperTedScript:
talkaftercancel
loadfont
writetext UnknownText_0x1a9851
closetext
loadmovesprites
end
-; 0x1a9694
-
-TrainerPicnickerErin1: ; 0x1a9694
- ; bit/flag number
- dw $487
-
- ; trainer group && trainer id
- db PICNICKER, ERIN1
-
- ; text when seen
- dw PicnickerErin1SeenText
- ; text when trainer beaten
- dw PicnickerErin1BeatenText
+TrainerPicnickerErin1:
+ trainer EVENT_BEAT_PICNICKER_ERIN, PICNICKER, ERIN1, PicnickerErin1SeenText, PicnickerErin1BeatenText, $0000, PicnickerErin1Script
- ; script when lost
- dw $0000
-
- ; script when talk again
- dw PicnickerErin1Script
-; 0x1a96a0
-
-PicnickerErin1Script: ; 0x1a96a0
- writecode $17, $24
+PicnickerErin1Script:
+ writecode VAR_CALLERID, PHONE_PICNICKER_ERIN
talkaftercancel
loadfont
- checkflag $007c
+ checkflag ENGINE_ERIN
iftrue UnknownScript_0x1a96da
- checkcellnum $24
+ checkcellnum PHONE_PICNICKER_ERIN
iftrue UnknownScript_0x1a975b
- checkevent $029d
+ checkevent EVENT_ERIN_ASKED_FOR_PHONE_NUMBER
iftrue UnknownScript_0x1a96c3
writetext UnknownText_0x1a98c6
keeptextopen
- setevent $029d
+ setevent EVENT_ERIN_ASKED_FOR_PHONE_NUMBER
scall UnknownScript_0x1a974f
jump UnknownScript_0x1a96c6
-; 0x1a96c3
-UnknownScript_0x1a96c3: ; 0x1a96c3
+UnknownScript_0x1a96c3:
scall UnknownScript_0x1a9753
-UnknownScript_0x1a96c6: ; 0x1a96c6
- askforphonenumber $24
+UnknownScript_0x1a96c6:
+ askforphonenumber PHONE_PICNICKER_ERIN
if_equal $1, UnknownScript_0x1a9763
if_equal $2, UnknownScript_0x1a975f
trainertotext PICNICKER, ERIN1, $0
scall UnknownScript_0x1a9757
jump UnknownScript_0x1a975b
-; 0x1a96da
-UnknownScript_0x1a96da: ; 0x1a96da
+UnknownScript_0x1a96da:
scall UnknownScript_0x1a9767
winlosstext PicnickerErin1BeatenText, $0000
- copybytetovar wda0d
- if_equal $2, UnknownScript_0x1a96f1
- if_equal $1, UnknownScript_0x1a96f7
- if_equal $0, UnknownScript_0x1a96fd
-UnknownScript_0x1a96f1: ; 0x1a96f1
+ copybytetovar wErinFightCount
+ if_equal 2, .Fight2
+ if_equal 1, .Fight1
+ if_equal 0, .LoadFight0
+.Fight2
checkevent EVENT_RESTORED_POWER_TO_KANTO
- iftrue UnknownScript_0x1a9717
-UnknownScript_0x1a96f7: ; 0x1a96f7
+ iftrue .LoadFight2
+.Fight1
checkevent EVENT_BEAT_ELITE_FOUR
- iftrue UnknownScript_0x1a970a
-UnknownScript_0x1a96fd: ; 0x1a96fd
+ iftrue .LoadFight1
+.LoadFight0
loadtrainer PICNICKER, ERIN1
startbattle
returnafterbattle
- loadvar wda0d, $1
- clearflag $007c
+ loadvar wErinFightCount, 1
+ clearflag ENGINE_ERIN
end
-; 0x1a970a
-UnknownScript_0x1a970a: ; 0x1a970a
+.LoadFight1
loadtrainer PICNICKER, ERIN2
startbattle
returnafterbattle
- loadvar wda0d, $2
- clearflag $007c
+ loadvar wErinFightCount, 2
+ clearflag ENGINE_ERIN
end
-; 0x1a9717
-UnknownScript_0x1a9717: ; 0x1a9717
+.LoadFight2
loadtrainer PICNICKER, ERIN3
startbattle
returnafterbattle
- clearflag $007c
+ clearflag ENGINE_ERIN
checkevent EVENT_ERIN_CALCIUM
iftrue UnknownScript_0x1a973b
- checkevent $0269
+ checkevent EVENT_GOT_CALCIUM_FROM_ERIN
iftrue UnknownScript_0x1a973a
scall UnknownScript_0x1a9772
verbosegiveitem CALCIUM, 1
iffalse UnknownScript_0x1a976b
- setevent $0269
+ setevent EVENT_GOT_CALCIUM_FROM_ERIN
jump UnknownScript_0x1a975b
-; 0x1a973a
-UnknownScript_0x1a973a: ; 0x1a973a
+UnknownScript_0x1a973a:
end
-; 0x1a973b
-UnknownScript_0x1a973b: ; 0x1a973b
+UnknownScript_0x1a973b:
loadfont
writetext UnknownText_0x1a9927
closetext
verbosegiveitem CALCIUM, 1
iffalse UnknownScript_0x1a976b
clearevent EVENT_ERIN_CALCIUM
- setevent $0269
+ setevent EVENT_GOT_CALCIUM_FROM_ERIN
jump UnknownScript_0x1a975b
-; 0x1a974f
-UnknownScript_0x1a974f: ; 0x1a974f
+UnknownScript_0x1a974f:
jumpstd asknumber1f
end
-; 0x1a9753
-UnknownScript_0x1a9753: ; 0x1a9753
+UnknownScript_0x1a9753:
jumpstd asknumber2f
end
-; 0x1a9757
-UnknownScript_0x1a9757: ; 0x1a9757
+UnknownScript_0x1a9757:
jumpstd registerednumberf
end
-; 0x1a975b
-UnknownScript_0x1a975b: ; 0x1a975b
+UnknownScript_0x1a975b:
jumpstd numberacceptedf
end
-; 0x1a975f
-UnknownScript_0x1a975f: ; 0x1a975f
+UnknownScript_0x1a975f:
jumpstd numberdeclinedf
end
-; 0x1a9763
-UnknownScript_0x1a9763: ; 0x1a9763
+UnknownScript_0x1a9763:
jumpstd phonefullf
end
-; 0x1a9767
-UnknownScript_0x1a9767: ; 0x1a9767
+UnknownScript_0x1a9767:
jumpstd rematchf
end
-; 0x1a976b
-UnknownScript_0x1a976b: ; 0x1a976b
+UnknownScript_0x1a976b:
setevent EVENT_ERIN_CALCIUM
jumpstd packfullf
end
-; 0x1a9772
-UnknownScript_0x1a9772: ; 0x1a9772
+UnknownScript_0x1a9772:
jumpstd rematchgiftf
end
-; 0x1a9776
-
-TrainerHikerBailey: ; 0x1a9776
- ; bit/flag number
- dw $52e
-
- ; trainer group && trainer id
- db HIKER, BAILEY
-
- ; text when seen
- dw HikerBaileySeenText
-
- ; text when trainer beaten
- dw HikerBaileyBeatenText
-
- ; script when lost
- dw $0000
- ; script when talk again
- dw HikerBaileyScript
-; 0x1a9782
+TrainerHikerBailey:
+ trainer EVENT_BEAT_HIKER_BAILEY, HIKER, BAILEY, HikerBaileySeenText, HikerBaileyBeatenText, $0000, HikerBaileyScript
-HikerBaileyScript: ; 0x1a9782
+HikerBaileyScript:
talkaftercancel
loadfont
writetext UnknownText_0x1a97e8
closetext
loadmovesprites
end
-; 0x1a978a
-MapRoute46Signpost0Script: ; 0x1a978a
+MapRoute46Signpost0Script:
jumptext UnknownText_0x1a99be
-; 0x1a978d
-ItemFragment_0x1a978d: ; 0x1a978d
+ItemFragment_0x1a978d:
db X_SPEED, 1
-; 0x1a978f
-FruitTreeScript_0x1a978f: ; 0x1a978f
+FruitTreeScript_0x1a978f:
fruittree $4
-; 0x1a9791
-FruitTreeScript_0x1a9791: ; 0x1a9791
+FruitTreeScript_0x1a9791:
fruittree $a
-; 0x1a9793
-HikerBaileySeenText: ; 0x1a9793
+HikerBaileySeenText:
text "Awright! I'll show"
line "you the power of"
cont "mountain #MON!"
done
-; 0x1a97c6
-HikerBaileyBeatenText: ; 0x1a97c6
+HikerBaileyBeatenText:
text "Mercy! You showed"
line "me your power!"
done
-; 0x1a97e8
-UnknownText_0x1a97e8: ; 0x1a97e8
+UnknownText_0x1a97e8:
text "It's over. I don't"
line "mind. We HIKERS"
cont "are like that."
done
-; 0x1a9819
-CamperTedSeenText: ; 0x1a9819
+CamperTedSeenText:
text "I'm raising #-"
line "MON too!"
para "Will you battle"
line "with me?"
done
-; 0x1a984a
-CamperTedBeatenText: ; 0x1a984a
+CamperTedBeatenText:
text "Wha…?"
done
-; 0x1a9851
-UnknownText_0x1a9851: ; 0x1a9851
+UnknownText_0x1a9851:
text "I did my best but"
line "came up short."
para "No excuses--I"
line "admit I lost."
done
-; 0x1a988f
-PicnickerErin1SeenText: ; 0x1a988f
+PicnickerErin1SeenText:
text "I raise #MON"
line "too!"
para "Will you battle"
line "with me?"
done
-; 0x1a98bb
-PicnickerErin1BeatenText: ; 0x1a98bb
+PicnickerErin1BeatenText:
text "Oh, rats!"
done
-; 0x1a98c6
-UnknownText_0x1a98c6: ; 0x1a98c6
+UnknownText_0x1a98c6:
text "I've been to many"
line "GYMS, but the GYM"
@@ -303,9 +221,8 @@ UnknownText_0x1a98c6: ; 0x1a98c6
para "It's filled with"
line "pretty flowers!"
done
-; 0x1a9927
-UnknownText_0x1a9927: ; 0x1a9927
+UnknownText_0x1a9927:
text "Aww… I keep losing"
line "all the time!"
@@ -319,37 +236,34 @@ UnknownText_0x1a9927: ; 0x1a9927
line "that present from"
cont "the other time."
done
-; 0x1a99be
-UnknownText_0x1a99be: ; 0x1a99be
+UnknownText_0x1a99be:
text "ROUTE 46"
line "MOUNTAIN RD. AHEAD"
done
-; 0x1a99db
-Route46_MapEventHeader: ; 0x1a99db
+Route46_MapEventHeader:
; filler
db 0, 0
- ; warps
+.Warps:
db 3
warp_def $21, $7, 1, GROUP_ROUTE_29_46_GATE, MAP_ROUTE_29_46_GATE
warp_def $21, $8, 2, GROUP_ROUTE_29_46_GATE, MAP_ROUTE_29_46_GATE
warp_def $5, $e, 3, GROUP_DARK_CAVE_VIOLET_ENTRANCE, MAP_DARK_CAVE_VIOLET_ENTRANCE
- ; xy triggers
+.XYTriggers:
db 0
- ; signposts
+.Signposts:
db 1
- signpost 27, 9, $0, MapRoute46Signpost0Script
+ signpost 27, 9, SIGNPOST_READ, MapRoute46Signpost0Script
- ; people-events
+.PersonEvents:
db 6
- person_event SPRITE_POKEFAN_M, 23, 16, $8, $0, 255, 255, $b2, 2, TrainerHikerBailey, $ffff
- person_event SPRITE_YOUNGSTER, 18, 8, $7, $0, 255, 255, $a2, 2, TrainerCamperTed, $ffff
- person_event SPRITE_LASS, 17, 6, $6, $0, 255, 255, $a2, 2, TrainerPicnickerErin1, $ffff
- person_event SPRITE_FRUIT_TREE, 9, 11, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a978f, $ffff
- person_event SPRITE_FRUIT_TREE, 10, 12, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a9791, $ffff
- person_event SPRITE_POKE_BALL, 19, 5, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a978d, $06bc
-; 0x1a9a43
+ person_event SPRITE_POKEFAN_M, 23, 16, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 2, TrainerHikerBailey, -1
+ person_event SPRITE_YOUNGSTER, 18, 8, OW_UP | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 2, TrainerCamperTed, -1
+ person_event SPRITE_LASS, 17, 6, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 2, TrainerPicnickerErin1, -1
+ person_event SPRITE_FRUIT_TREE, 9, 11, OW_DOWN | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1a978f, -1
+ person_event SPRITE_FRUIT_TREE, 10, 12, OW_DOWN | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1a9791, -1
+ person_event SPRITE_POKE_BALL, 19, 5, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a978d, EVENT_ROUTE_46_X_SPEED