summaryrefslogtreecommitdiff
path: root/text/maps/ss_anne_2.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_2.asm
parentccf4fe54a8e444aaf966fac7b38bc9452c494222 (diff)
parent8a5a7d8e68538b727e0c166488265f395603366e (diff)
Merge branch 'master' of https://github.com/pret/pokered into rgbgfxrgbgfx
Diffstat (limited to 'text/maps/ss_anne_2.asm')
-rw-r--r--text/maps/ss_anne_2.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/text/maps/ss_anne_2.asm b/text/maps/ss_anne_2.asm
index 0a29f8e6..bd33b9d3 100644
--- a/text/maps/ss_anne_2.asm
+++ b/text/maps/ss_anne_2.asm
@@ -1,4 +1,4 @@
-_SSAnne2Text1:: ; 80d34 (20:4d34)
+_SSAnne2Text1::
text "This ship, she is"
line "a luxury liner"
cont "for trainers!"
@@ -8,7 +8,7 @@ _SSAnne2Text1:: ; 80d34 (20:4d34)
cont "invited trainers!"
done
-_SSAnneRivalBeforeBattleText:: ; 80d9a (20:4d9a)
+_SSAnneRivalBeforeBattleText::
text $53, ": Bonjour!"
line $52, "!"
@@ -31,7 +31,7 @@ _SSAnneRivalBeforeBattleText:: ; 80d9a (20:4d9a)
line "grassy areas!"
done
-_SSAnneRivalDefeatedText:: ; 80e57 (20:4e57)
+_SSAnneRivalDefeatedText::
text "Humph!"
para "At least you're"
@@ -39,7 +39,7 @@ _SSAnneRivalDefeatedText:: ; 80e57 (20:4e57)
cont "#MON!"
prompt
-_SSAnneRivalWonText:: ; 80e81 (20:4e81)
+_SSAnneRivalWonText::
text $52, "! What are"
line "you, seasick?"
@@ -47,7 +47,7 @@ _SSAnneRivalWonText:: ; 80e81 (20:4e81)
line "up, pal!"
prompt
-_SSAnneRivalCaptainText:: ; 80eb6 (20:4eb6)
+_SSAnneRivalCaptainText::
text $53, ": I heard"
line "there was a CUT"
cont "master on board."