summaryrefslogtreecommitdiff
path: root/maps/Route26.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/Route26.asm')
-rw-r--r--maps/Route26.asm150
1 files changed, 27 insertions, 123 deletions
diff --git a/maps/Route26.asm b/maps/Route26.asm
index 9daa11e14..b6f5ebab6 100644
--- a/maps/Route26.asm
+++ b/maps/Route26.asm
@@ -1,28 +1,12 @@
Route26_MapScriptHeader:
- ; trigger count
+.MapTriggers:
db 0
- ; callback count
+.MapCallbacks:
db 0
TrainerCooltrainermJake:
- ; bit/flag number
- dw EVENT_BEAT_COOLTRAINERM_JAKE
-
- ; trainer group && trainer id
- db COOLTRAINERM, JAKE
-
- ; text when seen
- dw CooltrainermJakeSeenText
-
- ; text when trainer beaten
- dw CooltrainermJakeBeatenText
-
- ; script when lost
- dw $0000
-
- ; script when talk again
- dw CooltrainermJakeScript
+ trainer EVENT_BEAT_COOLTRAINERM_JAKE, COOLTRAINERM, JAKE, CooltrainermJakeSeenText, CooltrainermJakeBeatenText, $0000, CooltrainermJakeScript
CooltrainermJakeScript:
talkaftercancel
@@ -33,31 +17,15 @@ CooltrainermJakeScript:
end
TrainerCooltrainermGaven3:
- ; bit/flag number
- dw EVENT_BEAT_COOLTRAINERM_GAVEN
-
- ; trainer group && trainer id
- db COOLTRAINERM, GAVEN3
-
- ; text when seen
- dw CooltrainermGaven3SeenText
-
- ; text when trainer beaten
- dw CooltrainermGaven3BeatenText
-
- ; script when lost
- dw $0000
-
- ; script when talk again
- dw CooltrainermGaven3Script
+ trainer EVENT_BEAT_COOLTRAINERM_GAVEN, COOLTRAINERM, GAVEN3, CooltrainermGaven3SeenText, CooltrainermGaven3BeatenText, $0000, CooltrainermGaven3Script
CooltrainermGaven3Script:
- writecode VAR_CALLERID, $b
+ writecode VAR_CALLERID, PHONE_COOLTRAINERM_GAVEN
talkaftercancel
loadfont
checkflag ENGINE_GAVEN
iftrue UnknownScript_0x1a4d79
- checkcellnum $b
+ checkcellnum PHONE_COOLTRAINERM_GAVEN
iftrue UnknownScript_0x1a4dcb
checkevent EVENT_GAVEN_ASKED_FOR_PHONE_NUMBER
iftrue UnknownScript_0x1a4d62
@@ -70,7 +38,7 @@ CooltrainermGaven3Script:
UnknownScript_0x1a4d62:
scall UnknownScript_0x1a4dc3
UnknownScript_0x1a4d65:
- askforphonenumber $b
+ askforphonenumber PHONE_COOLTRAINERM_GAVEN
if_equal $1, UnknownScript_0x1a4dd3
if_equal $2, UnknownScript_0x1a4dcf
trainertotext COOLTRAINERM, GAVEN3, $0
@@ -142,23 +110,7 @@ UnknownScript_0x1a4dd7:
end
TrainerCooltrainerfJoyce:
- ; bit/flag number
- dw EVENT_BEAT_COOLTRAINERF_JOYCE
-
- ; trainer group && trainer id
- db COOLTRAINERF, JOYCE
-
- ; text when seen
- dw CooltrainerfJoyceSeenText
-
- ; text when trainer beaten
- dw CooltrainerfJoyceBeatenText
-
- ; script when lost
- dw $0000
-
- ; script when talk again
- dw CooltrainerfJoyceScript
+ trainer EVENT_BEAT_COOLTRAINERF_JOYCE, COOLTRAINERF, JOYCE, CooltrainerfJoyceSeenText, CooltrainerfJoyceBeatenText, $0000, CooltrainerfJoyceScript
CooltrainerfJoyceScript:
talkaftercancel
@@ -169,31 +121,15 @@ CooltrainerfJoyceScript:
end
TrainerCooltrainerfBeth1:
- ; bit/flag number
- dw EVENT_BEAT_COOLTRAINERF_BETH
-
- ; trainer group && trainer id
- db COOLTRAINERF, BETH1
-
- ; text when seen
- dw CooltrainerfBeth1SeenText
-
- ; text when trainer beaten
- dw CooltrainerfBeth1BeatenText
-
- ; script when lost
- dw $0000
-
- ; script when talk again
- dw CooltrainerfBeth1Script
+ trainer EVENT_BEAT_COOLTRAINERF_BETH, COOLTRAINERF, BETH1, CooltrainerfBeth1SeenText, CooltrainerfBeth1BeatenText, $0000, CooltrainerfBeth1Script
CooltrainerfBeth1Script:
- writecode VAR_CALLERID, $c
+ writecode VAR_CALLERID, PHONE_COOLTRAINERF_BETH
talkaftercancel
loadfont
checkflag ENGINE_BETH
iftrue UnknownScript_0x1a4e35
- checkcellnum $c
+ checkcellnum PHONE_COOLTRAINERF_BETH
iftrue UnknownScript_0x1a4e87
checkevent EVENT_BETH_ASKED_FOR_PHONE_NUMBER
iftrue UnknownScript_0x1a4e1e
@@ -206,7 +142,7 @@ CooltrainerfBeth1Script:
UnknownScript_0x1a4e1e:
scall UnknownScript_0x1a4e7f
UnknownScript_0x1a4e21:
- askforphonenumber $c
+ askforphonenumber PHONE_COOLTRAINERF_BETH
if_equal $1, UnknownScript_0x1a4e8f
if_equal $2, UnknownScript_0x1a4e8b
trainertotext COOLTRAINERF, BETH1, $0
@@ -278,23 +214,7 @@ UnknownScript_0x1a4e93:
end
TrainerPsychicRichard:
- ; bit/flag number
- dw EVENT_BEAT_PSYCHIC_RICHARD
-
- ; trainer group && trainer id
- db PSYCHIC_T, RICHARD
-
- ; text when seen
- dw PsychicRichardSeenText
-
- ; text when trainer beaten
- dw PsychicRichardBeatenText
-
- ; script when lost
- dw $0000
-
- ; script when talk again
- dw PsychicRichardScript
+ trainer EVENT_BEAT_PSYCHIC_RICHARD, PSYCHIC_T, RICHARD, PsychicRichardSeenText, PsychicRichardBeatenText, $0000, PsychicRichardScript
PsychicRichardScript:
talkaftercancel
@@ -305,23 +225,7 @@ PsychicRichardScript:
end
TrainerFisherScott:
- ; bit/flag number
- dw EVENT_BEAT_FISHER_SCOTT
-
- ; trainer group && trainer id
- db FISHER, SCOTT
-
- ; text when seen
- dw FisherScottSeenText
-
- ; text when trainer beaten
- dw FisherScottBeatenText
-
- ; script when lost
- dw $0000
-
- ; script when talk again
- dw FisherScottScript
+ trainer EVENT_BEAT_FISHER_SCOTT, FISHER, SCOTT, FisherScottSeenText, FisherScottBeatenText, $0000, FisherScottScript
FisherScottScript:
talkaftercancel
@@ -502,26 +406,26 @@ Route26_MapEventHeader:
; filler
db 0, 0
- ; warps
+.Warps:
db 3
warp_def $5, $7, 3, GROUP_VICTORY_ROAD_GATE, MAP_VICTORY_ROAD_GATE
warp_def $39, $f, 1, GROUP_ROUTE_26_HEAL_SPEECH_HOUSE, MAP_ROUTE_26_HEAL_SPEECH_HOUSE
warp_def $47, $5, 1, GROUP_ROUTE_26_DAY_OF_WEEK_SIBLINGS_HOUSE, MAP_ROUTE_26_DAY_OF_WEEK_SIBLINGS_HOUSE
- ; xy triggers
+.XYTriggers:
db 0
- ; signposts
+.Signposts:
db 1
- signpost 6, 8, $0, MapRoute26Signpost0Script
+ signpost 6, 8, SIGNPOST_READ, MapRoute26Signpost0Script
- ; people-events
+.PersonEvents:
db 8
- person_event SPRITE_COOLTRAINER_M, 28, 18, $8, $0, 255, 255, $82, 2, TrainerCooltrainermJake, -1
- person_event SPRITE_COOLTRAINER_M, 42, 13, $8, $0, 255, 255, $82, 3, TrainerCooltrainermGaven3, -1
- person_event SPRITE_COOLTRAINER_F, 60, 14, $a, $0, 255, 255, $82, 3, TrainerCooltrainerfJoyce, -1
- person_event SPRITE_COOLTRAINER_F, 12, 9, $9, $0, 255, 255, $82, 4, TrainerCooltrainerfBeth1, -1
- person_event SPRITE_YOUNGSTER, 83, 17, $9, $0, 255, 255, $92, 2, TrainerPsychicRichard, -1
- person_event SPRITE_FISHER, 96, 14, $6, $0, 255, 255, $a2, 3, TrainerFisherScott, -1
- person_event SPRITE_FRUIT_TREE, 58, 18, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a4ec2, -1
- person_event SPRITE_POKE_BALL, 19, 13, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a4ec4, EVENT_6AA
+ person_event SPRITE_COOLTRAINER_M, 28, 18, OW_LEFT | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 2, TrainerCooltrainermJake, -1
+ person_event SPRITE_COOLTRAINER_M, 42, 13, OW_LEFT | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerCooltrainermGaven3, -1
+ person_event SPRITE_COOLTRAINER_F, 60, 14, OW_LEFT | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerCooltrainerfJoyce, -1
+ person_event SPRITE_COOLTRAINER_F, 12, 9, OW_LEFT | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 4, TrainerCooltrainerfBeth1, -1
+ person_event SPRITE_YOUNGSTER, 83, 17, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 2, TrainerPsychicRichard, -1
+ person_event SPRITE_FISHER, 96, 14, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerFisherScott, -1
+ person_event SPRITE_FRUIT_TREE, 58, 18, OW_DOWN | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1a4ec2, -1
+ person_event SPRITE_POKE_BALL, 19, 13, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a4ec4, EVENT_ROUTE_26_MAX_ELIXER