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

1 files changed, 26 insertions, 31 deletions

diff --git a/text/maps/route_3.asm b/text/maps/route_3.asm
index 95612425..f9496c89 100644
--- a/text/maps/route_3.asm
+++ b/text/maps/route_3.asm
@@ -1,4 +1,4 @@
-_Route3Text1:: ; 8d779 (23:5779)
+_Route3Text1::
 	text "Whew... I better"
 	line "take a rest..."
 	cont "Groan..."
@@ -8,143 +8,138 @@ _Route3Text1:: ; 8d779 (23:5779)
 	cont "lot out of you!"
 	done
 
-_Route3BattleText1:: ; 8d7d5 (23:57d5)
+_Route3BattleText1::
 	text "Hey! I met you in"
 	line "VIRIDIAN FOREST!"
 	done
 
-_Route3EndBattleText1:: ; 8d7f9 (23:57f9)
+_Route3EndBattleText1::
 	text "You"
 	line "beat me again!"
 	prompt
 
-_Route3AfterBattleText1:: ; 8d80d (23:580d)
+_Route3AfterBattleText1::
 	text "There are other"
 	line "kinds of #MON"
 	cont "than those found"
 	cont "in the forest!"
 	done
 
-_Route3BattleText2:: ; 8d84c (23:584c)
+_Route3BattleText2::
 	text "Hi! I like shorts!"
 	line "They're comfy and"
 	cont "easy to wear!"
 	done
 
-_Route3EndBattleText2:: ; 8d87f (23:587f)
+_Route3EndBattleText2::
 	text "I don't"
 	line "believe it!"
 	prompt
 
-_Route3AfterBattleText2:: ; 8d893 (23:5893)
+_Route3AfterBattleText2::
 	text "Are you storing"
 	line "your #MON on"
 	cont "PC? Each BOX can"
 	cont "hold 20 #MON!"
 	done
 
-_Route3BattleText3:: ; 8d8d0 (23:58d0)
+_Route3BattleText3::
 	text "You looked at me,"
 	line "didn't you?"
 	done
 
-_Route3EndBattleText3:: ; 8d8ee (23:58ee)
+_Route3EndBattleText3::
 	text "You're"
 	line "mean!"
 	prompt
 
-_Route3AfterBattleText3:: ; 8d8fb (23:58fb)
+_Route3AfterBattleText3::
 	text "Quit staring if"
 	line "you don't want to"
 	cont "fight!"
 	done
 
-_Route3BattleText4:: ; 8d924 (23:5924)
+_Route3BattleText4::
 	text "Are you a trainer?"
 	line "Let's fight!"
 	done
 
-_Route3EndBattleText4:: ; 8d944 (23:5944)
+_Route3EndBattleText4::
 	text "If I"
-IF DEF(_YELLOW)
-	line "had new #MON,"
-	cont "I would've won!"
-ELSE
 	line "had new #MON I"
 	cont "would've won!"
-ENDC
 	prompt
 
-_Route3AfterBattleText4:: ; 8d966 (23:5966)
+_Route3AfterBattleText4::
 	text "If a #MON BOX"
 	line "on the PC gets"
 	cont "full, just switch"
 	cont "to another BOX!"
 	done
 
-_Route3BattleText5:: ; 8d9a6 (23:59a6)
+_Route3BattleText5::
 	text "That look you"
 	line "gave me, it's so"
 	cont "intriguing!"
 	done
 
-_Route3EndBattleText5:: ; 8d9d1 (23:59d1)
+_Route3EndBattleText5::
 	text "Be nice!"
 	prompt
 
-_Route3AfterBattleText5:: ; 8d9db (23:59db)
+_Route3AfterBattleText5::
 	text "Avoid fights by"
 	line "not letting"
 	cont "people see you!"
 	done
 
-_Route3BattleText6:: ; 8da08 (23:5a08)
+_Route3BattleText6::
 	text "Hey! You're not"
 	line "wearing shorts!"
 	done
 
-_Route3EndBattleText6:: ; 8da28 (23:5a28)
+_Route3EndBattleText6::
 	text "Lost!"
 	line "Lost! Lost!"
 	prompt
 
-_Route3AfterBattleText6:: ; 8da3b (23:5a3b)
+_Route3AfterBattleText6::
 	text "I always wear"
 	line "shorts, even in"
 	cont "winter!"
 	done
 
-_Route3BattleText7:: ; 8da62 (23:5a62)
+_Route3BattleText7::
 	text "You can fight my"
 	line "new #MON!"
 	done
 
-_Route3EndBattleText7:: ; 8da7e (23:5a7e)
+_Route3EndBattleText7::
 	text "Done"
 	line "like dinner!"
 	prompt
 
-_Route3AfterBattleText7:: ; 8da91 (23:5a91)
+_Route3AfterBattleText7::
 	text "Trained #MON"
 	line "are stronger than"
 	cont "the wild ones!"
 	done
 
-_Route3BattleText8:: ; 8dac0 (23:5ac0)
+_Route3BattleText8::
 	text "Eek! Did you"
 	line "touch me?"
 	done
 
-_Route3EndBattleText8:: ; 8dad8 (23:5ad8)
+_Route3EndBattleText8::
 	text "That's it?"
 	prompt
 
-_Route3AfterBattleText8:: ; 8dae3 (23:5ae3)
+_Route3AfterBattleText8::
 	text "ROUTE 4 is at the"
 	line "foot of MT.MOON."
 	done
 
-_Route3Text10:: ; 8db07 (23:5b07)
+_Route3Text10::
 	text "ROUTE 3"
 	line "MT.MOON AHEAD"
 	done