Merge branch 'master' of https://github.com/huderlem/pokered into pull-data

Conflicts:
	main.asm
	text.asm
	text/maps/route_22.asm

1 files changed, 7 insertions, 7 deletions

diff --git a/text/maps/route_22.asm b/text/maps/route_22.asm
index 6a23f425..5ce0b879 100644
--- a/text/maps/route_22.asm
+++ b/text/maps/route_22.asm
@@ -1,4 +1,4 @@
-_Route22Text_511ad:: ; 922cd (24:62cd)
+_Route22RivalBeforeBattleText1:: ; 922cd (24:62cd)
 	text $53, ": Hey!"
 	line $52, "!"
 
@@ -17,7 +17,7 @@ _Route22Text_511ad:: ; 922cd (24:62cd)
 	cont "get any stronger?"
 	done
 
-_Route22Text_511b2:: ; 9236f (24:636f)
+_Route22RivalAfterBattleText1:: ; 9236f (24:636f)
 	text "I heard #MON"
 	line "LEAGUE has many"
 	cont "tough trainers!"
@@ -31,7 +31,7 @@ _Route22Text_511b2:: ; 9236f (24:636f)
 	cont "a move on!"
 	done
 
-_Route22Text_511b7:: ; 923f4 (24:63f4)
+_Route22RivalDefeatedText1:: ; 923f4 (24:63f4)
 	text "Awww!"
 	line "You just lucked"
 	cont "out!"
@@ -46,7 +46,7 @@ _Route22Text_511bc:: ; 92410 (24:6410)
 	cont "some more too!"
 	prompt
 
-_Route22Text_511c1:: ; 92450 (24:6450)
+_Route22RivalBeforeBattleText2:: ; 92450 (24:6450)
 	text $53, ": What?"
 	line $52, "! What a"
 	cont "surprise to see"
@@ -67,7 +67,7 @@ _Route22Text_511c1:: ; 92450 (24:6450)
 	para "Come on!"
 	done
 
-_Route22Text_511c6:: ; 92506 (24:6506)
+_Route22RivalAfterBattleText2:: ; 92506 (24:6506)
 	text "That loosened me"
 	line "up! I'm ready for"
 	cont "#MON LEAGUE!"
@@ -80,7 +80,7 @@ _Route22Text_511c6:: ; 92506 (24:6506)
 	cont "here. Smell ya!"
 	done
 
-_Route22Text_511cb:: ; 92583 (24:6583)
+_Route22RivalDefeatedText2:: ; 92583 (24:6583)
 	text "What!?"
 
 	para "I was just"
@@ -98,7 +98,7 @@ _Route22Text_511d0:: ; 925a0 (24:65a0)
 	line "more! You loser!"
 	prompt
 
-_Route22Text3:: ; 92606 (24:6606)
+_Route22FrontGateText:: ; 92606 (24:6606)
 	text "#MON LEAGUE"
 	line "Front Gate"
 	done