aboutsummaryrefslogtreecommitdiffstats
path: root/text
diff options
context:
space:
mode:
authorDaniel Harding <33dannye@gmail.com>2020-05-03 13:57:59 -0500
committerGitHub <noreply@github.com>2020-05-03 13:57:59 -0500
commit2e44e4562f6b48fec1036240bdbf0ebcb70947d6 (patch)
tree64bb0e9796949a8f78162cae5b5f8830cd0f0a98 /text
parentMerge pull request #234 from Akatsuki-py/fix_comment (diff)
parentlabel npc conditional text (diff)
downloadpokeyellow-2e44e4562f6b48fec1036240bdbf0ebcb70947d6.tar.gz
pokeyellow-2e44e4562f6b48fec1036240bdbf0ebcb70947d6.tar.xz
pokeyellow-2e44e4562f6b48fec1036240bdbf0ebcb70947d6.zip
Merge pull request #236 from mattbruv/vermilion
label hardcoded HRAM address, start documenting Vermilion
Diffstat (limited to 'text')
-rw-r--r--text/maps/VermilionCity.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/text/maps/VermilionCity.asm b/text/maps/VermilionCity.asm
index b060a123..1cbc535c 100644
--- a/text/maps/VermilionCity.asm
+++ b/text/maps/VermilionCity.asm
@@ -7,13 +7,13 @@ _VermilionCityText1::
cont "toxic sludge!"
done
-_VermilionCityText_198a7::
+_VermilionCityTextDidYouSee::
text "Did you see S.S."
line "ANNE moored in"
cont "the harbor?"
done
-_VermilionCityText_198ac::
+_VermilionCityTextSSAnneDeparted::
text "So, S.S.ANNE has"
line "departed!"