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

1 files changed, 16 insertions, 20 deletions

diff --git a/text/maps/silph_co_2f.asm b/text/maps/silph_co_2f.asm
index 4437880c..819a08c1 100644
--- a/text/maps/silph_co_2f.asm
+++ b/text/maps/silph_co_2f.asm
@@ -1,4 +1,4 @@
-_SilphCo2Text_59ded:: ; 82454 (20:6454)
+_SilphCo2Text_59ded::
 	text "Eeek!"
 	line "No! Stop! Help!"
 
@@ -9,13 +9,13 @@ _SilphCo2Text_59ded:: ; 82454 (20:6454)
 	cont "please take this!"
 	prompt
 
-_ReceivedTM36Text:: ; 824ba (20:64ba)
+_ReceivedTM36Text::
 	text $52, " got"
 	line "@"
 	TX_RAM wcf4b
 	text "!@@"
 
-_TM36ExplanationText:: ; 824c9 (20:64c9)
+_TM36ExplanationText::
 	text "TM36 is"
 	line "SELFDESTRUCT!"
 
@@ -25,58 +25,54 @@ _TM36ExplanationText:: ; 824c9 (20:64c9)
 	cont "Be careful."
 	done
 
-_TM36NoRoomText:: ; 8251c (20:651c)
+_TM36NoRoomText::
 	text "You don't have any"
 	line "room for this."
 	done
 
-_SilphCo2BattleText1:: ; 8253e (20:653e)
+_SilphCo2BattleText1::
 	text "Help! I'm a SILPH"
 	line "employee."
 	done
 
-_SilphCo2EndBattleText1:: ; 8255a (20:655a)
+_SilphCo2EndBattleText1::
 	text "How"
 	line "did you know I"
 	cont "was a ROCKET?"
 	prompt
 
-_SilphCo2AfterBattleText1:: ; 8257c (20:657c)
+_SilphCo2AfterBattleText1::
 	text "I work for both"
 	line "SILPH and TEAM"
 	cont "ROCKET!"
 	done
 
-_SilphCo2BattleText2:: ; 825a4 (20:65a4)
+_SilphCo2BattleText2::
 	text "It's off limits"
 	line "here! Go home!"
 	done
 
-_SilphCo2EndBattleText2:: ; 825c3 (20:65c3)
+_SilphCo2EndBattleText2::
 	text "You're"
 	line "good."
 	prompt
 
-_SilphCo2AfterBattleText2:: ; 825d0 (20:65d0)
+_SilphCo2AfterBattleText2::
 	text "Can you solve the"
 	line "maze in here?"
 	done
 
-_SilphCo2BattleText3:: ; 825f1 (20:65f1)
+_SilphCo2BattleText3::
 	text "No kids are"
 	line "allowed in here!"
 	done
 
-_SilphCo2EndBattleText3:: ; 8260f (20:660f)
+_SilphCo2EndBattleText3::
 	text "Tough!"
 	prompt
 
-_SilphCo2AfterBattleText3:: ; 82617 (20:6617)
-IF DEF(_YELLOW)
-	text "Diamond-shaped"
-ELSE
+_SilphCo2AfterBattleText3::
 	text "Diamond shaped"
-ENDC
 	line "tiles are"
 	cont "teleport blocks!"
 
@@ -84,16 +80,16 @@ ENDC
 	line "transporters!"
 	done
 
-_SilphCo2BattleText4:: ; 8265f (20:665f)
+_SilphCo2BattleText4::
 	text "Hey kid! What are"
 	line "you doing here?"
 	done
 
-_SilphCo2EndBattleText4:: ; 82682 (20:6682)
+_SilphCo2EndBattleText4::
 	text "I goofed!"
 	prompt
 
-_SilphCo2AfterBattleText4:: ; 8268d (20:668d)
+_SilphCo2AfterBattleText4::
 	text "SILPH CO. will"
 	line "be merged with"
 	cont "TEAM ROCKET!"