Merge branch 'master' of https://github.com/pret/pokered

1 files changed, 19 insertions, 19 deletions

diff --git a/text/SSAnne2FRooms.asm b/text/SSAnne2FRooms.asm
index c9b29119..699eb777 100644
--- a/text/SSAnne2FRooms.asm
+++ b/text/SSAnne2FRooms.asm
@@ -1,4 +1,4 @@
-_SSAnne9Text_61bf2::
+_SSAnne2FRoomsGentleman3Text::
 	text "In all my travels,"
 	line "I've never seen"
 	cont "any #MON sleep"
@@ -8,46 +8,46 @@ _SSAnne9Text_61bf2::
 	line "like this!"
 	prompt
 
-_SSAnne9Text_61c01::
+_SSAnne2FRoomsGentleman4Text::
 	text "Ah yes, I have"
 	line "seen some #MON"
 	cont "ferry people"
 	cont "across the water!"
 	done
 
-_SSAnne9Text_61c10::
+_SSAnne2FRoomsGrampsText::
 	text "#MON can CUT"
 	line "down small bushes."
 	done
 
-_SSAnne9BattleText1::
+_SSAnne2FRoomsGentleman1BattleText::
 	text "Competing against"
 	line "the young keeps"
 	cont "me youthful."
 	done
 
-_SSAnne9EndBattleText1::
+_SSAnne2FRoomsGentleman1EndBattleText::
 	text "Good"
 	line "fight! Ah, I feel"
 	cont "young again!"
 	prompt
 
-_SSAnne9AfterBattleText1::
+_SSAnne2FRoomsGentleman1AfterBattleText::
 	text "15 years ago, I"
 	line "would have won!"
 	done
 
-_SSAnne9BattleText2::
+_SSAnne2FRoomsFisherBattleText::
 	text "Check out what I"
 	line "fished up!"
 	done
 
-_SSAnne9EndBattleText2::
+_SSAnne2FRoomsFisherEndBattleText::
 	text "I'm"
 	line "all out!"
 	prompt
 
-_SSAnne9AfterBattleText2::
+_SSAnne2FRoomsFisherAfterBattleText::
 	text "Party?"
 
 	para "The cruise ship's"
@@ -55,38 +55,38 @@ _SSAnne9AfterBattleText2::
 	cont "over by now."
 	done
 
-_SSAnne9BattleText3::
+_SSAnne2FRoomsGentleman2BattleText::
 	text "Which do you like,"
 	line "a strong or a"
 	cont "rare #MON?"
 	done
 
-_SSAnne9EndBattleText3::
+_SSAnne2FRoomsGentleman2EndBattleText::
 	text "I must"
 	line "salute you!"
 	prompt
 
-_SSAnne9AfterBattleText3::
+_SSAnne2FRoomsGentleman2AfterBattleText::
 	text "I prefer strong"
 	line "and rare #MON."
 	done
 
-_SSAnne9BattleText4::
+_SSAnne2FRoomsCooltrainerFBattleText::
 	text "I never saw you"
 	line "at the party."
 	done
 
-_SSAnne9EndBattleText4::
+_SSAnne2FRoomsCooltrainerFEndBattleText::
 	text "Take"
 	line "it easy!"
 	prompt
 
-_SSAnne9AfterBattleText4::
+_SSAnne2FRoomsCooltrainerFAfterBattleText::
 	text "Oh, I adore your"
 	line "strong #MON!"
 	done
 
-_SSAnne9Text_61c1f::
+_SSAnne2FRoomsGentleman5Text::
 	text "Have you gone to"
 	line "the SAFARI ZONE"
 	cont "in FUCHSIA CITY?"
@@ -95,19 +95,19 @@ _SSAnne9Text_61c1f::
 	line "kinds of #MON!!"
 	done
 
-_SSAnne9Text_61c2e::
+_SSAnne2FRoomsLittleBoyText::
 	text "Me and my Daddy"
 	line "think the SAFARI"
 	cont "ZONE is awesome!"
 	done
 
-_SSAnne9Text_61c3d::
+_SSAnne2FRoomsBrunetteGirlText::
 	text "The CAPTAIN looked"
 	line "really sick and"
 	cont "pale!"
 	done
 
-_SSAnne9Text_61c4c::
+_SSAnne2FRoomsBeautyText::
 	text "I hear many people"
 	line "get seasick!"
 	done