summaryrefslogtreecommitdiff
path: root/text/maps/fujis_house.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/fujis_house.asm
parentccf4fe54a8e444aaf966fac7b38bc9452c494222 (diff)
parent8a5a7d8e68538b727e0c166488265f395603366e (diff)
Merge branch 'master' of https://github.com/pret/pokered into rgbgfxrgbgfx
Diffstat (limited to 'text/maps/fujis_house.asm')
-rw-r--r--text/maps/fujis_house.asm24
1 files changed, 12 insertions, 12 deletions
diff --git a/text/maps/fujis_house.asm b/text/maps/fujis_house.asm
index b54c55f2..e75d46ea 100644
--- a/text/maps/fujis_house.asm
+++ b/text/maps/fujis_house.asm
@@ -1,16 +1,16 @@
-_LavenderHouse1Text_1d8d1:: ; 99e8d (26:5e8d)
+_LavenderHouse1Text_1d8d1::
text "That's odd, MR.FUJI"
line "isn't here."
cont "Where'd he go?"
done
-_LavenderHouse1Text_1d8d6:: ; 99eba (26:5eba)
+_LavenderHouse1Text_1d8d6::
text "MR.FUJI had been"
line "praying alone for"
cont "CUBONE's mother."
done
-_LavenderHouse1Text_1d8f4:: ; 99eee (26:5eee)
+_LavenderHouse1Text_1d8f4::
text "This is really"
line "MR.FUJI's house."
@@ -21,19 +21,19 @@ _LavenderHouse1Text_1d8f4:: ; 99eee (26:5eee)
cont "orphaned #MON!"
done
-_LavenderHouse1Text_1d8f9:: ; 99f4b (26:5f4b)
+_LavenderHouse1Text_1d8f9::
text "It's so warm!"
line "#MON are so"
cont "nice to hug!"
done
-_LavenderHouse1Text3:: ; 99f72 (26:5f72)
+_LavenderHouse1Text3::
text "PSYDUCK: Gwappa!@@"
-_LavenderHouse1Text4:: ; 99f85 (26:5f85)
+_LavenderHouse1Text4::
text "NIDORINO: Gaoo!@@"
-_LavenderHouse1Text_1d94c:: ; 99f97 (26:5f97)
+_LavenderHouse1Text_1d94c::
text "MR.FUJI: ", $52, "."
para "Your #DEX quest"
@@ -45,13 +45,13 @@ _LavenderHouse1Text_1d94c:: ; 99f97 (26:5f97)
line "help your quest."
prompt
-_ReceivedFluteText:: ; 99ffb (26:5ffb)
+_ReceivedFluteText::
text $52, " received"
line "a @"
TX_RAM wcf4b
text "!@@"
-_FluteExplanationText:: ; 9a011 (26:6011)
+_FluteExplanationText::
db $0
para "Upon hearing #"
line "FLUTE, sleeping"
@@ -62,17 +62,17 @@ _FluteExplanationText:: ; 9a011 (26:6011)
line "sleeping #MON."
done
-_FluteNoRoomText:: ; 9a069 (26:6069)
+_FluteNoRoomText::
text "You must make"
line "room for this!"
done
-_MrFujiAfterFluteText:: ; 9a087 (26:6087)
+_MrFujiAfterFluteText::
text "MR.FUJI: Has my"
line "FLUTE helped you?"
done
-_LavenderHouse1Text6:: ; 9a0aa (26:60aa)
+_LavenderHouse1Text6::
text "#MON Monthly"
line "Grand Prize"
cont "Drawing!"