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

1 files changed, 0 insertions, 135 deletions

diff --git a/text/maps/route_11_1.asm b/text/maps/route_11_1.asm
deleted file mode 100644
index 0637cad3..00000000
--- a/text/maps/route_11_1.asm
+++ /dev/null
@@ -1,135 +0,0 @@
-_Route11BattleText1:: ; 8e8ee (23:68ee)
-	text "Win, lose or draw!"
-	done
-
-_Route11EndBattleText1:: ; 8e902 (23:6902)
-	text "Atcha!"
-	line "Didn't go my way!"
-	prompt
-
-_Route11AfterBattleText1:: ; 8e91b (23:691b)
-	text "#MON is life!"
-	line "And to live is to"
-	cont "gamble!"
-	done
-
-_Route11BattleText2:: ; 8e944 (23:6944)
-	text "Competition! I"
-	line "can't get enough!"
-	done
-
-_Route11EndBattleText2:: ; 8e965 (23:6965)
-	text "I had"
-	line "a chance!"
-	prompt
-
-_Route11AfterBattleText2:: ; 8e976 (23:6976)
-	text "You can't be a"
-	line "coward in the"
-	cont "world of #MON!"
-	done
-
-_Route11BattleText3:: ; 8e9a2 (23:69a2)
-	text "Let's go, but"
-	line "don't cheat!"
-	done
-
-_Route11EndBattleText3:: ; 8e9bc (23:69bc)
-	text "Huh?"
-	line "That's not right!"
-	prompt
-
-_Route11AfterBattleText3:: ; 8e9d3 (23:69d3)
-	text "I did my best! I"
-	line "have no regrets!"
-	done
-
-_Route11BattleText4:: ; 8e9f6 (23:69f6)
-	text "Careful!"
-	line "I'm laying down"
-	cont "some cables!"
-	done
-
-_Route11EndBattleText4:: ; 8ea1c (23:6a1c)
-	text "That"
-	line "was electric!"
-	prompt
-
-_Route11AfterBattleText4:: ; 8ea30 (23:6a30)
-	text "Spread the word"
-	line "to save energy!"
-	done
-
-_Route11BattleText5:: ; 8ea51 (23:6a51)
-	text "I just became a"
-	line "trainer! But, I"
-	cont "think I can win!"
-	done
-
-_Route11EndBattleText5:: ; 8ea83 (23:6a83)
-	text "My"
-	line "#MON couldn't!"
-	prompt
-
-_Route11AfterBattleText5:: ; 8ea95 (23:6a95)
-	text "What do you want?"
-	line "Leave me alone!"
-	done
-
-_Route11BattleText6:: ; 8eab8 (23:6ab8)
-	text "Fwahaha! I have"
-	line "never lost!"
-	done
-
-_Route11EndBattleText6:: ; 8ead5 (23:6ad5)
-	text "My"
-	line "first loss!"
-	prompt
-
-_Route11AfterBattleText6:: ; 8eae5 (23:6ae5)
-	text "Luck of the draw!"
-	line "Just luck!"
-	done
-
-_Route11BattleText7:: ; 8eb03 (23:6b03)
-	text "I have never won"
-	line "before..."
-	done
-
-_Route11EndBattleText7:: ; 8eb1f (23:6b1f)
-	text "I saw"
-	line "this coming..."
-	prompt
-
-_Route11AfterBattleText7:: ; 8eb35 (23:6b35)
-	text "It's just luck."
-	line "Luck of the draw."
-	done
-
-_Route11BattleText8:: ; 8eb57 (23:6b57)
-	text "I'm the best in"
-	line "my class!"
-	done
-
-_Route11EndBattleText8:: ; 8eb71 (23:6b71)
-	text "Darn!"
-	line "I need to make my"
-	cont "#MON stronger!"
-	prompt
-
-_Route11AfterBattleText8:: ; 8eb99 (23:6b99)
-	text "There's a fat"
-	line "#MON that"
-	cont "comes down from"
-	cont "the mountains."
-
-	para "It's strong if"
-	line "you can get it."
-	done
-
-_Route11BattleText9:: ; 8ebee (23:6bee)
-	text "Watch out for"
-	line "live wires!"
-	done
-
-