Merge remote-tracking branch 'iimarckus/master'

3 files changed, 25 insertions, 25 deletions

diff --git a/text/maps/fan_club.asm b/text/maps/fan_club.asm
index a57d94a1..7e98b181 100644
--- a/text/maps/fan_club.asm
+++ b/text/maps/fan_club.asm
@@ -1,16 +1,16 @@
-_UnnamedText_59bb7:: ; 9a572 (26:6572)
+PikachuFanText::
 	text "Won't you admire"
 	line "my PIKACHU's"
 	cont "adorable tail?"
 	done
 
-_UnnamedText_59bbc:: ; 9a59e (26:659e)
+PikachuFanBetterText::
 	text "Humph! My PIKACHU"
 	line "is twice as cute"
 	cont "as that one!"
 	done
 
-_UnnamedText_59be4:: ; 9a5cf (26:65cf)
+SeelFanText::
 	text "I just love my"
 	line "SEEL!"
 
@@ -18,23 +18,23 @@ _UnnamedText_59be4:: ; 9a5cf (26:65cf)
 	line "hug it!"
 	done
 
-_UnnamedText_59be9:: ; 9a5ff (26:65ff)
+SeelFanBetterText::
 	text "Oh dear!"
 
 	para "My SEEL is far"
 	line "more attractive!"
 	done
 
-_UnnamedText_59c00:: ; 9a629 (26:6629)
+FanClubPikachuText::
 	text "PIKACHU: Chu!"
 	line "Pikachu!"
 	done
 
-_UnnamedText_59c17:: ; 9a641 (26:6641)
+FanClubSeelText::
 	text "SEEL: Kyuoo!"
 	done
 
-_UnnamedText_59c65:: ; 9a64f (26:664f)
+FanClubMeetChairText::
 	text "I chair the"
 	line "#MON Fan Club!"
 
@@ -52,7 +52,7 @@ _UnnamedText_59c65:: ; 9a64f (26:664f)
 	cont "about my #MON?"
 	done
 
-_UnnamedText_59c6a:: ; 9a6e0 (26:66e0)
+FanClubChairStoryText::
 	text "Good!"
 	line "Then listen up!"
 
@@ -82,13 +82,13 @@ _UnnamedText_59c6a:: ; 9a6e0 (26:66e0)
 	cont "you to have this!"
 	prompt
 
-_ReceivedBikeVoucherText:: ; 9a82e (26:682e)
+ReceivedBikeVoucherText::
 	text $52, " received"
 	line "a @"
 	TX_RAM $cf4b
 	text "!@@"
 
-_UnnamedText_59c74:: ; 9a844 (26:6844)
+ExplainBikeVoucherText::
 	db $0
 	para "Exchange that for"
 	line "a BICYCLE!"
@@ -104,13 +104,13 @@ _UnnamedText_59c74:: ; 9a844 (26:6844)
 	line "cycling!"
 	done
 
-_UnnamedText_59c79:: ; 9a8c3 (26:68c3)
+FanClubNoStoryText::
 	text "Oh. Come back"
 	line "when you want to"
 	cont "hear my story!"
 	done
 
-_UnnamedText_59c7e:: ; 9a8f2 (26:68f2)
+FanClubChairFinalText::
 	text "Hello, ", $52, "!"
 
 	para "Did you come see"
@@ -120,7 +120,7 @@ _UnnamedText_59c7e:: ; 9a8f2 (26:68f2)
 	para "No? Too bad!"
 	done
 
-_UnnamedText_59c83:: ; 9a933 (26:6933)
+FanClubBagFullText::
 	text "Make room for"
 	line "this!"
 	done
diff --git a/text/maps/route_11_gate_upstairs.asm b/text/maps/route_11_gate_upstairs.asm
index 507d4e19..9b329892 100644
--- a/text/maps/route_11_gate_upstairs.asm
+++ b/text/maps/route_11_gate_upstairs.asm
@@ -12,7 +12,7 @@ _UnnamedText_494a3:: ; 8c689 (23:4689)
 	cont "to look yourself!"
 	done
 
-_UnnamedText_494c4:: ; 8c71b (23:471b)
+_BinocularsSnorlaxText::
 	text "Looked into the"
 	line "binoculars."
 
@@ -20,7 +20,7 @@ _UnnamedText_494c4:: ; 8c71b (23:471b)
 	line "asleep on a road!"
 	done
 
-_UnnamedText_494c9:: ; 8c758 (23:4758)
+_BinocularsNoSnorlaxText::
 	text "Looked into the"
 	line "binoculars."
 
diff --git a/text/maps/silph_co_7f.asm b/text/maps/silph_co_7f.asm
index fbde5045..4fca7b90 100644
--- a/text/maps/silph_co_7f.asm
+++ b/text/maps/silph_co_7f.asm
@@ -1,4 +1,4 @@
-_UnnamedText_51dd3:: ; 84430 (21:4430)
+_MeetLaprasGuyText::
 	text "Oh! Hi! You're"
 	line "not a ROCKET! You"
 	cont "came to save us?"
@@ -9,7 +9,7 @@ _UnnamedText_51dd3:: ; 84430 (21:4430)
 	cont "for saving us."
 	prompt
 
-_UnnamedText_51dd8:: ; 8449e (21:449e)
+_HeresYourLaprasText::
 	text "It's LAPRAS. It's"
 	line "very intelligent."
 
@@ -27,53 +27,53 @@ _UnnamedText_51dd8:: ; 8449e (21:449e)
 	cont "give you a lift!"
 	done
 
-_UnnamedText_51ddd:: ; 8455a (21:455a)
+_LaprasGuyText::
 	text "TEAM ROCKET's"
 	line "BOSS went to the"
 	cont "boardroom! Is our"
 	cont "PRESIDENT OK?"
 	done
 
-_UnnamedText_51de2:: ; 84599 (21:4599)
+_LaprasGuySavedText::
 	text "Saved at last!"
 	line "Thank you!"
 	done
 
-_UnnamedText_51e00:: ; 845b4 (21:45b4)
+_UnnamedText_51e00::
 	text "TEAM ROCKET was"
 	line "after the MASTER"
 	cont "BALL which will"
 	cont "catch any #MON!"
 	done
 
-_UnnamedText_51e05:: ; 845f6 (21:45f6)
+_CanceledMasterBallText::
 	text "We canceled the"
 	line "MASTER BALL"
 	cont "project because"
 	cont "of TEAM ROCKET."
 	done
 
-_UnnamedText_51e23:: ; 84633 (21:4633)
+_UnnamedText_51e23::
 	text "It would be bad"
 	line "if TEAM ROCKET"
 	cont "took over SILPH"
 	cont "or our #MON!"
 	done
 
-_UnnamedText_51e28:: ; 84670 (21:4670)
+_UnnamedText_51e28::
 	text "Wow! You chased"
 	line "off TEAM ROCKET"
 	cont "all by yourself?"
 	done
 
-_UnnamedText_51e46:: ; 846a2 (21:46a2)
+_UnnamedText_51e46::
 	text "You! It's really"
 	line "dangerous here!"
 	cont "You came to save"
 	cont "me? You can't!"
 	done
 
-_UnnamedText_51e4b:: ; 846e2 (21:46e2)
+_UnnamedText_51e4b::
 	text "Safe at last!"
 	line "Oh thank you!"
 	done