summaryrefslogtreecommitdiff
path: root/text/maps/vermilion_gym_1.asm
diff options
context:
space:
mode:
authordannye <corrnondacqb@yahoo.com>2016-01-12 18:45:02 -0600
committerdannye <corrnondacqb@yahoo.com>2016-01-12 18:45:02 -0600
commit5914540ba780d7936fd6624d6fde2d67a9f7a773 (patch)
treea1ce27018f39d98f49d89468df426d0291e18560 /text/maps/vermilion_gym_1.asm
parentccf4fe54a8e444aaf966fac7b38bc9452c494222 (diff)
parent8a5a7d8e68538b727e0c166488265f395603366e (diff)
Merge branch 'master' of https://github.com/pret/pokered into rgbgfxrgbgfx
Diffstat (limited to 'text/maps/vermilion_gym_1.asm')
-rw-r--r--text/maps/vermilion_gym_1.asm24
1 files changed, 1 insertions, 23 deletions
diff --git a/text/maps/vermilion_gym_1.asm b/text/maps/vermilion_gym_1.asm
index dfa45279..f718d899 100644
--- a/text/maps/vermilion_gym_1.asm
+++ b/text/maps/vermilion_gym_1.asm
@@ -1,25 +1,4 @@
-_VermilionGymText_5cb6d:: ; 9aaa5 (26:6aa5)
-IF DEF(_YELLOW)
- text "Ten-hut! Welcome"
- line "to VERMILION GYM!"
-
- para "Will you look at"
- line "that, a pint-size"
- cont "challenger!"
-
- para "Hahaha! You've got"
- line "big and brassy"
- cont "nerves to take me"
- cont "on with your puny"
- cont "power!"
-
- para "A #MON battle"
- line "is war! I'll show"
- cont "you, civilian!"
-
- para "I'll shock you"
- line "into surrender!"
-ELSE
+_VermilionGymText_5cb6d::
text "Hey, kid! What do"
line "you think you're"
cont "doing here?"
@@ -39,5 +18,4 @@ ELSE
para "The same as I'll"
line "do to you!"
-ENDC
done