summaryrefslogtreecommitdiff
path: root/text/maps/ss_anne_7.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/ss_anne_7.asm
parentccf4fe54a8e444aaf966fac7b38bc9452c494222 (diff)
parent8a5a7d8e68538b727e0c166488265f395603366e (diff)
Merge branch 'master' of https://github.com/pret/pokered into rgbgfxrgbgfx
Diffstat (limited to 'text/maps/ss_anne_7.asm')
-rw-r--r--text/maps/ss_anne_7.asm22
1 files changed, 7 insertions, 15 deletions
diff --git a/text/maps/ss_anne_7.asm b/text/maps/ss_anne_7.asm
index 2a770464..4687c421 100644
--- a/text/maps/ss_anne_7.asm
+++ b/text/maps/ss_anne_7.asm
@@ -1,4 +1,4 @@
-_SSAnne7RubText:: ; 812dd (20:52dd)
+_SSAnne7RubText::
text "CAPTAIN: Ooargh..."
line "I feel hideous..."
cont "Urrp! Seasick..."
@@ -10,7 +10,7 @@ _SSAnne7RubText:: ; 812dd (20:52dd)
para "Rub-rub..."
line "Rub-rub...@@"
-_ReceivingHM01Text:: ; 81347 (20:5347)
+_ReceivingHM01Text::
text "CAPTAIN: Whew!"
line "Thank you! I"
cont "feel much better!"
@@ -27,42 +27,34 @@ _ReceivingHM01Text:: ; 81347 (20:5347)
para "Teach it to your"
line "#MON and you"
cont "can see it CUT"
-IF DEF(_YELLOW)
- cont "anytime!"
-ELSE
cont "any time!"
-ENDC
prompt
-_ReceivedHM01Text:: ; 8140d (20:540d)
+_ReceivedHM01Text::
text $52, " got"
line "@"
TX_RAM wcf4b
text "!@@"
-_SSAnne7Text_61932:: ; 8141c (20:541c)
+_SSAnne7Text_61932::
text "CAPTAIN: Whew!"
para "Now that I'm not"
-IF DEF(_YELLOW)
- line "sick anymore, I"
-ELSE
line "sick any more, I"
-ENDC
cont "guess it's time."
done
-_HM01NoRoomText:: ; 8145d (20:545d)
+_HM01NoRoomText::
text "Oh no! You have"
line "no room for this!"
done
-_SSAnne7Text2:: ; 81480 (20:5480)
+_SSAnne7Text2::
text "Yuck! Shouldn't"
line "have looked!"
done
-_SSAnne7Text3:: ; 8149d (20:549d)
+_SSAnne7Text3::
text "How to Conquer"
line "Seasickness..."
cont "The CAPTAIN's"