diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2016-06-03 17:54:53 -0400 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2016-06-03 17:54:53 -0400 |
| commit | 8cdf73265f95e9a55112f373804867244512878d (patch) | |
| tree | 64f4263b86839e1eb9770688ad890683fa89c503 /text | |
| parent | Update extras with fixed gbz80disasm.py (diff) | |
| parent | Fix tileset incbin statement alignment (diff) | |
| download | pokeyellow-8cdf73265f95e9a55112f373804867244512878d.tar.gz pokeyellow-8cdf73265f95e9a55112f373804867244512878d.tar.xz pokeyellow-8cdf73265f95e9a55112f373804867244512878d.zip | |
Merge pull request #10 from PikalaxALT/master
Next batch of scripts, etc.
Diffstat (limited to 'text')
| -rw-r--r-- | text/maps/celadon_mansion_3f.asm | 2 | ||||
| -rw-r--r-- | text/maps/fan_club.asm | 8 | ||||
| -rw-r--r-- | text/maps/hall_of_fame.asm | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/text/maps/celadon_mansion_3f.asm b/text/maps/celadon_mansion_3f.asm index 03e3831c..d4cc4caa 100644 --- a/text/maps/celadon_mansion_3f.asm +++ b/text/maps/celadon_mansion_3f.asm @@ -56,7 +56,7 @@ _WriterText:: line "I like her!" done -_WriteText2:: +_WriterText2:: text "I wrote the story!" para "It's great you" diff --git a/text/maps/fan_club.asm b/text/maps/fan_club.asm index 8b442011..33d3ca53 100644 --- a/text/maps/fan_club.asm +++ b/text/maps/fan_club.asm @@ -100,13 +100,13 @@ FanClubChairStoryText:: prompt ReceivedBikeVoucherText:: - text $52, " received" + text "<PLAYER> received" line "a @" TX_RAM wcf4b text "!@@" ExplainBikeVoucherText:: - db $0 + text "" para "Exchange that for" line "a BICYCLE!" @@ -128,7 +128,7 @@ FanClubNoStoryText:: done FanClubChairFinalText:: - text "Hello, ", $52, "!" + text "Hello, <PLAYER>!" para "Did you come see" line "me about my" @@ -143,7 +143,7 @@ FanClubBagFullText:: done FanClubChairPrintText1:: - text "Hi there, ",$52,"!" + text "Hi there, <PLAYER>!" line "Have you seen my" cont "#MON photos?" diff --git a/text/maps/hall_of_fame.asm b/text/maps/hall_of_fame.asm index e4b8de4f..cbb0e52b 100644 --- a/text/maps/hall_of_fame.asm +++ b/text/maps/hall_of_fame.asm @@ -1,7 +1,7 @@ _HallofFameRoomText1:: text "OAK: Er-hem!" line "Congratulations," - cont $52, "!" + cont "<PLAYER>!" para "This floor is the" line "#MON HALL OF" @@ -16,13 +16,13 @@ _HallofFameRoomText1:: line "also recorded in" cont "the HALL OF FAME!" - para $52, "! You have" + para "<PLAYER>! You have" line "endeavored hard" cont "to become the new" cont "LEAGUE champion!" para "Congratulations," - line $52, ", you and" + line "<PLAYER>, you and" cont "your #MON are" cont "HALL OF FAMERs!" done |