aboutsummaryrefslogtreecommitdiffstats
path: root/text/maps/museum_2f.asm
diff options
context:
space:
mode:
authorIIMarckus <iimarckus@gmail.com>2014-10-10 01:46:06 -0600
committerIIMarckus <iimarckus@gmail.com>2014-10-10 01:46:06 -0600
commit6e14461fa6d5085349e4746b61c526f3c94be19f (patch)
tree63db9e0cfa395f6dd00566c6dcdbb492bb6526ca /text/maps/museum_2f.asm
parentAdd Yellow player/rival names. (diff)
downloadpokeyellow-6e14461fa6d5085349e4746b61c526f3c94be19f.tar.gz
pokeyellow-6e14461fa6d5085349e4746b61c526f3c94be19f.tar.xz
pokeyellow-6e14461fa6d5085349e4746b61c526f3c94be19f.zip
Add a lot of Yellow text changes.
Diffstat (limited to 'text/maps/museum_2f.asm')
-rw-r--r--text/maps/museum_2f.asm16
1 files changed, 15 insertions, 1 deletions
diff --git a/text/maps/museum_2f.asm b/text/maps/museum_2f.asm
index 7594c797..46238725 100644
--- a/text/maps/museum_2f.asm
+++ b/text/maps/museum_2f.asm
@@ -33,6 +33,21 @@ _Museum2FText5:: ; 96911 (25:6911)
line "soon, I promise!"
done
+IF DEF(_YELLOW)
+_Museum2FPikachuText1::
+ text "Your PIKACHU looks"
+ line "untamed."
+ cont "May I have it for"
+ cont "my daughter?"
+ done
+
+_Museum2FPikachuText2::
+ text "I'd like to get"
+ line "that PIKACHU off"
+ cont "you, but it's too"
+ cont "attached to you."
+ENDC
+
_Museum2FText6:: ; 96933 (25:6933)
text "SPACE SHUTTLE"
line "COLUMBIA"
@@ -43,4 +58,3 @@ _Museum2FText7:: ; 9694b (25:694b)
line "fell on MT.MOON."
cont "(MOON STONE?)"
done
-