summaryrefslogtreecommitdiff
path: root/maps/Route12.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/Route12.asm')
-rw-r--r--maps/Route12.asm24
1 files changed, 12 insertions, 12 deletions
diff --git a/maps/Route12.asm b/maps/Route12.asm
index 2a1e078f5..00c00f15f 100644
--- a/maps/Route12.asm
+++ b/maps/Route12.asm
@@ -19,7 +19,7 @@ TrainerFisherKyle:
FisherKyleScript:
end_if_just_battled
opentext
- writetext UnknownText_0x1a7238
+ writetext FisherKyleAfterBattleText
waitbutton
closetext
end
@@ -30,7 +30,7 @@ TrainerFisherMartin:
FisherMartinScript:
end_if_just_battled
opentext
- writetext UnknownText_0x1a704c
+ writetext FisherMartinAfterBattleText
waitbutton
closetext
end
@@ -41,7 +41,7 @@ TrainerFisherStephen:
FisherStephenScript:
end_if_just_battled
opentext
- writetext UnknownText_0x1a70d4
+ writetext FisherStephenAfterBattleText
waitbutton
closetext
end
@@ -52,7 +52,7 @@ TrainerFisherBarney:
FisherBarneyScript:
end_if_just_battled
opentext
- writetext UnknownText_0x1a716d
+ writetext FisherBarneyAfterBattleText
waitbutton
closetext
end
@@ -83,7 +83,7 @@ FisherMartinBeatenText:
text "Gwaaah!"
done
-UnknownText_0x1a704c:
+FisherMartinAfterBattleText:
text "I'm too impatient"
line "for fishing…"
done
@@ -100,7 +100,7 @@ FisherStephenBeatenText:
line "distracted me!"
done
-UnknownText_0x1a70d4:
+FisherStephenAfterBattleText:
text "Have you checked"
line "out KANTO's radio"
@@ -119,7 +119,7 @@ FisherBarneyBeatenText:
line "coming up next!"
done
-UnknownText_0x1a716d:
+FisherBarneyAfterBattleText:
text "I think electric-"
line "ity is the most"
@@ -144,7 +144,7 @@ FisherKyleBeatenText:
text "You do remember?"
done
-UnknownText_0x1a7238:
+FisherKyleAfterBattleText:
text "The tug you feel"
line "on the ROD when"
@@ -186,9 +186,9 @@ Route12_MapEventHeader:
.PersonEvents:
db 6
- person_event SPRITE_FISHER, 13, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 1, TrainerFisherMartin, -1
- person_event SPRITE_FISHER, 23, 14, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 1, TrainerFisherStephen, -1
- person_event SPRITE_FISHER, 38, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 5, TrainerFisherBarney, -1
- person_event SPRITE_FISHER, 7, 6, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 3, TrainerFisherKyle, -1
+ person_event SPRITE_FISHER, 13, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 1, TrainerFisherMartin, -1
+ person_event SPRITE_FISHER, 23, 14, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 1, TrainerFisherStephen, -1
+ person_event SPRITE_FISHER, 38, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 5, TrainerFisherBarney, -1
+ person_event SPRITE_FISHER, 7, 6, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 3, TrainerFisherKyle, -1
person_event SPRITE_POKE_BALL, 43, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route12Calcium, EVENT_ROUTE_12_CALCIUM
person_event SPRITE_POKE_BALL, 51, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route12Nugget, EVENT_ROUTE_12_NUGGET