summaryrefslogtreecommitdiff
path: root/maps/Route25.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/Route25.asm')
-rw-r--r--maps/Route25.asm358
1 files changed, 93 insertions, 265 deletions
diff --git a/maps/Route25.asm b/maps/Route25.asm
index 7babc5e90..0a1803b0a 100644
--- a/maps/Route25.asm
+++ b/maps/Route25.asm
@@ -1,27 +1,24 @@
-Route25_MapScriptHeader: ; 0x19ee94
- ; trigger count
+Route25_MapScriptHeader:
+.MapTriggers:
db 2
; triggers
dw UnknownScript_0x19ee9e, $0000
dw UnknownScript_0x19ee9f, $0000
- ; callback count
+.MapCallbacks:
db 0
-; 0x19ee9e
-UnknownScript_0x19ee9e: ; 0x19ee9e
+UnknownScript_0x19ee9e:
end
-; 0x19ee9f
-UnknownScript_0x19ee9f: ; 0x19ee9f
+UnknownScript_0x19ee9f:
end
-; 0x19eea0
-UnknownScript_0x19eea0: ; 0x19eea0
+UnknownScript_0x19eea0:
showemote $4, $2, 15
pause 30
- showemote $0, $3, 10
+ showemote EMOTE_SHOCK, $3, 10
spriteface $2, DOWN
applymovement $3, MovementData_0x19efe8
disappear $3
@@ -43,12 +40,11 @@ UnknownScript_0x19eea0: ; 0x19eea0
dotrigger $0
special RestartMapMusic
end
-; 0x19eee0
-UnknownScript_0x19eee0: ; 0x19eee0
+UnknownScript_0x19eee0:
showemote $4, $2, 15
pause 30
- showemote $0, $3, 10
+ showemote EMOTE_SHOCK, $3, 10
spriteface $2, DOWN
applymovement $3, MovementData_0x19efea
disappear $3
@@ -70,215 +66,88 @@ UnknownScript_0x19eee0: ; 0x19eee0
dotrigger $0
special RestartMapMusic
end
-; 0x19ef20
-TrainerSchoolboyDudley: ; 0x19ef20
- ; bit/flag number
- dw $472
+TrainerSchoolboyDudley:
+ trainer EVENT_BEAT_SCHOOLBOY_DUDLEY, SCHOOLBOY, DUDLEY, SchoolboyDudleySeenText, SchoolboyDudleyBeatenText, $0000, SchoolboyDudleyScript
- ; trainer group && trainer id
- db SCHOOLBOY, DUDLEY
-
- ; text when seen
- dw SchoolboyDudleySeenText
-
- ; text when trainer beaten
- dw SchoolboyDudleyBeatenText
-
- ; script when lost
- dw $0000
-
- ; script when talk again
- dw SchoolboyDudleyScript
-; 0x19ef2c
-
-SchoolboyDudleyScript: ; 0x19ef2c
+SchoolboyDudleyScript:
talkaftercancel
loadfont
writetext UnknownText_0x19f1b5
closetext
loadmovesprites
end
-; 0x19ef34
-
-TrainerLassEllen: ; 0x19ef34
- ; bit/flag number
- dw $51f
-
- ; trainer group && trainer id
- db LASS, ELLEN
-
- ; text when seen
- dw LassEllenSeenText
-
- ; text when trainer beaten
- dw LassEllenBeatenText
- ; script when lost
- dw $0000
+TrainerLassEllen:
+ trainer EVENT_BEAT_LASS_ELLEN, LASS, ELLEN, LassEllenSeenText, LassEllenBeatenText, $0000, LassEllenScript
- ; script when talk again
- dw LassEllenScript
-; 0x19ef40
-
-LassEllenScript: ; 0x19ef40
+LassEllenScript:
talkaftercancel
loadfont
writetext UnknownText_0x19f208
closetext
loadmovesprites
end
-; 0x19ef48
-
-TrainerSchoolboyJoe: ; 0x19ef48
- ; bit/flag number
- dw $473
-
- ; trainer group && trainer id
- db SCHOOLBOY, JOE
-
- ; text when seen
- dw SchoolboyJoeSeenText
-
- ; text when trainer beaten
- dw SchoolboyJoeBeatenText
- ; script when lost
- dw $0000
+TrainerSchoolboyJoe:
+ trainer EVENT_BEAT_SCHOOLBOY_JOE, SCHOOLBOY, JOE, SchoolboyJoeSeenText, SchoolboyJoeBeatenText, $0000, SchoolboyJoeScript
- ; script when talk again
- dw SchoolboyJoeScript
-; 0x19ef54
-
-SchoolboyJoeScript: ; 0x19ef54
+SchoolboyJoeScript:
talkaftercancel
loadfont
writetext UnknownText_0x19f25c
closetext
loadmovesprites
end
-; 0x19ef5c
-
-TrainerLassLaura: ; 0x19ef5c
- ; bit/flag number
- dw $51b
-
- ; trainer group && trainer id
- db LASS, LAURA
-
- ; text when seen
- dw LassLauraSeenText
- ; text when trainer beaten
- dw LassLauraBeatenText
+TrainerLassLaura:
+ trainer EVENT_BEAT_LASS_LAURA, LASS, LAURA, LassLauraSeenText, LassLauraBeatenText, $0000, LassLauraScript
- ; script when lost
- dw $0000
-
- ; script when talk again
- dw LassLauraScript
-; 0x19ef68
-
-LassLauraScript: ; 0x19ef68
+LassLauraScript:
talkaftercancel
loadfont
writetext UnknownText_0x19f2a6
closetext
loadmovesprites
end
-; 0x19ef70
-
-TrainerCamperLloyd: ; 0x19ef70
- ; bit/flag number
- dw $41f
-
- ; trainer group && trainer id
- db CAMPER, LLOYD
-
- ; text when seen
- dw CamperLloydSeenText
- ; text when trainer beaten
- dw CamperLloydBeatenText
+TrainerCamperLloyd:
+ trainer EVENT_BEAT_CAMPER_LLOYD, CAMPER, LLOYD, CamperLloydSeenText, CamperLloydBeatenText, $0000, CamperLloydScript
- ; script when lost
- dw $0000
-
- ; script when talk again
- dw CamperLloydScript
-; 0x19ef7c
-
-CamperLloydScript: ; 0x19ef7c
+CamperLloydScript:
talkaftercancel
loadfont
writetext UnknownText_0x19f2f8
closetext
loadmovesprites
end
-; 0x19ef84
-
-TrainerLassShannon: ; 0x19ef84
- ; bit/flag number
- dw $51c
-
- ; trainer group && trainer id
- db LASS, SHANNON
- ; text when seen
- dw LassShannonSeenText
+TrainerLassShannon:
+ trainer EVENT_BEAT_LASS_SHANNON, LASS, SHANNON, LassShannonSeenText, LassShannonBeatenText, $0000, LassShannonScript
- ; text when trainer beaten
- dw LassShannonBeatenText
-
- ; script when lost
- dw $0000
-
- ; script when talk again
- dw LassShannonScript
-; 0x19ef90
-
-LassShannonScript: ; 0x19ef90
+LassShannonScript:
talkaftercancel
loadfont
writetext UnknownText_0x19f35b
closetext
loadmovesprites
end
-; 0x19ef98
-
-TrainerSupernerdPat: ; 0x19ef98
- ; bit/flag number
- dw $588
-
- ; trainer group && trainer id
- db SUPER_NERD, PAT
-
- ; text when seen
- dw SupernerdPatSeenText
-
- ; text when trainer beaten
- dw SupernerdPatBeatenText
-
- ; script when lost
- dw $0000
- ; script when talk again
- dw SupernerdPatScript
-; 0x19efa4
+TrainerSupernerdPat:
+ trainer EVENT_BEAT_SUPER_NERD_PAT, SUPER_NERD, PAT, SupernerdPatSeenText, SupernerdPatBeatenText, $0000, SupernerdPatScript
-SupernerdPatScript: ; 0x19efa4
+SupernerdPatScript:
talkaftercancel
loadfont
writetext UnknownText_0x19f41a
closetext
loadmovesprites
end
-; 0x19efac
-CooltrainerMScript_0x19efac: ; 0x19efac
+CooltrainerMScript_0x19efac:
faceplayer
loadfont
- checkevent $0558
+ checkevent EVENT_BEAT_COOLTRAINERM_KEVIN
iftrue UnknownScript_0x19efda
checkevent EVENT_CLEARED_NUGGET_BRIDGE
iftrue UnknownScript_0x19efc7
@@ -287,7 +156,7 @@ CooltrainerMScript_0x19efac: ; 0x19efac
verbosegiveitem NUGGET, 1
iffalse UnknownScript_0x19efde
setevent EVENT_CLEARED_NUGGET_BRIDGE
-UnknownScript_0x19efc7: ; 0x19efc7
+UnknownScript_0x19efc7:
writetext UnknownText_0x19f49d
closetext
loadmovesprites
@@ -295,42 +164,35 @@ UnknownScript_0x19efc7: ; 0x19efc7
loadtrainer COOLTRAINERM, KEVIN
startbattle
returnafterbattle
- setevent $0558
+ setevent EVENT_BEAT_COOLTRAINERM_KEVIN
loadfont
-UnknownScript_0x19efda: ; 0x19efda
+UnknownScript_0x19efda:
writetext UnknownText_0x19f520
closetext
-UnknownScript_0x19efde: ; 0x19efde
+UnknownScript_0x19efde:
loadmovesprites
end
-; 0x19efe0
-MapRoute25Signpost0Script: ; 0x19efe0
+MapRoute25Signpost0Script:
jumptext UnknownText_0x19f567
-; 0x19efe3
-ItemFragment_0x19efe3: ; 0x19efe3
+ItemFragment_0x19efe3:
db PROTEIN, 1
-; 0x19efe5
-MapRoute25SignpostItem1: ; 0x19efe5
- dw $00f8
- db POTION
+MapRoute25SignpostItem1:
+ dwb EVENT_ROUTE_25_HIDDEN_POTION, POTION
-; 0x19efe8
-MovementData_0x19efe8: ; 0x19efe8
+MovementData_0x19efe8:
big_step_down
step_end
-; 0x19efea
-MovementData_0x19efea: ; 0x19efea
+MovementData_0x19efea:
big_step_down
big_step_down
step_end
-; 0x19efed
-MovementData_0x19efed: ; 0x19efed
+MovementData_0x19efed:
step_up
step_up
step_up
@@ -338,39 +200,34 @@ MovementData_0x19efed: ; 0x19efed
step_left
step_left
step_end
-; 0x19eff4
-MovementData_0x19eff4: ; 0x19eff4
+MovementData_0x19eff4:
step_up
step_up
step_left
step_left
step_left
step_end
-; 0x19effa
-MovementData_0x19effa: ; 0x19effa
+MovementData_0x19effa:
step_down
step_left
step_end
-; 0x19effd
-MovementData_0x19effd: ; 0x19effd
+MovementData_0x19effd:
step_up
step_left
step_end
-; 0x19f000
-MovementData_0x19f000: ; 0x19f000
+MovementData_0x19f000:
step_left
step_left
step_left
step_left
step_left
step_end
-; 0x19f006
-UnknownText_0x19f006: ; 0x19f006
+UnknownText_0x19f006:
text "MISTY: Aww! Why"
line "did you have to"
@@ -403,9 +260,8 @@ UnknownText_0x19f006: ; 0x19f006
line "GYM LEADER in"
cont "CERULEAN."
done
-; 0x19f14d
-SchoolboyDudleySeenText: ; 0x19f14d
+SchoolboyDudleySeenText:
text "Beat the six of us"
line "trainers to win a"
cont "fabulous prize!"
@@ -413,106 +269,88 @@ SchoolboyDudleySeenText: ; 0x19f14d
para "Think you've got"
line "what it takes?"
done
-; 0x19f1a2
-SchoolboyDudleyBeatenText: ; 0x19f1a2
+SchoolboyDudleyBeatenText:
text "Whoo! Good stuff."
done
-; 0x19f1b5
-UnknownText_0x19f1b5: ; 0x19f1b5
+UnknownText_0x19f1b5:
text "I did my best."
line "I have no regrets."
done
-; 0x19f1d8
-LassEllenSeenText: ; 0x19f1d8
+LassEllenSeenText:
text "I'm second."
line "Now it's serious!"
done
-; 0x19f1f5
-LassEllenBeatenText: ; 0x19f1f5
+LassEllenBeatenText:
text "How could I lose?"
done
-; 0x19f208
-UnknownText_0x19f208: ; 0x19f208
+UnknownText_0x19f208:
text "I did my best."
line "I have no regrets."
done
-; 0x19f22b
-SchoolboyJoeSeenText: ; 0x19f22b
+SchoolboyJoeSeenText:
text "Here's No. 3!"
line "I won't be easy."
done
-; 0x19f249
-SchoolboyJoeBeatenText: ; 0x19f249
+SchoolboyJoeBeatenText:
text "Ow! Stomped flat!"
done
-; 0x19f25c
-UnknownText_0x19f25c: ; 0x19f25c
+UnknownText_0x19f25c:
text "I did my best."
line "I have no regrets."
done
-; 0x19f27f
-LassLauraSeenText: ; 0x19f27f
+LassLauraSeenText:
text "I'm No. 4!"
line "Getting tired?"
done
-; 0x19f299
-LassLauraBeatenText: ; 0x19f299
+LassLauraBeatenText:
text "I lost too…"
done
-; 0x19f2a6
-UnknownText_0x19f2a6: ; 0x19f2a6
+UnknownText_0x19f2a6:
text "I did my best."
line "I have no regrets."
done
-; 0x19f2c9
-CamperLloydSeenText: ; 0x19f2c9
+CamperLloydSeenText:
text "OK! I'm No. 5."
line "I'll stomp you!"
done
-; 0x19f2e7
-CamperLloydBeatenText: ; 0x19f2e7
+CamperLloydBeatenText:
text "Whoa! Too much."
done
-; 0x19f2f8
-UnknownText_0x19f2f8: ; 0x19f2f8
+UnknownText_0x19f2f8:
text "I did my best."
line "I have no regrets."
done
-; 0x19f31b
-LassShannonSeenText: ; 0x19f31b
+LassShannonSeenText:
text "I'm the last in"
line "line, but I tell"
cont "you, I'm tough!"
done
-; 0x19f34b
-LassShannonBeatenText: ; 0x19f34b
+LassShannonBeatenText:
text "You're kidding."
done
-; 0x19f35b
-UnknownText_0x19f35b: ; 0x19f35b
+UnknownText_0x19f35b:
text "I did my best."
line "I have no regrets."
done
-; 0x19f37e
-SupernerdPatSeenText: ; 0x19f37e
+SupernerdPatSeenText:
text "Mufufufu…"
para "I have nothing to"
@@ -525,21 +363,18 @@ SupernerdPatSeenText: ; 0x19f37e
para "were tired out by"
line "all the battles."
done
-; 0x19f401
-SupernerdPatBeatenText: ; 0x19f401
+SupernerdPatBeatenText:
text "Aren't you tired"
line "at all?"
done
-; 0x19f41a
-UnknownText_0x19f41a: ; 0x19f41a
+UnknownText_0x19f41a:
text "I'm sorry… I won't"
line "cheat anymore…"
done
-; 0x19f43b
-UnknownText_0x19f43b: ; 0x19f43b
+UnknownText_0x19f43b:
text "You took on one"
line "more battle than"
@@ -549,9 +384,8 @@ UnknownText_0x19f43b: ; 0x19f43b
para "As promised, you"
line "win a prize."
done
-; 0x19f49d
-UnknownText_0x19f49d: ; 0x19f49d
+UnknownText_0x19f49d:
text "But after seeing"
line "how you battle, I"
@@ -561,15 +395,13 @@ UnknownText_0x19f49d: ; 0x19f49d
para "How about it? Let"
line "me take you on."
done
-; 0x19f4fd
-UnknownText_0x19f4fd: ; 0x19f4fd
+UnknownText_0x19f4fd:
text "I've never had a"
line "battle this good!"
done
-; 0x19f520
-UnknownText_0x19f520: ; 0x19f520
+UnknownText_0x19f520:
text "That was a great"
line "battle!"
@@ -577,48 +409,44 @@ UnknownText_0x19f520: ; 0x19f520
line "MON are truly out-"
cont "standing!"
done
-; 0x19f567
-UnknownText_0x19f567: ; 0x19f567
+UnknownText_0x19f567:
text "SEA COTTAGE"
line "BILL'S HOUSE"
done
-; 0x19f581
-UnknownText_0x19f581: ; 0x19f581
+UnknownText_0x19f581:
text "BILL'S HOUSE"
done
-; 0x19f58f
-Route25_MapEventHeader: ; 0x19f58f
+Route25_MapEventHeader:
; filler
db 0, 0
- ; warps
+.Warps:
db 1
warp_def $5, $2f, 1, GROUP_BILLS_HOUSE, MAP_BILLS_HOUSE
- ; xy triggers
+.XYTriggers:
db 2
xy_trigger 1, $6, $2a, $0, UnknownScript_0x19eea0, $0, $0
xy_trigger 1, $7, $2a, $0, UnknownScript_0x19eee0, $0, $0
- ; signposts
+.Signposts:
db 2
- signpost 5, 45, $0, MapRoute25Signpost0Script
- signpost 5, 4, $7, MapRoute25SignpostItem1
+ signpost 5, 45, SIGNPOST_READ, MapRoute25Signpost0Script
+ signpost 5, 4, SIGNPOST_ITEM, MapRoute25SignpostItem1
- ; people-events
+.PersonEvents:
db 11
- person_event SPRITE_MISTY, 13, 50, $8, $0, 255, 255, $80, 0, ObjectEvent, $076e
- person_event SPRITE_COOLTRAINER_M, 14, 50, $8, $0, 255, 255, $a0, 0, ObjectEvent, $076e
- person_event SPRITE_YOUNGSTER, 12, 16, $6, $0, 255, 255, $92, 3, TrainerSchoolboyDudley, $ffff
- person_event SPRITE_LASS, 15, 20, $7, $0, 255, 255, $92, 3, TrainerLassEllen, $ffff
- person_event SPRITE_YOUNGSTER, 12, 25, $6, $0, 255, 255, $92, 1, TrainerSchoolboyJoe, $ffff
- person_event SPRITE_LASS, 10, 26, $9, $0, 255, 255, $92, 3, TrainerLassLaura, $ffff
- person_event SPRITE_YOUNGSTER, 8, 29, $6, $0, 255, 255, $a2, 2, TrainerCamperLloyd, $ffff
- person_event SPRITE_LASS, 15, 32, $7, $0, 255, 255, $92, 1, TrainerLassShannon, $ffff
- person_event SPRITE_SUPER_NERD, 11, 35, $6, $0, 255, 255, $b2, 1, TrainerSupernerdPat, $ffff
- person_event SPRITE_COOLTRAINER_M, 12, 41, $8, $0, 255, 255, $80, 0, CooltrainerMScript_0x19efac, $ffff
- person_event SPRITE_POKE_BALL, 8, 36, $1, $0, 255, 255, $1, 0, ItemFragment_0x19efe3, $078b
-; 0x19f643
+ person_event SPRITE_MISTY, 13, 50, OW_LEFT | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ObjectEvent, EVENT_ROUTE_25_MISTY_BOYFRIEND
+ person_event SPRITE_COOLTRAINER_M, 14, 50, OW_LEFT | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ObjectEvent, EVENT_ROUTE_25_MISTY_BOYFRIEND
+ person_event SPRITE_YOUNGSTER, 12, 16, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerSchoolboyDudley, -1
+ person_event SPRITE_LASS, 15, 20, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerLassEllen, -1
+ person_event SPRITE_YOUNGSTER, 12, 25, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerSchoolboyJoe, -1
+ person_event SPRITE_LASS, 10, 26, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerLassLaura, -1
+ person_event SPRITE_YOUNGSTER, 8, 29, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 2, TrainerCamperLloyd, -1
+ person_event SPRITE_LASS, 15, 32, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerLassShannon, -1
+ person_event SPRITE_SUPER_NERD, 11, 35, OW_UP | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 1, TrainerSupernerdPat, -1
+ person_event SPRITE_COOLTRAINER_M, 12, 41, OW_LEFT | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerMScript_0x19efac, -1
+ person_event SPRITE_POKE_BALL, 8, 36, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x19efe3, EVENT_ROUTE_25_PROTEIN