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

1 files changed, 28 insertions, 45 deletions

diff --git a/text/maps/route_9.asm b/text/maps/route_9.asm
index 353eb779..c440eca9 100644
--- a/text/maps/route_9.asm
+++ b/text/maps/route_9.asm
@@ -1,91 +1,74 @@
-_Route9BattleText1:: ; 8e291 (23:6291)
+_Route9BattleText1::
 	text "You have #MON"
 	line "with you!"
 	cont "You're mine!"
 	done
 
-_Route9EndBattleText1:: ; 8e2b6 (23:62b6)
+_Route9EndBattleText1::
 	text "You"
 	line "deceived me!"
 	prompt
 
-_Route9AfterBattleText1:: ; 8e2c8 (23:62c8)
+_Route9AfterBattleText1::
 	text "You need light to"
 	line "get through that"
 	cont "dark tunnel ahead."
 	done
 
-IF DEF(_YELLOW)
-_Route9BattleTextAJ::
-	text "I aim to be the"
-	line "ultimate trainer!"
-	done
-
-_Route9EndBattleTextAJ::
-	text "My"
-	line "SANDSHREW lost?"
-	prompt
-
-_Route9AfterBattleTextAJ::
-	text "I'll restart my"
-	line "100-win streak"
-	cont "with SANDSHREW."
-ENDC
-
-_Route9BattleText2:: ; 8e2ff (23:62ff)
+_Route9BattleText2::
 	text "Who's that walking"
 	line "with those good"
 	cont "looking #MON?"
 	done
 
-_Route9EndBattleText2:: ; 8e330 (23:6330)
+_Route9EndBattleText2::
 	text "Out"
 	line "like a light!"
 	prompt
 
-_Route9AfterBattleText2:: ; 8e343 (23:6343)
+_Route9AfterBattleText2::
 	text "Keep walking!"
 	done
 
-_Route9BattleText3:: ; 8e352 (23:6352)
+_Route9BattleText3::
 	text "I'm taking ROCK"
 	line "TUNNEL to go to"
 	cont "LAVENDER..."
 	done
 
-_Route9EndBattleText3:: ; 8e37e (23:637e)
+_Route9EndBattleText3::
 	text "Can't"
 	line "measure up!"
 	prompt
 
-_Route9AfterBattleText3:: ; 8e390 (23:6390)
+_Route9AfterBattleText3::
 	text "Are you off to"
 	line "ROCK TUNNEL too?"
 	done
 
-_Route9BattleText4:: ; 8e3b1 (23:63b1)
+_Route9BattleText4::
 	text "Don't you dare"
 	line "condescend me!"
 	done
 
-_Route9EndBattleText4:: ; 8e3cf (23:63cf)
+_Route9EndBattleText4::
 	text "No!"
 	line "You're too much!"
 	prompt
 
-_Route9AfterBattleText4:: ; 8e3e4 (23:63e4)
+_Route9AfterBattleText4::
 	text "You're obviously"
 	line "talented! Good"
 	cont "luck to you!"
 	done
 
-_Route9BattleText5:: ; 8e411 (23:6411)
+_Route9BattleText5::
 	text "Bwahaha!"
 	line "Great! I was"
 	cont "bored, eh!"
 	done
 
-_Route9EndBattleText5:: ; 8e433 (23:6433)
+_Route9EndBattleText5::
 	text "Keep it"
 	line "coming, eh!"
 
@@ -93,81 +76,81 @@ _Route9EndBattleText5:: ; 8e433 (23:6433)
 	line "of #MON!"
 	prompt
 
-_Route9AfterBattleText5:: ; 8e461 (23:6461)
+_Route9AfterBattleText5::
 	text "You sure had guts"
 	line "standing up to me"
 	cont "there, eh?"
 	done
 
-_Route9BattleText6:: ; 8e491 (23:6491)
+_Route9BattleText6::
 	text "Hahaha!"
 	line "Aren't you a"
 	cont "little toughie!"
 	done
 
-_Route9EndBattleText6:: ; 8e4b6 (23:64b6)
+_Route9EndBattleText6::
 	text "What's"
 	line "that?"
 	prompt
 
-_Route9AfterBattleText6:: ; 8e4c3 (23:64c3)
+_Route9AfterBattleText6::
 	text "Hahaha! Kids"
 	line "should be tough!"
 	done
 
-_Route9BattleText7:: ; 8e4e2 (23:64e2)
+_Route9BattleText7::
 	text "I got up early"
 	line "every day to"
 	cont "raise my #MON"
 	cont "from cocoons!"
 	done
 
-_Route9EndBattleText7:: ; 8e51b (23:651b)
+_Route9EndBattleText7::
 	text "WHAT?"
 
 	para "What a total"
 	line "waste of time!"
 	prompt
 
-_Route9AfterBattleText7:: ; 8e53e (23:653e)
+_Route9AfterBattleText7::
 	text "I have to collect"
 	line "more than bugs to"
 	cont "get stronger..."
 	done
 
-_Route9BattleText8:: ; 8e573 (23:6573)
+_Route9BattleText8::
 	text "Hahahaha!"
 	line "Come on, dude!"
 	done
 
-_Route9EndBattleText8:: ; 8e58d (23:658d)
+_Route9EndBattleText8::
 	text "Hahahaha!"
 	line "You beat me fair!"
 	prompt
 
-_Route9AfterBattleText8:: ; 8e5aa (23:65aa)
+_Route9AfterBattleText8::
 	text "Hahahaha!"
 	line "Us hearty guys"
 	cont "always laugh!"
 	done
 
-_Route9BattleText9:: ; 8e5d2 (23:65d2)
+_Route9BattleText9::
 	text "Go, my super bug"
 	line "#MON!"
 	done
 
-_Route9EndBattleText9:: ; 8e5ea (23:65ea)
+_Route9EndBattleText9::
 	text "My"
 	line "bugs..."
 	prompt
 
-_Route9AfterBattleText9:: ; 8e5f6 (23:65f6)
+_Route9AfterBattleText9::
 	text "If you don't like"
 	line "bug #MON, you"
 	cont "bug me!"
 	done
 
-_Route9Text11:: ; 8e61e (23:661e)
+_Route9Text11::
 	text "ROUTE 9"
 	line "CERULEAN CITY-"
 	cont "ROCK TUNNEL"