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, 194 deletions

diff --git a/text/maps/fuchsia_gym_2.asm b/text/maps/fuchsia_gym_2.asm
deleted file mode 100644
index e0cb6807..00000000
--- a/text/maps/fuchsia_gym_2.asm
+++ /dev/null
@@ -1,194 +0,0 @@
-_UnnamedText_7558b:: ; a0000 (28:4000)
-	text "When afflicted by"
-	line "TOXIC, #MON"
-	cont "suffer more and"
-	cont "more as battle"
-	cont "progresses!"
-
-	para "It will surely"
-	line "terrorize foes!"
-	done
-
-_UnnamedText_75590:: ; a0069 (28:4069)
-	text "Now that you have"
-	line "the SOULBADGE,"
-	cont "the DEFENSE of"
-	cont "your #MON"
-	cont "increases!"
-
-	para "It also lets you"
-	line "SURF outside of"
-	cont "battle!"
-
-	para "Ah! Take this"
-	line "too!"
-	done
-
-_ReceivedTM06Text:: ; a00eb (28:40eb)
-	text $52, " received"
-	line "@"
-	TX_RAM wcf4b
-	text "!@@"
-
-_TM06ExplanationText:: ; a00ff (28:40ff)
-	db $0
-	para "TM06 contains"
-	line "TOXIC!"
-
-	para "It is a secret"
-	line "technique over"
-	cont "400 years old!"
-	done
-
-_TM06NoRoomText:: ; a0143 (28:4143)
-	text "Make space for"
-	line "this, child!"
-	done
-
-_FuchsiaGymBattleText1:: ; a0160 (28:4160)
-	text "Strength isn't"
-	line "the key for"
-	cont "#MON!"
-
-	para "It's strategy!"
-
-	para "I'll show you how"
-	line "strategy can beat"
-	cont "brute strength!"
-	done
-
-_FuchsiaGymEndBattleText1:: ; a01c2 (28:41c2)
-	text "What?"
-	line "Extraordinary!"
-	prompt
-
-_FuchsiaGymAfterBattleText1:: ; a01d8 (28:41d8)
-	text "So, you mix brawn"
-	line "with brains?"
-	cont "Good strategy!"
-	done
-
-_FuchsiaGymBattleText2:: ; a0207 (28:4207)
-	text "I wanted to become"
-	line "a ninja, so I"
-	cont "joined this GYM!"
-	done
-
-_FuchsiaGymEndBattleText2:: ; a023a (28:423a)
-	text "I'm done"
-	line "for!"
-	prompt
-
-_FuchsiaGymAfterBattleText2:: ; a0248 (28:4248)
-	text "I will keep on"
-	line "training under"
-	cont "KOGA, my ninja"
-	cont "master!"
-	done
-
-_FuchsiaGymBattleText3:: ; a027e (28:427e)
-	text "Let's see you"
-	line "beat my special"
-	cont "techniques!"
-	done
-
-_FuchsiaGymEndBattleText3:: ; a02a8 (28:42a8)
-	text "You"
-	line "had me fooled!"
-	prompt
-
-_FuchsiaGymAfterBattleText3:: ; a02bc (28:42bc)
-	text "I like poison and"
-	line "sleep techniques,"
-	cont "as they linger"
-	cont "after battle!"
-	done
-
-_FuchsiaGymBattleText4:: ; a02fe (28:42fe)
-	text "Stop right there!"
-
-	para "Our invisible"
-	line "walls have you"
-	cont "frustrated?"
-	done
-
-_FuchsiaGymEndBattleText4:: ; a033a (28:433a)
-	text "Whoa!"
-	line "He's got it!"
-	prompt
-
-_FuchsiaGymAfterBattleText4:: ; a034d (28:434d)
-	text "You impressed me!"
-	line "Here's a hint!"
-
-	para "Look very closely"
-	line "for gaps in the"
-	cont "invisible walls!"
-	done
-
-_FuchsiaGymBattleText5:: ; a03a1 (28:43a1)
-	text "I also study the"
-	line "way of the ninja"
-	cont "with master KOGA!"
-
-	para "Ninja have a long"
-	line "history of using"
-	cont "animals!"
-	done
-
-_FuchsiaGymEndBattleText5:: ; a0402 (28:4402)
-	text "Awoo!"
-	prompt
-
-_FuchsiaGymAfterBattleText5:: ; a0409 (28:4409)
-	text "I still have much"
-	line "to learn!"
-	done
-
-_FuchsiaGymBattleText6:: ; a0426 (28:4426)
-	text "Master KOGA comes"
-	line "from a long line"
-	cont "of ninjas!"
-
-	para "What did you"
-	line "descend from?"
-	done
-
-_FuchsiaGymEndBattleText6:: ; a0470 (28:4470)
-	text "Dropped"
-	line "my balls!"
-	prompt
-
-_FuchsiaGymAfterBattleText6:: ; a0483 (28:4483)
-	text "Where there is"
-	line "light, there is"
-	cont "shadow!"
-
-	para "Light and shadow!"
-	line "Which do you"
-	cont "choose?"
-	done
-
-_UnnamedText_7564e:: ; a04d2 (28:44d2)
-	text "Yo! Champ in"
-	line "making!"
-
-	para "FUCHSIA GYM is"
-	line "riddled with"
-	cont "invisible walls!"
-
-	para "KOGA might appear"
-	line "close, but he's"
-	cont "blocked off!"
-
-	para "You have to find"
-	line "gaps in the walls"
-	cont "to reach him!"
-	done
-
-_UnnamedText_75653:: ; a0574 (28:4574)
-	text "It's amazing how"
-	line "ninja can terrify"
-	cont "even now!"
-	done
-