From 10af88ddd712415f2a0a2b6124187d51075c95d5 Mon Sep 17 00:00:00 2001
From: "U-Daniel-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Mon, 8 Jun 2015 01:52:50 -0500
Subject: text.o

Conflicts:
	main.asm
	text.asm
	text/maps/cerulean_trade_house.asm
	text/maps/copycats_house_1f.asm
	text/maps/daycare_2.asm
	text/maps/museum_2f.asm
	text/maps/oaks_lab.asm
	text/maps/pewter_gym.asm
	text/maps/route_9_1.asm
	text/maps/school.asm
	text/maps/vermilion_gym_1.asm
	wram.asm
	yellow/text.asm
---
 text/maps/rocket_hideout_b4f.asm | 32 --------------------------------
 1 file changed, 32 deletions(-)

(limited to 'text/maps/rocket_hideout_b4f.asm')

diff --git a/text/maps/rocket_hideout_b4f.asm b/text/maps/rocket_hideout_b4f.asm
index e069e4a9..0e8fca91 100644
--- a/text/maps/rocket_hideout_b4f.asm
+++ b/text/maps/rocket_hideout_b4f.asm
@@ -51,38 +51,6 @@ _RocketHideout4Text_45584:: ; 82283 (20:6283)
 	line "again..."
 	done
 
-_RocketHideout4BattleText2:: ; 82326 (20:6326)
-	text "I know you! You"
-	line "ruined our plans"
-	cont "at MT.MOON!"
-	done
-
-_RocketHideout4EndBattleText2:: ; 82354 (20:6354)
-	text "Burned"
-	line "again!"
-	prompt
-
-_RocketHide4AfterBattleText2:: ; 82363 (20:6363)
-	text "Do you have"
-	line "something against"
-	cont "TEAM ROCKET?"
-	done
-
-_RocketHideout4BattleText3:: ; 8238f (20:638f)
-	text "How can you not"
-	line "see the beauty of"
-	cont "our evil?"
-	done
-
-_RocketHideout4EndBattleText3:: ; 823bc (20:63bc)
-	text "Ayaya!"
-	prompt
-
-_RocketHide4AfterBattleText3:: ; 823c4 (20:63c4)
-	text "BOSS! I'm sorry I"
-	line "failed you!"
-	done
-
 _RocketHideout4BattleText4:: ; 823e2 (20:63e2)
 	text "The elevator"
 	line "doesn't work? Who"
-- 
cgit v1.3.1-sl0p