summaryrefslogtreecommitdiff
path: root/maps/Route35.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/Route35.asm')
-rw-r--r--maps/Route35.asm42
1 files changed, 21 insertions, 21 deletions
diff --git a/maps/Route35.asm b/maps/Route35.asm
index afa3f8ce0..8ce6adde7 100644
--- a/maps/Route35.asm
+++ b/maps/Route35.asm
@@ -24,7 +24,7 @@ TrainerBird_keeperBryan:
Bird_keeperBryanScript:
end_if_just_battled
opentext
- writetext UnknownText_0x19cc87
+ writetext Bird_keeperBryanAfterBattleText
waitbutton
closetext
end
@@ -90,7 +90,7 @@ TrainerCamperIvan:
CamperIvanScript:
end_if_just_battled
opentext
- writetext UnknownText_0x19cac4
+ writetext CamperIvanAfterBattleText
waitbutton
closetext
end
@@ -101,7 +101,7 @@ TrainerCamperElliot:
CamperElliotScript:
end_if_just_battled
opentext
- writetext UnknownText_0x19cb47
+ writetext CamperElliotAfterBattleText
waitbutton
closetext
end
@@ -112,7 +112,7 @@ TrainerPicnickerBrooke:
PicnickerBrookeScript:
end_if_just_battled
opentext
- writetext UnknownText_0x19cbba
+ writetext PicnickerBrookeAfterBattleText
waitbutton
closetext
end
@@ -123,7 +123,7 @@ TrainerPicnickerKim:
PicnickerKimScript:
end_if_just_battled
opentext
- writetext UnknownText_0x19cc21
+ writetext PicnickerKimAfterBattleText
waitbutton
closetext
end
@@ -231,7 +231,7 @@ TrainerFirebreatherWalt:
FirebreatherWaltScript:
end_if_just_battled
opentext
- writetext UnknownText_0x19cebc
+ writetext FirebreatherWaltAfterBattleText
waitbutton
closetext
end
@@ -288,7 +288,7 @@ CamperIvanBeatenText:
text "I give!"
done
-UnknownText_0x19cac4:
+CamperIvanAfterBattleText:
text "Music on the radio"
line "changes the moods"
cont "of wild #MON."
@@ -305,7 +305,7 @@ CamperElliotBeatenText:
line "have lost for me…"
done
-UnknownText_0x19cb47:
+CamperElliotAfterBattleText:
text "I was humiliated"
line "in front of my"
cont "girlfriend…"
@@ -322,7 +322,7 @@ PicnickerBrookeBeatenText:
line "strong!"
done
-UnknownText_0x19cbba:
+PicnickerBrookeAfterBattleText:
text "I can count on my"
line "#MON more than"
cont "my boyfriend."
@@ -338,7 +338,7 @@ PicnickerKimBeatenText:
line "win…"
done
-UnknownText_0x19cc21:
+PicnickerKimAfterBattleText:
text "The GYM BADGES are"
line "pretty. I collect"
cont "them."
@@ -354,7 +354,7 @@ Bird_keeperBryanBeatenText:
line "enough!"
done
-UnknownText_0x19cc87:
+Bird_keeperBryanAfterBattleText:
text "Some #MON flee"
line "right away."
@@ -426,7 +426,7 @@ FirebreatherWaltBeatenText:
line "tip of my nose!"
done
-UnknownText_0x19cebc:
+FirebreatherWaltAfterBattleText:
text "The #MON March"
line "on the radio lures"
cont "wild #MON."
@@ -482,14 +482,14 @@ Route35_MapEventHeader:
.PersonEvents:
db 11
- person_event SPRITE_YOUNGSTER, 19, 4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 2, TrainerCamperIvan, -1
- person_event SPRITE_YOUNGSTER, 20, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 3, TrainerCamperElliot, -1
- person_event SPRITE_LASS, 20, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 3, TrainerPicnickerBrooke, -1
- person_event SPRITE_LASS, 26, 10, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 1, TrainerPicnickerKim, -1
- person_event SPRITE_YOUNGSTER, 28, 14, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 0, TrainerBird_keeperBryan, -1
- person_event SPRITE_FISHER, 10, 2, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 2, TrainerFirebreatherWalt, -1
- person_event SPRITE_BUG_CATCHER, 7, 16, SPRITEMOVEDATA_STANDING_DOWN, 0, 2, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 3, TrainerBug_catcherArnie1, -1
- person_event SPRITE_SUPER_NERD, 10, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 2, TrainerJugglerIrwin, -1
- person_event SPRITE_OFFICER, 6, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, OfficerScript_0x19ca49, -1
+ person_event SPRITE_YOUNGSTER, 19, 4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 2, TrainerCamperIvan, -1
+ person_event SPRITE_YOUNGSTER, 20, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 3, TrainerCamperElliot, -1
+ person_event SPRITE_LASS, 20, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 3, TrainerPicnickerBrooke, -1
+ person_event SPRITE_LASS, 26, 10, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 1, TrainerPicnickerKim, -1
+ person_event SPRITE_YOUNGSTER, 28, 14, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 0, TrainerBird_keeperBryan, -1
+ person_event SPRITE_FISHER, 10, 2, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 2, TrainerFirebreatherWalt, -1
+ person_event SPRITE_BUG_CATCHER, 7, 16, SPRITEMOVEDATA_STANDING_DOWN, 0, 2, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 3, TrainerBug_catcherArnie1, -1
+ person_event SPRITE_SUPER_NERD, 10, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 2, TrainerJugglerIrwin, -1
+ person_event SPRITE_OFFICER, 6, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, OfficerScript_0x19ca49, -1
person_event SPRITE_FRUIT_TREE, 25, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x19ca7e, -1
person_event SPRITE_POKE_BALL, 16, 13, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route35TMRollout, EVENT_ROUTE_35_TM_ROLLOUT