diff options
Diffstat (limited to 'text')
| -rwxr-xr-x | text/credits_text.asm | 338 | ||||
| -rw-r--r-- | text/maps/bike_shop.asm | 2 | ||||
| -rw-r--r-- | text/maps/museum_1f.asm | 2 | ||||
| -rw-r--r-- | text/maps/oaks_lab.asm | 80 | ||||
| -rw-r--r-- | text/maps/route_24.asm | 31 | ||||
| -rw-r--r-- | text/maps/route_25.asm | 28 | ||||
| -rw-r--r-- | text/maps/vermilion_city.asm | 18 | ||||
| -rw-r--r-- | text/maps/viridian_city.asm | 2 |
8 files changed, 285 insertions, 216 deletions
diff --git a/text/credits_text.asm b/text/credits_text.asm index 02614c6a..54b52c97 100755 --- a/text/credits_text.asm +++ b/text/credits_text.asm @@ -1,194 +1,264 @@ CreditsTextPointers: ; 742c3 (1d:42c3) - dw CredVersion - dw CredTajiri - dw CredTaOota - dw CredMorimoto - dw CredWatanabe - dw CredMasuda - dw CredNisino - dw CredSugimori - dw CredNishida - dw CredMiyamoto - dw CredKawaguchi - dw CredIshihara - dw CredYamauchi - dw CredZinnai - dw CredHishida - dw CredSakai - dw CredYamaguchi - dw CredYamamoto - dw CredTaniguchi - dw CredNonomura - dw CredFuziwara - dw CredMatsusima - dw CredTomisawa - dw CredKawamoto - dw CredKakei - dw CredTsuchiya - dw CredTaNakamura - dw CredYuda - dw CredMon - dw CredDirector - dw CredProgrammers - dw CredCharDesign - dw CredMusic - dw CredSoundEffects - dw CredGameDesign - dw CredMonsterDesign - dw CredGameScene - dw CredParam - dw CredMap - dw CredTest - dw CredSpecial - dw CredProducers - dw CredProducer - dw CredExecutive - dw CredTamada - dw CredSaOota - dw CredYoshikawa - dw CredToOota - dw CredUSStaff - dw CredUSCoord - dw CredTilden - dw CredKawakami - dw CredHiNakamura - dw CredGiese - dw CredOsborne - dw CredTrans - dw CredOgasawara - dw CredIwata - dw CredIzushi - dw CredHarada - dw CredMurakawa - dw CredFukui - dw CredClub - dw CredPAAD + dw CreditsText_Version + dw CreditsText_Tajiri + dw CreditsText_Oota + dw CreditsText_Morimoto + dw CreditsText_Watanabe + dw CreditsText_Masuda + dw CreditsText_Nishino + dw CreditsText_Sugimori + dw CreditsText_Nishida + dw CreditsText_Miyamoto + dw CreditsText_Kawaguchi + dw CreditsText_Ishihara + dw CreditsText_Yamauchi + dw CreditsText_Zinnai + dw CreditsText_Hishida + dw CreditsText_Sakai + dw CreditsText_Yamaguchi + dw CreditsText_Yamamoto + dw CreditsText_Taniguchi + dw CreditsText_Nonomura + dw CreditsText_Fuziwara + dw CreditsText_Matsusima + dw CreditsText_Tomisawa + dw CreditsText_Kawamoto + dw CreditsText_Kakei + dw CreditsText_Tsuchiya + dw CreditsText_Nakamura + dw CreditsText_Yuda + dw CreditsText_Pokemon + dw CreditsText_Director + dw CreditsText_Programmers + dw CreditsText_CharacterDesign + dw CreditsText_Music + dw CreditsText_SoundEffects + dw CreditsText_GameDesign + dw CreditsText_MonsterDesign + dw CreditsText_GameScenario + dw CreditsText_ParametricDesign + dw CreditsText_MapDesign + dw CreditsText_Testing + dw CreditsText_SpecialThanks + dw CreditsText_Producer + dw CreditsText_ExecutiveProducer + dw CreditsText_Tamada + dw CreditsText_Oota2 + dw CreditsText_Yoshikawa + dw CreditsText_Oota23 + dw CreditsText_Yoshida + dw CreditsText_Matsumita + dw CreditsText_Seya + dw CreditsText_Sekine + dw CreditsText_Shimamura + dw CreditsText_Shimoyamada + dw CreditsText_SuperMarioClub + dw CreditsText_Izushi + dw CreditsText_Nomura + dw CreditsText_Harada + dw CreditsText_Yamagami + dw CreditsText_Nishimura + dw CreditsText_Saeki + dw CreditsText_Fuzii + dw CreditsText_Shogakukan + dw CreditsText_Ootani + dw CreditsText_PikachuVoice + dw CreditsText_USStaff + dw CreditsText_USCoord + dw CreditsText_Tilden + dw CreditsText_Kawakami + dw CreditsText_Nakamura2 + dw CreditsText_Shoemake + dw CreditsText_Osborne + dw CreditsText_Translation + dw CreditsText_Ogasawara + dw CreditsText_Iwata + dw CreditsText_Izushi2 + dw CreditsText_Harada2 + dw CreditsText_Murakawa + dw CreditsText_Fukui + dw CreditsText_SuperMarioClub2 + dw CreditsText_Paad + dw CreditsText_Producers + dw CreditsText_Hosokawa + dw CreditsText_Okubo + dw CreditsText_Nakamichi + dw CreditsText_Yoshimura + dw CreditsText_Yamazaki -CredVersion: ; 74343 (1d:4343) ; this 1 byte difference makes all bank addresses offset by 1 in the blue version - db -8, "RED VERSION STAFF@" -CredTajiri: ; 74356 (1d:4356) +CreditsText_Version: + db -6, "YELLOW VERSION" + next " STAFF@" +CreditsText_Tajiri: db -6, "SATOSHI TAJIRI@" -CredTaOota: ; 74366 (1d:4366) +CreditsText_Oota: db -6, "TAKENORI OOTA@" -CredMorimoto: ; 74375 (1d:4375) +CreditsText_Morimoto: db -7, "SHIGEKI MORIMOTO@" -CredWatanabe: ; 74387 (1d:4387) +CreditsText_Watanabe: db -7, "TETSUYA WATANABE@" -CredMasuda: ; 74399 (1d:4399) +CreditsText_Masuda: db -6, "JUNICHI MASUDA@" -CredNisino: ; 743a9 (1d:43a9) - db -5, "KOHJI NISINO@" -CredSugimori: ; 743b7 (1d:43b7) +CreditsText_Nishino: + db -5, "KOHJI NISHINO@" +CreditsText_Sugimori: db -5, "KEN SUGIMORI@" -CredNishida: ; 743c5 (1d:43c5) +CreditsText_Nishida: db -6, "ATSUKO NISHIDA@" -CredMiyamoto: ; 743d5 (1d:43d5) +CreditsText_Miyamoto: db -7, "SHIGERU MIYAMOTO@" -CredKawaguchi: ; 743e7 (1d:43e7) +CreditsText_Kawaguchi: db -8, "TAKASHI KAWAGUCHI@" -CredIshihara: ; 743fa (1d:43fa) +CreditsText_Ishihara: db -8, "TSUNEKAZU ISHIHARA@" -CredYamauchi: ; 7440e (1d:440e) +CreditsText_Yamauchi: db -7, "HIROSHI YAMAUCHI@" -CredZinnai: ; 74420 (1d:4420) +CreditsText_Zinnai: db -7, "HIROYUKI ZINNAI@" -CredHishida: ; 74431 (1d:4431) +CreditsText_Hishida: db -7, "TATSUYA HISHIDA@" -CredSakai: ; 74442 (1d:4442) +CreditsText_Sakai: db -6, "YASUHIRO SAKAI@" -CredYamaguchi: ; 74452 (1d:4452) +CreditsText_Yamaguchi: db -7, "WATARU YAMAGUCHI@" -CredYamamoto: ; 74464 (1d:4464) +CreditsText_Yamamoto: db -8, "KAZUYUKI YAMAMOTO@" -CredTaniguchi: ; 74477 (1d:4477) +CreditsText_Taniguchi: db -8, "RYOHSUKE TANIGUCHI@" -CredNonomura: ; 7448b (1d:448b) +CreditsText_Nonomura: db -8, "FUMIHIRO NONOMURA@" -CredFuziwara: ; 7449e (1d:449e) +CreditsText_Fuziwara: db -7, "MOTOFUMI FUZIWARA@" -CredMatsusima: ; 744b1 (1d:44b1) +CreditsText_Matsusima: db -7, "KENJI MATSUSIMA@" -CredTomisawa: ; 744c2 (1d:44c2) +CreditsText_Tomisawa: db -7, "AKIHITO TOMISAWA@" -CredKawamoto: ; 744d4 (1d:44d4) +CreditsText_Kawamoto: db -7, "HIROSHI KAWAMOTO@" -CredKakei: ; 744e6 (1d:44e6) +CreditsText_Kakei: db -6, "AKIYOSHI KAKEI@" -CredTsuchiya: ; 744f6 (1d:44f6) +CreditsText_Tsuchiya: db -7, "KAZUKI TSUCHIYA@" -CredTaNakamura: ; 74507 (1d:4507) +CreditsText_Nakamura: db -6, "TAKEO NAKAMURA@" -CredYuda: ; 74517 (1d:4517) +CreditsText_Yuda: db -6, "MASAMITSU YUDA@" -CredMon: ; 74527 (1d:4527) +CreditsText_Pokemon: db -3, "#MON@" -CredDirector: ; 7452d (1d:452d) +CreditsText_Director: db -3, "DIRECTOR@" -CredProgrammers: ; 74537 (1d:4537) +CreditsText_Programmers: db -5, "PROGRAMMERS@" -CredCharDesign: ; 74544 (1d:4544) +CreditsText_CharacterDesign: db -7, "CHARACTER DESIGN@" -CredMusic: ; 74556 (1d:4556) +CreditsText_Music: db -2, "MUSIC@" -CredSoundEffects: ; 7455d (1d:455d) +CreditsText_SoundEffects: db -6, "SOUND EFFECTS@" -CredGameDesign: ; 7456c (1d:456c) +CreditsText_GameDesign: db -5, "GAME DESIGN@" -CredMonsterDesign: ; 74579 (1d:4579) +CreditsText_MonsterDesign: db -6, "MONSTER DESIGN@" -CredGameScene: ; 74589 (1d:4589) +CreditsText_GameScenario: db -6, "GAME SCENARIO@" -CredParam: ; 74598 (1d:4598) - db -8, "PARAMETRIC DESIGN@" -CredMap: ; 745ab (1d:45ab) +CreditsText_ParametricDesign: + db -7, "PARAMETRIC DESIGN@" +CreditsText_MapDesign: db -4, "MAP DESIGN@" -CredTest: ; 745b7 (1d:45b7) - db -7, "PRODUCT TESTING@" -CredSpecial: ; 745c8 (1d:45c8) +CreditsText_Testing: + db -6, "PRODUCT TESTING@" +CreditsText_SpecialThanks: db -6, "SPECIAL THANKS@" -CredProducers: ; 745d8 (1d:45d8) +CreditsText_Producers: db -4, "PRODUCERS@" -CredProducer: ; 745e3 (1d:45e3) - db -4, "PRODUCER@" -CredExecutive: ; 745ed (1d:45ed) +CreditsText_Producer: + db -3, "PRODUCER@" +CreditsText_ExecutiveProducer: db -8, "EXECUTIVE PRODUCER@" -CredTamada: ; 74601 (1d:4601) +CreditsText_Tamada: db -6, "SOUSUKE TAMADA@" -CredSaOota: ; 74611 (1d:4611) +CreditsText_Oota2: db -5, "SATOSHI OOTA@" -CredYoshikawa: ; 7461f (1d:461f) +CreditsText_Yoshikawa: db -6, "RENA YOSHIKAWA@" -CredToOota: ; 7462f (1d:462f) +CreditsText_Oota23: db -6, "TOMOMICHI OOTA@" -CredUSStaff: ; 7463f (1d:463f) +CreditsText_Matsumita: + db -8, "TOSHINOBU MATSUMIYA@" +CreditsText_Seya: + db -5, "NOBUHIRO SEYA@" +CreditsText_Yoshida: + db -7, "HIRONOBU YOSHIDA@" +CreditsText_Sekine: + db -6, "KAZUHITO SEKINE@" +CreditsText_Shimamura: + db -7, "KAZUSHI SHIMAMURA@" +CreditsText_Shimoyamada: + db -9, "TERUYUKI SHIMOYAMADA@" +CreditsText_SuperMarioClub: + db -9, "NCL SUPER MARIO CLUB@" +CreditsText_Izushi: + db -7, "TAKEHIRO IZUSHI@" +CreditsText_Nomura: + db -5, "FUZIKO NOMURA@" +CreditsText_Harada: + db -6, "TAKAHIRO HARADA@" +CreditsText_Yamagami: + db -7, "HITOSHI YAMAGAMI@" +CreditsText_Nishimura: + db -8, "KENTAROU NISHIMURA@" +CreditsText_Saeki: + db -5, "NAOKO SAEKI@" +CreditsText_Fuzii: + db -5, "TAKAYA FUZII@" +CreditsText_Shogakukan: + db -4, "SHOGAKUKAN" + next "PRODUCTION@" +CreditsText_Ootani: + db -5, "IKUE OOTANI@" +CreditsText_PikachuVoice: + db -6, "PIKACHU VOICE@" + + db -3, "××××××××@" +CreditsText_USStaff: db -7, "US VERSION STAFF@" -CredUSCoord: ; 74651 (1d:4651) +CreditsText_USCoord: db -7, "US COORDINATION@" -CredTilden: ; 74662 (1d:4662) +CreditsText_Tilden: db -5, "GAIL TILDEN@" -CredKawakami: ; 7466f (1d:466f) +CreditsText_Kawakami: db -6, "NAOKO KAWAKAMI@" -CredHiNakamura: ; 7467f (1d:467f) +CreditsText_Nakamura2: db -6, "HIRO NAKAMURA@" -CredGiese: ; 7468e (1d:468e) - db -6, "WILLIAM GIESE@" -CredOsborne: ; 7469d (1d:469d) +CreditsText_Shoemake: + db -6, "RANDY SHOEMAKE@" +CreditsText_Osborne: db -5, "SARA OSBORNE@" -CredTrans: ; 746ab (1d:46ab) +CreditsText_Translation: db -7, "TEXT TRANSLATION@" -CredOgasawara: ; 746bd (1d:46bd) +CreditsText_Ogasawara: db -6, "NOB OGASAWARA@" -CredIwata: ; 746cc (1d:46cc) +CreditsText_Iwata: db -5, "SATORU IWATA@" -CredIzushi: ; 746da (1d:46da) +CreditsText_Izushi2: db -7, "TAKEHIRO IZUSHI@" -CredHarada: ; 746eb (1d:46eb) +CreditsText_Harada2: db -7, "TAKAHIRO HARADA@" -CredMurakawa: ; 746fc (1d:46fc) +CreditsText_Murakawa: db -7, "TERUKI MURAKAWA@" -CredFukui: ; 7470d (1d:470d) +CreditsText_Fukui: db -5, "KOHTA FUKUI@" -CredClub: ; 7471a (1d:471a) +CreditsText_SuperMarioClub2: db -9, "NCL SUPER MARIO CLUB@" -CredPAAD: ; 74730 (1d:4730) +CreditsText_Paad: db -5, "PAAD TESTING@" +CreditsText_Hosokawa: + db -8, "TAKEHIKO HOSOKAWA@" +CreditsText_Okubo: + db -5, "KENJI OKUBO@" +CreditsText_Nakamichi: + db -7, "KIMIKO NAKAMICHI@" +CreditsText_Yoshimura: + db -6, "KAMON YOSHIMURA@" +CreditsText_Yamazaki: + db -6, "SAKAE YAMAZAKI@" diff --git a/text/maps/bike_shop.asm b/text/maps/bike_shop.asm index 252dffdc..723021a1 100644 --- a/text/maps/bike_shop.asm +++ b/text/maps/bike_shop.asm @@ -25,7 +25,7 @@ _BikeShopText_1d81f:: prompt _BikeShopText_1d824:: - text $52, " exchanged" + text "<PLAYER> exchanged" line "the BIKE VOUCHER" cont "for a BICYCLE.@@" diff --git a/text/maps/museum_1f.asm b/text/maps/museum_1f.asm index f5f7f042..71aeee3c 100644 --- a/text/maps/museum_1f.asm +++ b/text/maps/museum_1f.asm @@ -81,7 +81,7 @@ _Museum1FText_5c28e:: prompt _ReceivedOldAmberText:: - text $52, " received" + text "<PLAYER> received" line "OLD AMBER!@@" _Museum1FText_5c299:: diff --git a/text/maps/oaks_lab.asm b/text/maps/oaks_lab.asm index 5b12e1b8..097fa931 100644 --- a/text/maps/oaks_lab.asm +++ b/text/maps/oaks_lab.asm @@ -1,6 +1,6 @@ _OaksLabGaryText1:: - text $53,": Yo" - line $52,"! Gramps" + text "<RIVAL>: Yo" + line "<PLAYER>! Gramps" cont "isn't around!" para "I ran here 'cos" @@ -9,13 +9,13 @@ _OaksLabGaryText1:: done _OaksLabText40:: - text $53,": Humph!" + text "<RIVAL>: Humph!" line "I'll get a better" cont "#MON than you!" done _OaksLabText41:: - text $53,": Heh, my" + text "<RIVAL>: Heh, my" line "#MON looks a" cont "lot stronger." done @@ -48,7 +48,7 @@ _OaksLabText_1d2fa:: done _OaksLabDeliverParcelText1:: - text "OAK: Oh, ", $52, "!" + text "OAK: Oh, <PLAYER>!" para "How is my old" line "#MON?" @@ -63,15 +63,15 @@ _OaksLabDeliverParcelText1:: para "What? You have" line "something for me?" - para $52, " delivered" + para "<PLAYER> delivered" line "OAK's PARCEL.@@" _OaksLabDeliverParcelText2:: - db $0 + text "" para "Ah! This is the" line "custom # BALL" cont "I ordered!" - cont "Thanks, ",$52,"!" + cont "Thanks, <PLAYER>!" para "By the way, I must" line "ask you to do" @@ -81,7 +81,7 @@ _OaksLabDeliverParcelText2:: _OaksLabAroundWorldText:: text "#MON around the" line "world wait for" - cont "you, ", $52, "!" + cont "you, <PLAYER>!" done _OaksLabGivePokeballsText1:: @@ -95,11 +95,11 @@ _OaksLabGivePokeballsText1:: cont "to capture wild" cont "#MON." - para $52, " got 5" + para "<PLAYER> got 5" line "# BALLs!@@" _OaksLabGivePokeballsText2:: - db $0 + text "" para "When a wild" line "#MON appears," cont "it's fair game." @@ -155,13 +155,13 @@ _OaksLabText_1d340:: done _OaksLabRivalWaitingText:: - text $53, ": Gramps!" + text "<RIVAL>: Gramps!" line "I'm fed up with" cont "waiting!" done _OaksLabChooseMonText:: - text "OAK: Hmm? ",$53,"?" + text "OAK: Hmm? <RIVAL>?" line "Why are you here" cont "already?" @@ -171,7 +171,7 @@ _OaksLabChooseMonText:: para "Ah, whatever!" line "Just wait there." - para "Look, ",$52,"! Do" + para "Look, <PLAYER>! Do" line "you see that ball" cont "on the table?" @@ -184,34 +184,34 @@ _OaksLabChooseMonText:: done _OaksLabRivalInterjectionText:: - text $53, ": Hey!" + text "<RIVAL>: Hey!" line "Gramps! What" cont "about me?" done _OaksLabBePatientText:: text "OAK: Be patient," - line $53,", I'll give" + line "<RIVAL>, I'll give" cont "you one later." done _OaksLabRivalTakesText1:: - text $53,": No way!" - line $52,", I want" + text "<RIVAL>: No way!" + line "<PLAYER>, I want" cont "this #MON!" prompt _OaksLabRivalTakesText2:: - text $53," snatched" + text "<RIVAL> snatched" line "the #MON!@@" _OaksLabRivalTakesText3:: - text "OAK: ",$53,"! What" + text "OAK: <RIVAL>! What" line "are you doing?" prompt _OaksLabRivalTakesText4:: - text $53,": Gramps, I" + text "<RIVAL>: Gramps, I" line "want this one!" prompt @@ -225,12 +225,12 @@ _OaksLabRivalTakesText5:: line "give you one" cont "anyway..." - para $52,", come over" + para "<PLAYER>, come over" line "here." done _OaksLabOakGivesText:: - text "OAK: ",$52,", this" + text "OAK: <PLAYER>, this" line "is the #MON I" cont "caught earlier." @@ -241,9 +241,9 @@ _OaksLabOakGivesText:: prompt _OaksLabReceivedText:: - text $52," received" + text "<PLAYER> received" line "a @" - TX_RAM $CD6D + TX_RAM wcd6d text "!@@" _OaksLabLeavingText:: @@ -252,8 +252,8 @@ _OaksLabLeavingText:: done _OaksLabRivalChallengeText:: - text $53, ": Wait" - line $52, "!" + text "<RIVAL>: Wait" + line "<PLAYER>!" cont "Let's check out" cont "our #MON!" @@ -269,17 +269,17 @@ _OaksLabText_1d3be:: prompt _OaksLabText_1d3c3:: - text $53, ": Yeah! Am" + text "<RIVAL>: Yeah! Am" line "I great or what?" prompt _OaksLabRivalToughenUpText:: - text $53, ": Okay!" + text "<RIVAL>: Okay!" line "I'll make my" cont "#MON fight to" cont "toughen it up!" - para $52, "! Gramps!" + para "<PLAYER>! Gramps!" line "Smell you later!" done @@ -308,18 +308,18 @@ _OaksLabPikachuDislikesPokeballsText2:: done _OaksLabText21:: - text $53, ": Gramps!" + text "<RIVAL>: Gramps!" done _OaksLabText22:: - text $53,": Gramps," + text "<RIVAL>: Gramps," line "my #MON has" cont "grown stronger!" cont "Check it out!" done _OaksLabText23:: - text "OAK: Ah, ",$53,"," + text "OAK: Ah, <RIVAL>," line "good timing!" para "I needed to ask" @@ -342,11 +342,11 @@ _OaksLabText24:: done _OaksLabText25:: - text "OAK: ", $52, " and" - line $53, "! Take" + text "OAK: <PLAYER> and" + line "<RIVAL>! Take" cont "these with you!" - para $52, " got" + para "<PLAYER> got" line "#DEX from OAK!@@" _OaksLabText26:: @@ -373,11 +373,11 @@ _OaksLabText26:: done _OaksLabText27:: - text $53, ": Alright" + text "<RIVAL>: Alright" line "Gramps! Leave it" cont "all to me!" - para $52, ", I hate to" + para "<PLAYER>, I hate to" line "say it, but I" cont "don't need you!" @@ -387,10 +387,10 @@ _OaksLabText27:: para "I'll tell her not" line "to lend you one," - cont $52, "! Hahaha!" + cont "<PLAYER>! Hahaha!" done _OaksLabText_1d405:: text "I study #MON as" line "PROF.OAK's AIDE." - done
\ No newline at end of file + done diff --git a/text/maps/route_24.asm b/text/maps/route_24.asm index 7a073916..475a2602 100644 --- a/text/maps/route_24.asm +++ b/text/maps/route_24.asm @@ -4,13 +4,13 @@ _Route24Text_51510:: cont "contest trainers!@@" _Route24Text_51515:: - db $0 + text "" para "You just earned a" line "fabulous prize!" prompt _Route24Text_5151a:: - text $52, " received" + text "<PLAYER> received" line "a @" TX_RAM wcf4b text "!@@" @@ -154,3 +154,30 @@ _Route24AfterBattleText6:: line "have no regrets!" done +_Route24DamianText1:: + text "I'm not good at" + line "raising #MON." + + para "I should release" + line "my CHARMANDER" + cont "because I haven't" + cont "raised it well..." + + para "If you promise me" + line "you'll care for" + cont "it, it's yours." + done + +_Route24DamianText2:: + text "Take good care of" + line "my CHARMANDER!@@" + +_Route24DamianText3:: + text "Oh... I'd better" + line "release it then." + done + +_Route24DamianText4:: + text "How's CHARMANDER" + line "doing?" + done diff --git a/text/maps/route_25.asm b/text/maps/route_25.asm index 0d0d8b5b..f9f0c8ff 100644 --- a/text/maps/route_25.asm +++ b/text/maps/route_25.asm @@ -1,31 +1,3 @@ -_Route25DamianText1:: - text "I'm not good at" - line "raising #MON." - - para "I should release" - line "my CHARMANDER" - cont "because I haven't" - cont "raised it well..." - - para "If you promise me" - line "you'll care for" - cont "it, it's yours." - done - -_Route25DamianText2:: - text "Take good care of" - line "my CHARMANDER!@@" - -_Route25DamianText3:: - text "Oh... I'd better" - line "release it then." - done - -_Route25DamianText4:: - text "How's CHARMANDER" - line "doing?" - done - _Route25BattleText1:: text "Local trainers" line "come here to" diff --git a/text/maps/vermilion_city.asm b/text/maps/vermilion_city.asm index 603b218a..f5e0adba 100644 --- a/text/maps/vermilion_city.asm +++ b/text/maps/vermilion_city.asm @@ -35,7 +35,7 @@ _SSAnneWelcomeText9:: prompt _SSAnneFlashedTicketText:: - text $52, " flashed" + text "<PLAYER> flashed" line "the S.S.TICKET!" para "Great! Welcome to" @@ -43,7 +43,7 @@ _SSAnneFlashedTicketText:: done _SSAnneNoTicketText:: - text $52, " doesn't" + text "<PLAYER> doesn't" line "have the needed" cont "S.S.TICKET." @@ -70,8 +70,8 @@ _VermilionCityText5:: text "MACHOP: Guoh!" line "Gogogoh!@@" -_VermilionCityText14:: - db $0 +_VermilionCityText15:: + text "" para "A MACHOP is" line "stomping the land" cont "flat." @@ -127,13 +127,13 @@ _OfficerJennyText5:: line "doing?" done -_VermilionCityText7:: +_VermilionCityText8:: text "VERMILION CITY" line "The Port of" cont "Exquisite Sunsets" done -_VermilionCityText8:: +_VermilionCityText9:: text "NOTICE!" para "ROUTE 12 may be" @@ -147,13 +147,13 @@ _VermilionCityText8:: para "VERMILION POLICE" done -_VermilionCityText11:: +_VermilionCityText12:: text "#MON FAN CLUB" line "All #MON fans" cont "welcome!" done -_VermilionCityText12:: +_VermilionCityText13:: text "VERMILION CITY" line "#MON GYM" cont "LEADER: LT.SURGE" @@ -162,7 +162,7 @@ _VermilionCityText12:: line "American!" done -_VermilionCityText13:: +_VermilionCityText14:: text "VERMILION HARBOR" done diff --git a/text/maps/viridian_city.asm b/text/maps/viridian_city.asm index 4459acb8..a9a2184e 100644 --- a/text/maps/viridian_city.asm +++ b/text/maps/viridian_city.asm @@ -1,4 +1,4 @@ -_ViridianCityText_19219:: +_ViridianCityText_19219:: ; 2d:4478 text "First, you need" line "to weaken the" cont "target #MON." |