summaryrefslogtreecommitdiff
path: root/text/maps/name_rater.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/name_rater.asm
parentccf4fe54a8e444aaf966fac7b38bc9452c494222 (diff)
parent8a5a7d8e68538b727e0c166488265f395603366e (diff)
Merge branch 'master' of https://github.com/pret/pokered into rgbgfxrgbgfx
Diffstat (limited to 'text/maps/name_rater.asm')
-rw-r--r--text/maps/name_rater.asm18
1 files changed, 7 insertions, 11 deletions
diff --git a/text/maps/name_rater.asm b/text/maps/name_rater.asm
index 052a9588..f43aef91 100644
--- a/text/maps/name_rater.asm
+++ b/text/maps/name_rater.asm
@@ -1,4 +1,4 @@
-_NameRaterText_1dab3:: ; 9a308 (26:6308)
+_NameRaterText_1dab3::
text "Hello, hello!"
line "I am the official"
cont "NAME RATER!"
@@ -8,12 +8,12 @@ _NameRaterText_1dab3:: ; 9a308 (26:6308)
cont "your #MON?"
done
-_NameRaterText_1dab8:: ; 9a361 (26:6361)
+_NameRaterText_1dab8::
text "Which #MON"
line "should I look at?"
prompt
-_NameRaterText_1dabd:: ; 9a37f (26:637f)
+_NameRaterText_1dabd::
TX_RAM wcd6d
text ", is it?"
line "That is a decent"
@@ -26,12 +26,12 @@ _NameRaterText_1dabd:: ; 9a37f (26:637f)
para "How about it?"
done
-_NameRaterText_1dac2:: ; 9a3e5 (26:63e5)
+_NameRaterText_1dac2::
text "Fine! What should"
line "we name it?"
prompt
-_NameRaterText_1dac7:: ; 9a404 (26:6404)
+_NameRaterText_1dac7::
text "OK! This #MON"
line "has been renamed"
cont "@"
@@ -42,16 +42,12 @@ _NameRaterText_1dac7:: ; 9a404 (26:6404)
line "name than before!"
done
-_NameRaterText_1dacc:: ; 9a44c (26:644c)
-IF DEF(_YELLOW)
- text "Fine! Come any-"
-ELSE
+_NameRaterText_1dacc::
text "Fine! Come any"
-ENDC
line "time you like!"
done
-_NameRaterText_1dad1:: ; 9a46b (26:646b)
+_NameRaterText_1dad1::
TX_RAM wcd6d
text ", is it?"
line "That is a truly"