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

1 files changed, 19 insertions, 19 deletions

diff --git a/text/maps/silph_co_6f.asm b/text/maps/silph_co_6f.asm
index b3bf71b6..b3a38aa0 100644
--- a/text/maps/silph_co_6f.asm
+++ b/text/maps/silph_co_6f.asm
@@ -1,77 +1,77 @@
-_SilphCo6Text_1a24a:: ; 84176 (21:4176)
+_SilphCo6Text_1a24a::
 	text "The ROCKETs came"
 	line "and took over the"
 	cont "building!"
 	done
 
-_SilphCo6Text_1a24f:: ; 841a4 (21:41a4)
+_SilphCo6Text_1a24f::
 	text "Well, better get"
 	line "back to work!"
 	done
 
-_SilphCo6Text_1a261:: ; 841c4 (21:41c4)
+_SilphCo6Text_1a261::
 	text "Oh dear, oh dear."
 	line "Help me please!"
 	done
 
-_SilphCo6Text_1a266:: ; 841e7 (21:41e7)
+_SilphCo6Text_1a266::
 	text "We got engaged!"
 	line "Heheh!"
 	done
 
-_SilphCo6Text_1a278:: ; 841ff (21:41ff)
+_SilphCo6Text_1a278::
 	text "Look at him! He's"
 	line "such a coward!"
 	done
 
-_SilphCo6Text_1a27d:: ; 84220 (21:4220)
+_SilphCo6Text_1a27d::
 	text "I feel so sorry"
 	line "for him, I have"
 	cont "to marry him!"
 	done
 
-_SilphCo6Text_1a28f:: ; 8424f (21:424f)
+_SilphCo6Text_1a28f::
 	text "TEAM ROCKET is"
 	line "trying to conquer"
 	cont "the world with"
 	cont "#MON!"
 	done
 
-_SilphCo6Text_1a294:: ; 84286 (21:4286)
+_SilphCo6Text_1a294::
 	text "TEAM ROCKET ran"
 	line "because of you!"
 	done
 
-_SilphCo6Text_1a2a6:: ; 842a7 (21:42a7)
+_SilphCo6Text_1a2a6::
 	text "They must have"
 	line "targeted SILPH"
 	cont "for our #MON"
 	cont "products."
 	done
 
-_SilphCo6Text_1a2ab:: ; 842dd (21:42dd)
+_SilphCo6Text_1a2ab::
 	text "Come work for"
 	line "SILPH when you"
 	cont "get older!"
 	done
 
-_SilphCo6BattleText2:: ; 84306 (21:4306)
+_SilphCo6BattleText2::
 	text "I am one of the 4"
 	line "ROCKET BROTHERS!"
 	done
 
-_SilphCo6EndBattleText2:: ; 8432a (21:432a)
+_SilphCo6EndBattleText2::
 	text "Flame"
 	line "out!"
 	prompt
 
-_SilphCo6AfterBattleText2:: ; 84336 (21:4336)
+_SilphCo6AfterBattleText2::
 	text "No matter!"
 	line "My brothers will"
 	cont "avenge me!"
 	done
 
-_SilphCo6BattleText3:: ; 8435e (21:435e)
+_SilphCo6BattleText3::
 	text "That rotten"
 	line "PRESIDENT!"
 
@@ -80,27 +80,27 @@ _SilphCo6BattleText3:: ; 8435e (21:435e)
 	cont "TIKSI BRANCH!"
 	done
 
-_SilphCo6EndBattleText3:: ; 843a4 (21:43a4)
+_SilphCo6EndBattleText3::
 	text "Shoot!"
 	prompt
 
-_SilphCo6AfterBattleText3:: ; 843ac (21:43ac)
+_SilphCo6AfterBattleText3::
 	text "TIKSI BRANCH?"
 	line "It's in Russian"
 	cont "no man's land!"
 	done
 
-_SilphCo6BattleText4:: ; 843d8 (21:43d8)
+_SilphCo6BattleText4::
 	text "You dare betray"
 	line "TEAM ROCKET?"
 	done
 
-_SilphCo6EndBattleText4:: ; 843f6 (21:43f6)
+_SilphCo6EndBattleText4::
 	text "You"
 	line "traitor!"
 	prompt
 
-_SilphCo6AfterBattleText4:: ; 84404 (21:4404)
+_SilphCo6AfterBattleText4::
 	text "If you stand for"
 	line "justice, you"
 	cont "betray evil!"