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

1 files changed, 28 insertions, 32 deletions

diff --git a/text/maps/route_8.asm b/text/maps/route_8.asm
index 62e2aff3..f59feb87 100644
--- a/text/maps/route_8.asm
+++ b/text/maps/route_8.asm
@@ -1,157 +1,153 @@
-_Route8BattleText1:: ; 8dea9 (23:5ea9)
+_Route8BattleText1::
 	text "You look good at"
 	line "#MON, but"
 	cont "how's your chem?"
 	done
 
-_Route8EndBattleText1:: ; 8ded5 (23:5ed5)
+_Route8EndBattleText1::
 	text "Ow!"
 	line "Meltdown!"
 	prompt
 
-_Route8AfterBattleText1:: ; 8dee4 (23:5ee4)
+_Route8AfterBattleText1::
 	text "I am better at"
 	line "school than this!"
 	done
 
-_Route8BattleText2:: ; 8df06 (23:5f06)
+_Route8BattleText2::
 	text "All right! Let's"
 	line "roll the dice!"
 	done
 
-_Route8EndBattleText2:: ; 8df26 (23:5f26)
+_Route8EndBattleText2::
 	text "Drat!"
 	line "Came up short!"
 	prompt
 
-_Route8AfterBattleText2:: ; 8df3c (23:5f3c)
+_Route8AfterBattleText2::
 	text "Lady Luck's not"
 	line "with me today!"
 	done
 
-_Route8BattleText3:: ; 8df5b (23:5f5b)
+_Route8BattleText3::
 	text "You need strategy"
 	line "to win at this!"
 	done
 
-_Route8EndBattleText3:: ; 8df7e (23:5f7e)
+_Route8EndBattleText3::
 	text "It's"
 	line "not logical!"
 	prompt
 
-_Route8AfterBattleText3:: ; 8df90 (23:5f90)
+_Route8AfterBattleText3::
 	text "Go with GRIMER"
 	line "first...and..."
 	cont "...and...then..."
 	done
 
-_Route8BattleText4:: ; 8dfc0 (23:5fc0)
+_Route8BattleText4::
 	text "I like NIDORAN, so"
 	line "I collect them!"
 	done
 
-_Route8EndBattleText4:: ; 8dfe4 (23:5fe4)
+_Route8EndBattleText4::
 	text "Why? Why??"
 	prompt
 
-_Route8AfterBattleText4:: ; 8dff0 (23:5ff0)
+_Route8AfterBattleText4::
 	text "When #MON grow"
 	line "up they get ugly!"
 	cont "They shouldn't"
 	cont "evolve!"
 	done
 
-_Route8BattleText5:: ; 8e028 (23:6028)
+_Route8BattleText5::
 	text "School is fun, but"
 	line "so are #MON."
 	done
 
-_Route8EndBattleText5:: ; 8e049 (23:6049)
+_Route8EndBattleText5::
 	text "I'll"
 	line "stay with school."
 	prompt
 
-_Route8AfterBattleText5:: ; 8e060 (23:6060)
+_Route8AfterBattleText5::
 	text "We're stuck here"
 	line "because of the"
 	cont "gates at SAFFRON."
 	done
 
-_Route8BattleText6:: ; 8e092 (23:6092)
+_Route8BattleText6::
 	text "MEOWTH is so cute,"
 	line "meow, meow, meow!"
 	done
 
-_Route8EndBattleText6:: ; 8e0b8 (23:60b8)
+_Route8EndBattleText6::
 	text "Meow!"
 	prompt
 
-_Route8AfterBattleText6:: ; 8e0bf (23:60bf)
+_Route8AfterBattleText6::
 	text "I think PIDGEY"
 	line "and RATTATA"
 	cont "are cute too!"
 	done
 
-_Route8BattleText7:: ; 8e0e9 (23:60e9)
+_Route8BattleText7::
 	text "We must look"
 	line "silly standing"
 	cont "here like this!"
 	done
 
-_Route8EndBattleText7:: ; 8e116 (23:6116)
+_Route8EndBattleText7::
 	text "Look what"
 	line "you did!"
 	prompt
 
-_Route8AfterBattleText7:: ; 8e12a (23:612a)
-if DEF(_YELLOW)
-	text "SAFFRON's gate-"
-ELSE
+_Route8AfterBattleText7::
 	text "SAFFRON's gate"
-ENDC
 	line "keeper won't let"
 	cont "us through."
 	cont "He's so mean!"
 	done
 
-_Route8BattleText8:: ; 8e162 (23:6162)
+_Route8BattleText8::
 	text "I'm a rambling,"
 	line "gambling dude!"
 	done
 
-_Route8EndBattleText8:: ; 8e181 (23:6181)
+_Route8EndBattleText8::
 	text "Missed"
 	line "the big score!"
 	prompt
 
-_Route8AfterBattleText8:: ; 8e198 (23:6198)
+_Route8AfterBattleText8::
 	text "Gambling and"
 	line "#MON are like"
 	cont "eating peanuts!"
 	cont "Just can't stop!"
 	done
 
-_Route8BattleText9:: ; 8e1d4 (23:61d4)
+_Route8BattleText9::
 	text "What's a cute,"
 	line "round and fluffy"
 	cont "#MON?"
 	done
 
-_Route8EndBattleText9:: ; 8e1fa (23:61fa)
+_Route8EndBattleText9::
 	text "Stop!"
 
 	para "Don't be so mean"
 	line "to my CLEFAIRY!"
 	prompt
 
-_Route8AfterBattleText9:: ; 8e221 (23:6221)
+_Route8AfterBattleText9::
 	text "I heard that"
 	line "CLEFAIRY evolves"
 	cont "when it's exposed"
 	cont "to a MOON STONE."
 	done
 
-_Route8Text10:: ; 8e262 (23:6262)
+_Route8Text10::
 	text "UNDERGROUND PATH"
 	line "CELADON CITY -"
 	cont "LAVENDER TOWN"