summaryrefslogtreecommitdiff
path: root/maps/Route14.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/Route14.asm')
-rw-r--r--maps/Route14.asm22
1 files changed, 11 insertions, 11 deletions
diff --git a/maps/Route14.asm b/maps/Route14.asm
index fabb3af5c..841ee2c97 100644
--- a/maps/Route14.asm
+++ b/maps/Route14.asm
@@ -14,7 +14,7 @@ Route14_MapScriptHeader:
Kim:
faceplayer
opentext
- trade $5
+ trade NPCTRADE_KIM
waitbutton
closetext
end
@@ -25,7 +25,7 @@ TrainerPokefanmCarter:
PokefanmCarterScript:
end_if_just_battled
opentext
- writetext UnknownText_0x1ad508
+ writetext PokefanmCarterAfterBattleText
waitbutton
closetext
end
@@ -36,7 +36,7 @@ TrainerBird_keeperRoy:
Bird_keeperRoyScript:
end_if_just_battled
opentext
- writetext UnknownText_0x1ad5a4
+ writetext Bird_keeperRoyAfterBattleText
waitbutton
closetext
end
@@ -47,7 +47,7 @@ TrainerPokefanmTrevor:
PokefanmTrevorScript:
end_if_just_battled
opentext
- writetext UnknownText_0x1ad660
+ writetext PokefanmTrevorAfterBattleText
waitbutton
closetext
end
@@ -64,7 +64,7 @@ PokefanmCarterBeatenText:
text "Awaaah!"
done
-UnknownText_0x1ad508:
+PokefanmCarterAfterBattleText:
text "SQUIRTLE, CHARMAN-"
line "DER and BULBASAUR…"
@@ -83,7 +83,7 @@ Bird_keeperRoyBeatenText:
line "can't ever fly…"
done
-UnknownText_0x1ad5a4:
+Bird_keeperRoyAfterBattleText:
text "You have #MON"
line "that know the HM"
@@ -107,7 +107,7 @@ PokefanmTrevorBeatenText:
line "this PSYDUCK?"
done
-UnknownText_0x1ad660:
+PokefanmTrevorAfterBattleText:
text "If only there were"
line "an easy way to"
@@ -130,7 +130,7 @@ Route14_MapEventHeader:
.PersonEvents:
db 4
- person_event SPRITE_POKEFAN_M, 15, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerPokefanmCarter, -1
- person_event SPRITE_YOUNGSTER, 27, 11, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerBird_keeperRoy, -1
- person_event SPRITE_POKEFAN_M, 11, 6, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerPokefanmTrevor, -1
- person_event SPRITE_TEACHER, 5, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 4, Kim, -1
+ person_event SPRITE_POKEFAN_M, 15, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerPokefanmCarter, -1
+ person_event SPRITE_YOUNGSTER, 27, 11, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerBird_keeperRoy, -1
+ person_event SPRITE_POKEFAN_M, 11, 6, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerPokefanmTrevor, -1
+ person_event SPRITE_TEACHER, 5, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 4, Kim, -1