summaryrefslogtreecommitdiff
path: root/maps/Route4.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/Route4.asm')
-rw-r--r--maps/Route4.asm18
1 files changed, 9 insertions, 9 deletions
diff --git a/maps/Route4.asm b/maps/Route4.asm
index bfea8c8aa..b674afdad 100644
--- a/maps/Route4.asm
+++ b/maps/Route4.asm
@@ -17,7 +17,7 @@ TrainerBird_keeperHank:
Bird_keeperHankScript:
end_if_just_battled
opentext
- writetext UnknownText_0x1ae258
+ writetext Bird_keeperHankAfterBattleText
waitbutton
closetext
end
@@ -28,7 +28,7 @@ TrainerPicnickerHope:
PicnickerHopeScript:
end_if_just_battled
opentext
- writetext UnknownText_0x1ae320
+ writetext PicnickerHopeAfterBattleText
waitbutton
closetext
end
@@ -39,7 +39,7 @@ TrainerPicnickerSharon:
PicnickerSharonScript:
end_if_just_battled
opentext
- writetext UnknownText_0x1ae369
+ writetext PicnickerSharonAfterBattleText
waitbutton
closetext
end
@@ -65,7 +65,7 @@ Bird_keeperHankBeatenText:
line "one…"
done
-UnknownText_0x1ae258:
+Bird_keeperHankAfterBattleText:
text "If you have a"
line "specific #MON"
@@ -92,7 +92,7 @@ PicnickerHopeBeatenText:
line "strong."
done
-UnknownText_0x1ae320:
+PicnickerHopeAfterBattleText:
text "I heard CLEFAIRY"
line "appear at MT.MOON."
@@ -109,7 +109,7 @@ PicnickerSharonBeatenText:
text "…"
done
-UnknownText_0x1ae369:
+PicnickerSharonAfterBattleText:
text "……I'll go train"
line "some more…"
done
@@ -139,7 +139,7 @@ Route4_MapEventHeader:
.PersonEvents:
db 4
- person_event SPRITE_YOUNGSTER, 9, 17, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerBird_keeperHank, -1
- person_event SPRITE_LASS, 8, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 4, TrainerPicnickerHope, -1
- person_event SPRITE_LASS, 6, 21, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 4, TrainerPicnickerSharon, -1
+ person_event SPRITE_YOUNGSTER, 9, 17, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerBird_keeperHank, -1
+ person_event SPRITE_LASS, 8, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 4, TrainerPicnickerHope, -1
+ person_event SPRITE_LASS, 6, 21, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 4, TrainerPicnickerSharon, -1
person_event SPRITE_POKE_BALL, 3, 26, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route4HPUp, EVENT_ROUTE_4_HP_UP