diff --git a/maps/MountMoonPokecenter1F.asm b/maps/MountMoonPokecenter1F.asm
index b9d634259..b682a772a 100644
--- a/maps/MountMoonPokecenter1F.asm
+++ b/maps/MountMoonPokecenter1F.asm
@@ -18,22 +18,20 @@ MountMoonPokecenter1FLassScript:
 	jumptextfaceplayer MountMoonPokecenter1FLassText
 
 MountMoonPokecenter1FHikerText:
-	text "Oh my!"
-	line "I remember there"
+	text "Oh my! I remember"
+	line "there was nothing"
 
-	para "was nothing built"
-	line "here when I "
-	cont "climbed the"
-	cont "mountain."
+	para "built here when I"
+	line "climbed the moun-"
+	cont "tain."
 
 	para "Things change, and"
 	line "it's getting more"
-	cont "and more con-"
-	cont "venient."
+	cont "convenient."
 	done
 
 MountMoonPokecenter1FLassText:
-	text "Many Trainers are"
+	text "Many trainers are"
 	line "visiting the"
 	cont "mountain."
 
@@ -66,5 +64,5 @@ MountMoonPokecenter1F_MapEvents:
 
 	def_object_events
 	object_event  3,  1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MountMoonPokecenter1FNurseScript, -1
-	object_event  2,  5, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, MountMoonPokecenter1FHikerScript, -1
+	object_event  2,  5, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, MountMoonPokecenter1FHikerScript, -1
 	object_event  7,  4, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MountMoonPokecenter1FLassScript, -1
\ No newline at end of file
diff --git a/maps/Route17.asm b/maps/Route17.asm
index 3fa8e3989..cb3e38b47 100644
--- a/maps/Route17.asm
+++ b/maps/Route17.asm
@@ -346,7 +346,7 @@ BikerReeseAfterBattleText:
 	done
 
 BikerJosephSeenText:
-	text "Modding my Bike"
+	text "Modding my BIKE"
 	line "costs a bunch of"
 	cont "money!"
 
@@ -358,7 +358,7 @@ BikerJosephBeatenText:
 	done
 
 BikerJosephAfterBattleText:
-	text "Bike?"
+	text "BIKE?"
 
 	para "Oh, I was talking"
 	line "about my BICYCLE!"
@@ -399,7 +399,7 @@ BikerAidenBeatenText:
 	done
 
 BikerAidenAfterBattleText:
-	text "Awesome Bike!"
+	text "Awesome BIKE!"
 	line "Treat it well!"
 	done
 
@@ -445,7 +445,7 @@ BikerTheronAfterBattleText:
 
 BikerTeddySeenText:
 	text "Hey, that's a"
-	line "cool Bike you're"
+	line "cool BIKE you're"
 	cont "riding!"
 	done
 
diff --git a/maps/Route21.asm b/maps/Route21.asm
index e861a6a98..292b39129 100644
--- a/maps/Route21.asm
+++ b/maps/Route21.asm
@@ -254,7 +254,7 @@ SwimmerfChelanAfterBattleText:
 	done
 
 SwimmerfKaidynSeenText:
-	text "Hey, Trainer!"
+	text "Hey, trainer!"
 	line "How about you put"
 
 	para "on a swimsuit,"
@@ -291,7 +291,7 @@ FisherArnoldAfterBattleText:
 
 FisherMurphySeenText:
 	text "Huh? I've caught"
-	line "a Trainer instead"
+	line "a trainer instead"
 	cont "of a #MON!"
 	done
 
@@ -352,7 +352,7 @@ FisherGideonBeatenText:
 FisherGideonAfterBattleText:
 	text "What's the reason"
 	line "you became a"
-	cont "#MON Trainer?"
+	cont "#MON trainer?"
 	done
 
 BirdkeeperKarterSeenText:
@@ -393,7 +393,7 @@ BirdkeeperEastonBeatenText:
 	done
 
 BirdkeeperEastonAfterBattleText:
-	text "We Bird Keepers"
+	text "We BIRD KEEPERS"
 	line "think we're using"
 	cont "bird #MON."