diff options
Diffstat (limited to 'maps')
92 files changed, 373 insertions, 321 deletions
diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm index 64f90b38a..c4ed40efe 100644 --- a/maps/AzaleaGym.asm +++ b/maps/AzaleaGym.asm @@ -270,7 +270,7 @@ UnknownText_0x18edae: ; 0x18edae ; 0x18ee14 UnknownText_0x18ee14: ; 0x18ee14 - text $52, " received" + text "<PLAYER> received" line "HIVEBADGE." done ; 0x18ee2b diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index 1e28fc03e..4a335e23e 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -387,7 +387,7 @@ UnknownText_0x1985df: done UnknownText_0x19860b: - text $52, ", here's" + text "<PLAYER>, here's" line "your GS BALL back!" done diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm index 73b5a1e80..19ef352ff 100644 --- a/maps/BattleTower1F.asm +++ b/maps/BattleTower1F.asm @@ -406,78 +406,110 @@ UnknownText_0x9e60a: ; 0x9e60a ; 0x9e62f UnknownText_0x9e62f: ; 0x9e62f - db $0, "BATTLE TOWER is a", $4f - db "facility made for", $55 - db "#MON battles.", $51 - db "Countless #MON", $4f - db "trainers gather", $51 - db "from all over to", $4f - db "hold battles in", $51 - db "specially designed", $4f - db "BATTLE ROOMS.", $51 - db "There are many", $4f - db "BATTLE ROOMS in", $55 - db "the BATTLE TOWER.", $51 - db "Each ROOM holds", $4f - db "seven trainers.", $51 - db "If you defeat the", $4f - db "seven in a ROOM,", $51 - db "and you have a", $4f - db "good record, you", $51 - db "could become the", $4f - db "ROOM's LEADER.", $51 - db "All LEADERS will", $4f - db "be recorded in the", $51 - db "HONOR ROLL for", $4f - db "posterity.", $51 - db "You may challenge", $4f - db "in up to five", $51 - db "BATTLE ROOMS each", $4f - db "day.", $51 - db "However, you may", $4f - db "battle only once a", $51 - db "day in any given", $4f - db "ROOM.", $51 - db "To interrupt a", $4f - db "session, you must", $51 - db "SAVE. If not, you", $4f - db "won't be able to", $51 - db "resume your ROOM", $4f - db "challenge.", $51 - db $57 + text "BATTLE TOWER is a" + line "facility made for" + cont "#MON battles." + + para "Countless #MON" + line "trainers gather" + + para "from all over to" + line "hold battles in" + + para "specially designed" + line "BATTLE ROOMS." + + para "There are many" + line "BATTLE ROOMS in" + cont "the BATTLE TOWER." + + para "Each ROOM holds" + line "seven trainers." + + para "If you defeat the" + line "seven in a ROOM," + + para "and you have a" + line "good record, you" + + para "could become the" + line "ROOM's LEADER." + + para "All LEADERS will" + line "be recorded in the" + + para "HONOR ROLL for" + line "posterity." + + para "You may challenge" + line "in up to five" + + para "BATTLE ROOMS each" + line "day." + + para "However, you may" + line "battle only once a" + + para "day in any given" + line "ROOM." + + para "To interrupt a" + line "session, you must" + + para "SAVE. If not, you" + line "won't be able to" + + para "resume your ROOM" + line "challenge." + + para "" + done ; 0x9e886 UnknownText_0x9e886: ; 0x9e886 - db $0, "BATTLE TOWER is a", $4f - db "facility made for", $55 - db "#MON battles.", $51 - db "Countless #MON", $4f - db "trainers gather", $51 - db "from all over to", $4f - db "hold battles in", $51 - db "specially designed", $4f - db "BATTLE ROOMS.", $51 - db "There are many", $4f - db "BATTLE ROOMS in", $55 - db "the BATTLE TOWER.", $51 - db "Each ROOM holds", $4f - db "seven trainers.", $51 - db "Beat them all, and", $4f - db "win a prize.", $51 - db "To interrupt a", $4f - db "session, you must", $51 - db "SAVE. If not, you", $4f - db "won't be able to", $51 - db "resume your ROOM", $4f - db "challenge.", $51 - db $57 + text "BATTLE TOWER is a" + line "facility made for" + cont "#MON battles." + + para "Countless #MON" + line "trainers gather" + + para "from all over to" + line "hold battles in" + + para "specially designed" + line "BATTLE ROOMS." + + para "There are many" + line "BATTLE ROOMS in" + cont "the BATTLE TOWER." + + para "Each ROOM holds" + line "seven trainers." + + para "Beat them all, and" + line "win a prize." + + para "To interrupt a" + line "session, you must" + + para "SAVE. If not, you" + line "won't be able to" + + para "resume your ROOM" + line "challenge." + + para "" + done ; 0x9e9eb UnknownText_0x9e9eb: ; 0x9e9eb - db $0, "Received a list of", $4f - db "LEADERS on the", $55 - db "HONOR ROLL.", $51 - db $57 + text "Received a list of" + line "LEADERS on the" + cont "HONOR ROLL." + + para "" + done ; 0x9ea1b UnknownText_0x9ea1b: ; 0x9ea1b @@ -487,8 +519,10 @@ UnknownText_0x9ea1b: ; 0x9ea1b ; 0x9ea3c UnknownText_0x9ea3c: ; 0x9ea3c - db $0, "Thank you!", $51 - db $57 + text "Thank you!" + + para "" + done ; 0x9ea49 UnknownText_0x9ea49: ; 0x9ea49 @@ -498,25 +532,35 @@ UnknownText_0x9ea49: ; 0x9ea49 ; 0x9ea5f UnknownText_0x9ea5f: ; 0x9ea5f - db $0, "Congratulations!", $51 - db "You've beaten all", $4f - db "the trainers!", $51 - db "Your feat may be", $4f - db "worth registering,", $51 - db $52, ". With your", $4f - db "results, you may", $51 - db "be chosen as a", $4f - db "ROOM LEADER.", $51 - db $57 + text "Congratulations!" + + para "You've beaten all" + line "the trainers!" + + para "Your feat may be" + line "worth registering," + + para "<PLAYER>. With your" + line "results, you may" + + para "be chosen as a" + line "ROOM LEADER." + + para "" + done ; 0x9eaef UnknownText_0x9eaef: ; 0x9eaef - db $0, "Congratulations!", $51 - db "You've beaten all", $4f - db "the trainers!", $51 - db "For that, you get", $4f - db "this great prize!", $51 - db $57 + text "Congratulations!" + + para "You've beaten all" + line "the trainers!" + + para "For that, you get" + line "this great prize!" + + para "" + done ; 0x9eb45 UnknownText_0x9eb45: ; 0x9eb45 @@ -529,13 +573,13 @@ UnknownText_0x9eb45: ; 0x9eb45 ; 0x9eb7e UnknownText_0x9eb7e: ; 0x9eb7e - db $0, $52, " got five", $4f - db "@" + text "<PLAYER> got five" + line "@" text_from_ram StringBuffer4 - db $0, "!@" + text "!@" sound0x0F text_waitbutton - db $50 + db "@" ; 0x9eb94 UnknownText_0x9eb94: ; 0x9eb94 diff --git a/maps/BlackthornDragonSpeechHouse.asm b/maps/BlackthornDragonSpeechHouse.asm index f852da0b8..f8338d34e 100644 --- a/maps/BlackthornDragonSpeechHouse.asm +++ b/maps/BlackthornDragonSpeechHouse.asm @@ -19,9 +19,11 @@ EkansScript_0x19594c: ; 0x19594c end ; 0x195956 -UnknownText_0x195956: ; 0x195956 - limited_interpret_data 2 - db $0, "ズ", $03, $00 +UnknownScript_0x195956: + jumpstd picturebookshelf + +UnknownScript_0x195959: + jumpstd magazinebookshelf UnknownText_0x19595c: ; 0x19595c text "A clan of trainers" diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm index 39e84224b..d5982cabd 100644 --- a/maps/BlackthornGym1F.asm +++ b/maps/BlackthornGym1F.asm @@ -275,7 +275,7 @@ UnknownText_0x195196: done UnknownText_0x1951bf: - text $52, " received" + text "<PLAYER> received" line "TM24." done diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm index 348800279..33aab7701 100644 --- a/maps/BrunosRoom.asm +++ b/maps/BrunosRoom.asm @@ -111,7 +111,7 @@ UnknownText_0x1809fe: ; 0x1809fe para "determined. Per-" line "fect for battle!" - para "Ready, ", $52, "?" + para "Ready, <PLAYER>?" line "You will bow down" para "to our overwhelm-" diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm index 99c6f9934..f85059398 100644 --- a/maps/BurnedTower1F.asm +++ b/maps/BurnedTower1F.asm @@ -261,7 +261,7 @@ UnknownText_0x185ecc: ; 0x185ecc para "And you are…?" - para $52, "? Glad to" + para "<PLAYER>? Glad to" line "meet you!" para "I heard rumors" diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm index 2810fdecb..fade946df 100644 --- a/maps/BurnedTowerB1F.asm +++ b/maps/BurnedTowerB1F.asm @@ -222,7 +222,7 @@ UnknownText_0x18626a: ; 0x18626a para "I'm all choked up!" - para $52, ", I owe" + para "<PLAYER>, I owe" line "this all to you!" para "Thank you!" @@ -239,7 +239,7 @@ UnknownText_0x18626a: ; 0x18626a para "I'm going to track" line "SUICUNE." - para $52, ", let's" + para "<PLAYER>, let's" line "meet again!" para "Farewell!" diff --git a/maps/CeladonCafe.asm b/maps/CeladonCafe.asm index 7e7e96bed..08dd25c4c 100644 --- a/maps/CeladonCafe.asm +++ b/maps/CeladonCafe.asm @@ -207,14 +207,14 @@ EatathonContestPosterText: done FoundLeftoversText: - text $52, " found" + text "<PLAYER> found" line "@" text_from_ram StringBuffer3 text "!" done NoRoomForLeftoversText: - text "But ", $52, " can't" + text "But <PLAYER> can't" line "hold another item…" done diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index bd51b073f..cf269451a 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -110,7 +110,7 @@ CeladonClangText: para "@" text_from_ram StringBuffer3 - db $0 + text "" line "popped out." done diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm index bf78f9085..4d470343d 100644 --- a/maps/CeladonGym.asm +++ b/maps/CeladonGym.asm @@ -238,7 +238,7 @@ UnknownText_0x72c3e: ; 0x72c3e ; 0x72c96 UnknownText_0x72c96: ; 0x72c96 - text $52, " received" + text "<PLAYER> received" line "RAINBOWBADGE." done ; 0x72cb0 diff --git a/maps/CeladonMansion2F.asm b/maps/CeladonMansion2F.asm index e8807b446..e20c6ce89 100644 --- a/maps/CeladonMansion2F.asm +++ b/maps/CeladonMansion2F.asm @@ -15,7 +15,7 @@ CeladonMansion2FBookshelf: jumpstd difficultbookshelf CeladonMansion2FComputerText: - text $52, " turned on" + text "<PLAYER> turned on" line "the PC." para "…" diff --git a/maps/CeladonMansionRoof.asm b/maps/CeladonMansionRoof.asm index 26b47114b..e40600275 100644 --- a/maps/CeladonMansionRoof.asm +++ b/maps/CeladonMansionRoof.asm @@ -30,7 +30,7 @@ UnknownText_0x71aa1: ; 0x71aa1 text "There's graffiti" line "on the wall…" - para $52, " added a" + para "<PLAYER> added a" line "moustache!" done ; 0x71ad4 diff --git a/maps/CeladonPokeCenter1F.asm b/maps/CeladonPokeCenter1F.asm index 905f65f75..bf2edc874 100644 --- a/maps/CeladonPokeCenter1F.asm +++ b/maps/CeladonPokeCenter1F.asm @@ -109,7 +109,7 @@ UnknownText_0x71f22: ; 0x71f22 ; 0x71f65 UnknownText_0x71f65: ; 0x71f65 - text $52, ", have you" + text "<PLAYER>, have you" line "heard?" para "There have been" @@ -126,13 +126,13 @@ UnknownText_0x71f65: ; 0x71f65 line "ECRUTEAK." para "I'll be seeing" - line "you, ", $52, "!" + line "you, <PLAYER>!" done ; 0x7201a UnknownText_0x7201a: ; 0x7201a text "Oh, by the way," - line $52, "." + line "<PLAYER>." para "Have you caught" line "the legendary" @@ -149,7 +149,7 @@ UnknownText_0x7201a: ; 0x7201a cont "you'll inform me." para "I'm counting on" - line "you, ", $52, "!" + line "you, <PLAYER>!" done ; 0x720b8 diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm index 42e2070a1..03732de46 100644 --- a/maps/CeruleanGym.asm +++ b/maps/CeruleanGym.asm @@ -335,7 +335,7 @@ UnknownText_0x18870c: ; 0x18870c ; 0x188768 UnknownText_0x188768: ; 0x188768 - text $52, " received" + text "<PLAYER> received" line "CASCADEBADGE." done ; 0x188782 diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index f0f8401ad..fa78dca75 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -409,7 +409,7 @@ GuideGentGiftText: done GotMapCardText: - text $52, "'s #GEAR" + text "<PLAYER>'s #GEAR" line "now has a MAP!" done diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index 46261da85..4569dd5e4 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -271,7 +271,7 @@ UnknownText_0x1a03cc: UnknownText_0x1a0433: text "EUSINE: Yo," - line $52, "." + line "<PLAYER>." para "Wasn't that" line "SUICUNE just now?" @@ -303,7 +303,7 @@ UnknownText_0x1a0433: line "a trainer to earn" cont "SUICUNE's respect!" - para "Come on, ", $52, "." + para "Come on, <PLAYER>." line "Let's battle now!" done @@ -314,7 +314,7 @@ UnknownText_0x1a05a1: UnknownText_0x1a05c3: text "You're amazing," - line $52, "!" + line "<PLAYER>!" para "No wonder #MON" line "gravitate to you." diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm index 4f54f8bfe..7128c0eed 100644 --- a/maps/CianwoodGym.asm +++ b/maps/CianwoodGym.asm @@ -268,7 +268,7 @@ UnknownText_0x9d7f6: ; 0x9d7f6 ; 0x9d835 UnknownText_0x9d835: ; 0x9d835 - text $52, " received" + text "<PLAYER> received" line "STORMBADGE." done ; 0x9d84d diff --git a/maps/CianwoodPharmacy.asm b/maps/CianwoodPharmacy.asm index 7b0cc838f..167a64312 100644 --- a/maps/CianwoodPharmacy.asm +++ b/maps/CianwoodPharmacy.asm @@ -59,7 +59,7 @@ PharmacistGiveSecretpotionText: done ReceivedSecretpotionText: - text $52, " received" + text "<PLAYER> received" line "SECRETPOTION." done diff --git a/maps/CianwoodPokeCenter1F.asm b/maps/CianwoodPokeCenter1F.asm index 07e896cca..ba9a1bd0e 100644 --- a/maps/CianwoodPokeCenter1F.asm +++ b/maps/CianwoodPokeCenter1F.asm @@ -87,7 +87,7 @@ CianwoodGymGuyText: ; 0x9dc33 ; 0x9ddc5 CianwoodGymGuyWinText: ; 0x9ddc5 - text $52, "! You won!" + text "<PLAYER>! You won!" line "I could tell by" cont "looking at you!" done diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm index 510cd5c5a..fc8495664 100644 --- a/maps/CopycatsHouse2F.asm +++ b/maps/CopycatsHouse2F.asm @@ -198,13 +198,13 @@ MovementData_0x18afd0: ; 0x18afd0 ; 0x18afda UnknownText_0x18afda: ; 0x18afda - text $52, ": Hi! Do" + text "<PLAYER>: Hi! Do" line "you like #MON?" - para $52, ": Uh, no, I" + para "<PLAYER>: Uh, no, I" line "just asked you." - para $52, ": Huh?" + para "<PLAYER>: Huh?" line "You're strange!" done ; 0x18b028 @@ -219,17 +219,17 @@ UnknownText_0x18b028: ; 0x18b028 ; 0x18b064 UnknownText_0x18b064: ; 0x18b064 - text $52, ": Hi!" + text "<PLAYER>: Hi!" line "I heard that you" para "lost your favorite" line "# DOLL." - para $52, ": If I find" + para "<PLAYER>: If I find" line "it, you'll give me" cont "a rail PASS?" - para $52, ": I'll go" + para "<PLAYER>: I'll go" line "find it for you." para "You think you lost" @@ -286,13 +286,13 @@ UnknownText_0x18b214: ; 0x18b214 ; 0x18b298 UnknownText_0x18b298: ; 0x18b298 - text $52, ": Hi!" + text "<PLAYER>: Hi!" line "Thanks a lot for" cont "the rail PASS!" - para $52, ": Pardon?" + para "<PLAYER>: Pardon?" - para $52, ": Is it" + para "<PLAYER>: Is it" line "that fun to mimic" cont "my every move?" done @@ -305,29 +305,29 @@ UnknownText_0x18b2f5: ; 0x18b2f5 ; 0x18b316 UnknownText_0x18b316: ; 0x18b316 - text $52, ": Hi. You" + text "<PLAYER>: Hi. You" line "must like #MON." - para $52, ": No, not" + para "<PLAYER>: No, not" line "me. I asked you." - para $52, ": Pardon?" + para "<PLAYER>: Pardon?" line "You're weird!" done ; 0x18b366 UnknownText_0x18b366: ; 0x18b366 - text $52, ": Hi. Did" + text "<PLAYER>: Hi. Did" line "you really lose" cont "your # DOLL?" - para $52, ": You'll" + para "<PLAYER>: You'll" line "really give me a" para "rail PASS if I" line "find it for you?" - para $52, ": Sure," + para "<PLAYER>: Sure," line "I'll look for it!" para "You think you lost" @@ -337,12 +337,12 @@ UnknownText_0x18b366: ; 0x18b366 ; 0x18b415 UnknownText_0x18b415: ; 0x18b415 - text $52, ": Thank you" + text "<PLAYER>: Thank you" line "for the rail PASS!" - para $52, ": …Pardon?" + para "<PLAYER>: …Pardon?" - para $52, ": Is it" + para "<PLAYER>: Is it" line "really that fun to" para "copy what I say" diff --git a/maps/DayCare.asm b/maps/DayCare.asm index d48f629b1..a7824d3a5 100644 --- a/maps/DayCare.asm +++ b/maps/DayCare.asm @@ -143,7 +143,7 @@ UnknownText_0x631a1: ; 0x631a1 ; 0x631ae UnknownText_0x631ae: ; 0x631ae - text $52, " received" + text "<PLAYER> received" line "ODD EGG!" done ; 0x631c3 diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index 0106c8062..3cd1a8081 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -503,7 +503,7 @@ UnknownText_0x18d47c: ; 0x18d47c para "That conviction is" line "what is important!" - para $52, ", don't" + para "<PLAYER>, don't" line "lose that belief." para "It will see you" @@ -564,7 +564,7 @@ UnknownText_0x18d604: ; 0x18d604 ; 0x18d697 UnknownText_0x18d697: ; 0x18d697 - text $52, " received" + text "<PLAYER> received" line "DRATINI!" done ; 0x18d6ac @@ -697,7 +697,7 @@ UnknownText_0x18d9bf: ; 0x18d9bf ; 0x18d9f2 UnknownText_0x18d9f2: ; 0x18d9f2 - text $52, " received" + text "<PLAYER> received" line "RISINGBADGE." done ; 0x18da0b @@ -722,7 +722,8 @@ UnknownText_0x18da0b: ; 0x18da0b ; 0x18dab4 UnknownText_0x18dab4: ; 0x18dab4 - db $0, $56, $56, $56, $56, $56, $56, $57 + text $56, $56, $56, $56, $56, $56 + done ; 0x18dabc DragonShrine_MapEventHeader: ; 0x18dabc diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index aa241b968..909b483d3 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -306,7 +306,7 @@ UnknownText_0x18c9bf: ; 0x18c9bf ; 0x18c9fb UnknownText_0x18c9fb: ; 0x18c9fb - text $52, " received" + text "<PLAYER> received" line "TM24." done ; 0x18ca0d @@ -384,7 +384,7 @@ UnknownText_0x18cc2e: ; 0x18cc2e UnknownText_0x18cc83: ; 0x18cc83 text "…" - line "What? ", $52, "?" + line "What? <PLAYER>?" para "…No, I won't" line "battle you now…" @@ -501,7 +501,7 @@ UnknownText_0x18cf0f: ; 0x18cf0f ; 0x18cf41 UnknownText_0x18cf41: ; 0x18cf41 - text $52, " found" + text "<PLAYER> found" line "@" text_from_ram StringBuffer3 text "!" @@ -509,7 +509,7 @@ UnknownText_0x18cf41: ; 0x18cf41 ; 0x18cf51 UnknownText_0x18cf51: ; 0x18cf51 - text "But ", $52, " can't" + text "But <PLAYER> can't" line "carry any more" cont "items." done diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index 1454da7f9..4029f9800 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -309,7 +309,7 @@ UnknownText_0x9a00a: ; 0x9a00a ; 0x9a043 UnknownText_0x9a043: ; 0x9a043 - text $52, " received" + text "<PLAYER> received" line "FOGBADGE." done ; 0x9a059 @@ -465,7 +465,7 @@ EcruteakGymGuyText: ; 0x9a3e8 ; 0x9a452 EcruteakGymGuyWinText: ; 0x9a452 - text "Whew, ", $52, "." + text "Whew, <PLAYER>." line "You did great!" para "I was cowering in" diff --git a/maps/EcruteakPokeCenter1F.asm b/maps/EcruteakPokeCenter1F.asm index 551871d60..f14e01f85 100644 --- a/maps/EcruteakPokeCenter1F.asm +++ b/maps/EcruteakPokeCenter1F.asm @@ -111,7 +111,7 @@ UnknownText_0x98ed8: ; 0x98ed8 text "Hi, I'm BILL. And" line "who are you?" - para "Hmm, ", $52, ", huh?" + para "Hmm, <PLAYER>, huh?" line "You've come at the" cont "right time." done diff --git a/maps/ElmsHouse.asm b/maps/ElmsHouse.asm index 7e5212f40..17d3c91fa 100644 --- a/maps/ElmsHouse.asm +++ b/maps/ElmsHouse.asm @@ -18,7 +18,7 @@ ElmsHouseBookshelf: jumpstd difficultbookshelf ElmsWifeText: - text "Hi, ", $14, "! My" + text "Hi, <PLAY_G>! My" line "husband's always" para "so busy--I hope" diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index 5736a48bb..c4e8eeee1 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -794,7 +794,7 @@ AfterChikoritaMovement: ; 0x78fb0 ; 0x78fb6 UnknownText_0x78fb6: ; 0x78fb6 - text "ELM: ", $14, "!" + text "ELM: <PLAY_G>!" line "There you are!" para "I needed to ask" @@ -807,7 +807,7 @@ UnknownText_0x78fb6: ; 0x78fb6 line "wondering if you" para "could help me with" - line "it, ", $14, "." + line "it, <PLAY_G>." para "You see…" @@ -834,7 +834,7 @@ UnknownText_0x78fb6: ; 0x78fb6 ; 0x790fa UnknownText_0x790fa: ; 0x790fa - text "Thanks, ", $14, "!" + text "Thanks, <PLAY_G>!" para "You're a great" line "help!" @@ -902,7 +902,7 @@ UnknownText_0x791df: ; 0x791df para "I know!" - para $14, ", can you" + para "<PLAY_G>, can you" line "go in our place?" done ; 0x792ff @@ -916,7 +916,7 @@ UnknownText_0x792ff: ; 0x792ff para "You'll be that" line "#MON's first" - cont "partner, ", $14, "!" + cont "partner, <PLAY_G>!" para "Go on. Pick one!" done @@ -973,7 +973,7 @@ ChoseStarterText: ; 0x79487 ; 0x794ad ReceivedStarterText: ; 0x794ad - text $52, " received" + text "<PLAYER> received" line "@" text_from_ram StringBuffer3 text "!" @@ -1012,12 +1012,12 @@ ElmDirectionsText2: ; 0x79581 done ElmDirectionsText3: ; 0x795db - text $14, ", I'm" + text "<PLAY_G>, I'm" line "counting on you!" done GotElmsNumberText: ; 0x795f3 - text $52, " got ELM's" + text "<PLAYER> got ELM's" line "phone number." done @@ -1048,7 +1048,7 @@ ElmsLabHealingMachineText2: done ElmAfterTheftText1: ; 0x796cd - text "ELM: ", $14, ", this" + text "ELM: <PLAY_G>, this" line "is terrible…" para "Oh, yes, what was" @@ -1058,7 +1058,7 @@ ElmAfterTheftText1: ; 0x796cd ; 0x79712 ElmAfterTheftText2: ; 0x79712 - text $52, " handed" + text "<PLAYER> handed" line "the MYSTERY EGG to" cont "PROF.ELM." done @@ -1084,7 +1084,7 @@ ElmAfterTheftText5: ; 0x79780 para "PROF.OAK gave you" line "a #DEX?" - para $14, ", is that" + para "<PLAY_G>, is that" line "true? Th-that's" cont "incredible!" @@ -1093,7 +1093,7 @@ ElmAfterTheftText5: ; 0x79780 cont "tial of people as" cont "trainers." - para "Wow, ", $14, ". You" + para "Wow, <PLAY_G>. You" line "may have what it" para "takes to become" @@ -1114,7 +1114,7 @@ ElmAfterTheftText5: ; 0x79780 ; 0x798cf ElmAfterTheftText6: ; 0x798cf - text "…", $14, ". The" + text "…<PLAY_G>. The" line "road to the" para "championship will" @@ -1136,7 +1136,7 @@ ElmStudyingEggText: ; 0x7993c ; 0x7997d ElmAideHasEggText: ; 0x7997d - text "ELM: ", $14, "?" + text "ELM: <PLAY_G>?" line "Didn't you meet my" cont "assistant?" @@ -1159,7 +1159,7 @@ ElmWaitingEggHatchText: ; 0x79a1b ; 0x79a40 UnknownText_0x79a40: ; 0x79a40 - text $14, "? I thought" + text "<PLAY_G>? I thought" line "the EGG hatched." para "Where is the" @@ -1168,7 +1168,7 @@ UnknownText_0x79a40: ; 0x79a40 ; 0x79a72 ShowElmTogepiText1: ; 0x79a72 - text "ELM: ", $14, ", you" + text "ELM: <PLAY_G>, you" line "look great!" done ; 0x79a8b @@ -1194,7 +1194,7 @@ ShowElmTogepiText3: ; 0x79a9f ; 0x79b1c ElmGiveEverstoneText1: ; 0x79b1c - text "Thanks, ", $14, "!" + text "Thanks, <PLAY_G>!" line "You're helping" para "unravel #MON" @@ -1227,7 +1227,7 @@ ElmGiveEverstoneText2: ; 0x79b8d ; 0x79c37 UnknownText_0x79c37: ; 0x79c37 - text "ELM: ", $14, ", I'll" + text "ELM: <PLAY_G>, I'll" line "call you if any-" cont "thing comes up." done @@ -1249,7 +1249,7 @@ UnknownText_0x79c65: ; 0x79c65 ; 0x79cd0 ElmGiveMasterBallText1: ; 0x79cd0 - text "ELM: Hi, ", $14, "!" + text "ELM: Hi, <PLAY_G>!" line "Thanks to you, my" para "research is going" @@ -1279,12 +1279,12 @@ ElmGiveMasterBallText2: ; 0x79d31 line "make much better" para "use of it than I" - line "can, ", $14, "!" + line "can, <PLAY_G>!" done ; 0x79df3 ElmGiveTicketText1: ; 0x79df3 - text "ELM: ", $14, "!" + text "ELM: <PLAY_G>!" line "There you are!" para "I called because I" @@ -1304,7 +1304,7 @@ ElmGiveTicketText2: ; 0x79e6f line "from OLIVINE CITY." para "But you knew that" - line "already, ", $14, "." + line "already, <PLAY_G>." para "After all, you've" line "traveled all over" @@ -1323,7 +1323,7 @@ UnknownText_0x79f0b: ; 0x79f0b ; 0x79f38 UnknownText_0x79f38: ; 0x79f38 - text $14, ", I want" + text "<PLAY_G>, I want" line "you to have this" cont "for your errand." done @@ -1363,7 +1363,7 @@ UnknownText_0x79f95: ; 0x79f95 ; 0x7a078 UnknownText_0x7a078: ; 0x7a078 - text $14, "!" + text "<PLAY_G>!" para "Use these on your" line "#DEX quest!" @@ -1404,7 +1404,7 @@ UnknownText_0x7a0f0: ; 0x7a0f0 ; 0x7a1c0 UnknownText_0x7a1c0: ; 0x7a1c0 - text "OK! So ", $53 + text "OK! So <RIVAL>" line "was his name." para "Thanks for helping" @@ -1425,7 +1425,7 @@ ElmsLabWindowText2: done ElmsLabTravelTip1Text: - text $52, " opened a" + text "<PLAYER> opened a" line "book." para "Travel Tip 1:" @@ -1435,7 +1435,7 @@ ElmsLabTravelTip1Text: done ElmsLabTravelTip2Text: - text $52, " opened a" + text "<PLAYER> opened a" line "book." para "Travel Tip 2:" @@ -1445,7 +1445,7 @@ ElmsLabTravelTip2Text: done ElmsLabTravelTip3Text: - text $52, " opened a" + text "<PLAYER> opened a" line "book." para "Travel Tip 3:" @@ -1456,7 +1456,7 @@ ElmsLabTravelTip3Text: done ElmsLabTravelTip4Text: - text $52, " opened a" + text "<PLAYER> opened a" line "book." para "Travel Tip 4:" diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm index 90556c526..0d570efc4 100644 --- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm +++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm @@ -405,7 +405,7 @@ UnknownText_0x760ae: ; 0x760ae ; 0x76143 UnknownText_0x76143: ; 0x76143 - text $14, ", was it?" + text "<PLAY_G>, was it?" line "I heard you enter-" cont "tained my grand-" cont "daughter." diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm index 163e06c13..334415eb1 100644 --- a/maps/FuchsiaGym.asm +++ b/maps/FuchsiaGym.asm @@ -271,7 +271,7 @@ UnknownText_0x195fa1: ; 0x195fa1 ; 0x195feb UnknownText_0x195feb: ; 0x195feb - text $52, " received" + text "<PLAYER> received" line "SOULBADGE." done ; 0x196002 diff --git a/maps/GoldenrodBikeShop.asm b/maps/GoldenrodBikeShop.asm index 0e7dc59df..cef980d82 100644 --- a/maps/GoldenrodBikeShop.asm +++ b/maps/GoldenrodBikeShop.asm @@ -76,7 +76,7 @@ UnknownText_0x547f8: ; 0x547f8 ; 0x54848 UnknownText_0x54848: ; 0x54848 - text $52, " borrowed a" + text "<PLAYER> borrowed a" line "BICYCLE." done ; 0x5485f diff --git a/maps/GoldenrodBillsHouse.asm b/maps/GoldenrodBillsHouse.asm index 959b73bb8..9da18cf81 100644 --- a/maps/GoldenrodBillsHouse.asm +++ b/maps/GoldenrodBillsHouse.asm @@ -114,7 +114,7 @@ BillsHouseRadio: jumpstd radio2 UnknownText_0x54c74: ; 0x54c74 - text "BILL: Hi, ", $52, "!" + text "BILL: Hi, <PLAYER>!" line "Do us a favor and" cont "take this EEVEE." @@ -130,7 +130,7 @@ UnknownText_0x54c74: ; 0x54c74 para "Can I count on you" line "to play with it," - cont $52, "?" + cont "<PLAYER>?" done ; 0x54d3f @@ -150,7 +150,7 @@ UnknownText_0x54d3f: ; 0x54d3f ; 0x54dae UnknownText_0x54dae: ; 0x54dae - text $52, " received" + text "<PLAYER> received" line "EEVEE!" done ; 0x54dc1 @@ -230,7 +230,7 @@ UnknownText_0x54f9e: ; 0x54f9e ; 0x54fd9 UnknownText_0x54fd9: ; 0x54fd9 - text $52, " recorded" + text "<PLAYER> recorded" line "BILL's number." done ; 0x54ff3 diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index 24a5ee167..8e095969a 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -536,7 +536,8 @@ UnknownText_0x1991ac: done UnknownText_0x1991cf: - db $0, $57 + text "" + done GoldenrodCity_MapEventHeader: ; filler diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm index 90ba6a051..b9fb5ae36 100644 --- a/maps/GoldenrodGym.asm +++ b/maps/GoldenrodGym.asm @@ -314,7 +314,7 @@ UnknownText_0x54222: ; 0x54222 ; 0x54273 UnknownText_0x54273: ; 0x54273 - text $52, " received" + text "<PLAYER> received" line "PLAINBADGE." done ; 0x5428b diff --git a/maps/GoldenrodPokeCenter1F.asm b/maps/GoldenrodPokeCenter1F.asm index cc3fe2b68..1a5b34d65 100644 --- a/maps/GoldenrodPokeCenter1F.asm +++ b/maps/GoldenrodPokeCenter1F.asm @@ -781,7 +781,7 @@ UnknownText_0x62260: ; 0x62260 ; 0x622f0 UnknownText_0x622f0: ; 0x622f0 - text $52, ", isn't it?" + text "<PLAYER>, isn't it?" para "Congratulations!" @@ -873,7 +873,7 @@ UnknownText_0x6252a: ; 0x6252a ; 0x62549 UnknownText_0x62549: ; 0x62549 - text $52, " gave away" + text "<PLAYER> gave away" line "the EON MAIL." done ; 0x62564 diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm index 9d80e7acd..d0c07b29b 100644 --- a/maps/HallOfFame.asm +++ b/maps/HallOfFame.asm @@ -108,7 +108,7 @@ UnknownText_0x1814a6: ; 0x1814a6 para "all the makings" line "of greatness!" - para $14, ", allow me" + para "<PLAY_G>, allow me" line "to register you" para "and your partners" diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index c4a63eae8..95631b273 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -990,7 +990,7 @@ UnknownText_0x6f394: ; 0x6f394 ; 0x6f43b UnknownText_0x6f43b: ; 0x6f43b - text $52, " put in the" + text "<PLAYER> put in the" line "GS BALL." done ; 0x6f452 @@ -999,7 +999,7 @@ UnknownText_0x6f452: ; 0x6f452 text "Whew, wasn't that" line "something!" - para $52, ", that was" + para "<PLAYER>, that was" line "fantastic. Thanks!" para "The legends about" diff --git a/maps/IndigoPlateauPokeCenter1F.asm b/maps/IndigoPlateauPokeCenter1F.asm index b09f0b1d4..e499ca3d2 100644 --- a/maps/IndigoPlateauPokeCenter1F.asm +++ b/maps/IndigoPlateauPokeCenter1F.asm @@ -246,7 +246,7 @@ UnknownText_0x1801f5: ; 0x1801f5 para "are going to pound" line "you." - para $52, "!" + para "<PLAYER>!" line "I challenge you!" done ; 0x180295 diff --git a/maps/KarensRoom.asm b/maps/KarensRoom.asm index 9bdeee14a..6cadcb604 100644 --- a/maps/KarensRoom.asm +++ b/maps/KarensRoom.asm @@ -94,7 +94,7 @@ UnknownText_0x180c27: ; 0x180c27 text "I am KAREN of the" line "ELITE FOUR." - para "You're ", $52, "?" + para "You're <PLAYER>?" line "How amusing." para "I love dark-type" diff --git a/maps/KrissHouse1F.asm b/maps/KrissHouse1F.asm index 938338c6b..72385e845 100644 --- a/maps/KrissHouse1F.asm +++ b/maps/KrissHouse1F.asm @@ -115,7 +115,7 @@ UnknownScript_0x7a572: ; 0x7a572 ; 0x7a578 GearName: ; 0x7a578 - db $54, "GEAR@" + db "#GEAR@" ; 0x7a57e UnknownScript_0x7a57e: ; 0x7a57e @@ -232,7 +232,7 @@ MovementData_0x7a602: ; 0x7a602 ; 0x7a604 UnknownText_0x7a604: ; 0x7a604 - text "Oh, ", $52, "…! Our" + text "Oh, <PLAYER>…! Our" line "neighbor, PROF." para "ELM, was looking" @@ -342,7 +342,7 @@ UnknownText_0x7a8e5: ; 0x7a8e5 ; 0x7a957 UnknownText_0x7a957: ; 0x7a957 - text $52, ", do it!" + text "<PLAYER>, do it!" para "I'm behind you all" line "the way!" @@ -351,25 +351,25 @@ UnknownText_0x7a957: ; 0x7a957 NeighborMornIntroText: text "Good morning," - line $14, "!" + line "<PLAY_G>!" para "I'm visiting!" done NeighborDayIntroText: - text "Hello, ", $14, "!" + text "Hello, <PLAY_G>!" line "I'm visiting!" done NeighborNiteIntroText: text "Good evening," - line $14, "!" + line "<PLAY_G>!" para "I'm visiting!" done NeighborText: - text $14, ", have you" + text "<PLAY_G>, have you" line "heard?" para "My daughter is" diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm index a32aff0ae..bb3b05274 100644 --- a/maps/KurtsHouse.asm +++ b/maps/KurtsHouse.asm @@ -488,7 +488,7 @@ MovementData_0x18e46c: ; 0x18e46c UnknownText_0x18e473: ; 0x18e473 text "Hm? Who are you?" - para $52, ", eh? You" + para "<PLAYER>, eh? You" line "want me to make" cont "some BALLS?" @@ -528,7 +528,7 @@ UnknownText_0x18e473: ; 0x18e473 ; 0x18e615 UnknownText_0x18e615: ; 0x18e615 - text "KURT: Hi, ", $52, "!" + text "KURT: Hi, <PLAYER>!" para "You handled your-" line "self like a real" @@ -591,7 +591,7 @@ UnknownText_0x18e7d8: ; 0x18e7d8 ; 0x18e7fb UnknownText_0x18e7fb: ; 0x18e7fb - text "KURT: Ah, ", $52, "!" + text "KURT: Ah, <PLAYER>!" line "I just finished" cont "your BALL. Here!" done @@ -645,7 +645,7 @@ UnknownText_0x18e949: ; 0x18e949 ; 0x18e95c UnknownText_0x18e95c: ; 0x18e95c - text $52, "!" + text "<PLAYER>!" para "This BALL started" line "to shake while I" diff --git a/maps/LakeofRage.asm b/maps/LakeofRage.asm index 231f8c6f8..5b3b10aed 100644 --- a/maps/LakeofRage.asm +++ b/maps/LakeofRage.asm @@ -320,7 +320,7 @@ UnknownText_0x701b4: line "because of the" cont "rumors?" - para "You're ", $52, "?" + para "You're <PLAYER>?" line "I'm LANCE, a" cont "trainer like you." @@ -330,7 +330,7 @@ UnknownText_0x701b4: para "I saw the way you" line "battled earlier," - cont $14, "." + cont "<PLAY_G>." para "I can tell that" line "you're a trainer" @@ -359,7 +359,7 @@ UnknownText_0x702c6: line "the cause." para "I'll be waiting" - line "for you, ", $14, "." + line "for you, <PLAY_G>." done UnknownText_0x70371: @@ -378,7 +378,7 @@ UnknownText_0x703cb: done UnknownText_0x703df: - text $52, " obtained a" + text "<PLAYER> obtained a" line "RED SCALE." done diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index 313bdb623..609e1aeb9 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -229,7 +229,7 @@ UnknownText_0x180f67: ; 0x180f67 text "LANCE: I've been" line "waiting for you." - para $14, "!" + para "<PLAY_G>!" para "I knew that you," line "with your skills," @@ -281,7 +281,7 @@ UnknownText_0x181132: ; 0x181132 para "You have become" line "truly powerful," - cont $14, "." + cont "<PLAY_G>." para "Your #MON have" line "responded to your" @@ -308,7 +308,7 @@ UnknownText_0x1811dd: ; 0x1811dd UnknownText_0x18121b: ; 0x18121b text "PROF.OAK: Ah," - line $14, "!" + line "<PLAY_G>!" para "It's been a long" line "while." @@ -336,7 +336,7 @@ UnknownText_0x18121b: ; 0x18121b line "severed." para "Congratulations," - line $14, "!" + line "<PLAY_G>!" done ; 0x18134b @@ -352,7 +352,7 @@ UnknownText_0x18137b: ; 0x18137b line "getting to be a" cont "bit too noisy…" - para $14, ", could you" + para "<PLAY_G>, could you" line "come with me?" done ; 0x1813c5 diff --git a/maps/LavRadioTower1F.asm b/maps/LavRadioTower1F.asm index 6cf12dd93..cb1a71d9b 100644 --- a/maps/LavRadioTower1F.asm +++ b/maps/LavRadioTower1F.asm @@ -142,7 +142,7 @@ UnknownText_0x7effb: ; 0x7effb UnknownText_0x7f0a1: ; 0x7f0a1 text "Ah! So you're the" - line $14, " who solved" + line "<PLAY_G> who solved" para "the POWER PLANT's" line "problem?" diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm index 30a7d071d..8c1449f84 100644 --- a/maps/MahoganyGym.asm +++ b/maps/MahoganyGym.asm @@ -285,7 +285,7 @@ UnknownText_0x199cb3: ; 0x199cb3 ; 0x199d3b UnknownText_0x199d3b: ; 0x199d3b - text $52, " received" + text "<PLAYER> received" line "GLACIERBADGE." done ; 0x199d55 diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm index b7100eedf..2dc7e3356 100644 --- a/maps/MahoganyMart1F.asm +++ b/maps/MahoganyMart1F.asm @@ -219,7 +219,7 @@ UnknownText_0x6c52a: ; 0x6c52a UnknownText_0x6c549: ; 0x6c549 text "What took you," - line $14, "?" + line "<PLAY_G>?" para "Just as I thought," line "that strange radio" @@ -236,7 +236,7 @@ UnknownText_0x6c59e: ; 0x6c59e ; 0x6c5ba UnknownText_0x6c5ba: ; 0x6c5ba - text "LANCE: ", $14, ", we" + text "LANCE: <PLAY_G>, we" line "should split up to" para "check this place." diff --git a/maps/MahoganyRedGyaradosSpeechHouse.asm b/maps/MahoganyRedGyaradosSpeechHouse.asm index bdf040941..06c8feac3 100644 --- a/maps/MahoganyRedGyaradosSpeechHouse.asm +++ b/maps/MahoganyRedGyaradosSpeechHouse.asm @@ -28,10 +28,11 @@ UnknownScript_0x199990: ; 0x199990 end ; 0x199996 -; TODO wtf? -UnknownText_0x199996: ; 0x199996 - limited_interpret_data 2 - db $0, "ズ", $03, $00 +UnknownScript_0x195996: + jumpstd picturebookshelf + +UnknownScript_0x195999: + jumpstd magazinebookshelf UnknownText_0x19999c: ; 0x19999c text "I heard that a red" diff --git a/maps/ManiasHouse.asm b/maps/ManiasHouse.asm index d971a0757..ce68025d5 100644 --- a/maps/ManiasHouse.asm +++ b/maps/ManiasHouse.asm @@ -142,7 +142,7 @@ UnknownText_0x9d3ed: ; 0x9d3ed ; 0x9d41b UnknownText_0x9d41b: ; 0x9d41b - text $52, " received a" + text "<PLAYER> received a" line "#MON." done ; 0x9d42f diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm index c2d1f8175..f52ea0a2f 100644 --- a/maps/MountMoon.asm +++ b/maps/MountMoon.asm @@ -99,7 +99,7 @@ UnknownText_0x74105: ; 0x74105 text $56, " ", $56, " ", $56 para "It's been a while," - line $52, "." + line "<PLAYER>." para "…Since I lost to" line "you, I thought" @@ -111,7 +111,7 @@ UnknownText_0x74105: ; 0x74105 para "And we came up" line "with an answer." - para $52, ", now we'll" + para "<PLAYER>, now we'll" line "show you!" done ; 0x7419d @@ -147,7 +147,7 @@ UnknownText_0x741fa: ; 0x741fa para "Because these guys" line "are behind me." - para "…Listen, ", $52, "." + para "…Listen, <PLAYER>." para "One of these days" line "I'm going to prove" diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm index 67be6c58d..c3be8ebbf 100644 --- a/maps/MountMortarB1F.asm +++ b/maps/MountMortarB1F.asm @@ -116,7 +116,7 @@ UnknownText_0x7e2c0: ; 0x7e2c0 ; 0x7e355 UnknownText_0x7e355: ; 0x7e355 - text $52, " received" + text "<PLAYER> received" line "TYROGUE." done ; 0x7e36a diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm index 282cfbdfb..d188e8cc5 100644 --- a/maps/MrPokemonsHouse.asm +++ b/maps/MrPokemonsHouse.asm @@ -189,7 +189,7 @@ MovementData_0x196f61: ; 0x196f61 UnknownText_0x196f66: ; 0x196f66 text "Hello, hello! You" - line "must be ", $14, "." + line "must be <PLAY_G>." para "PROF.ELM said that" line "you would visit." @@ -204,7 +204,7 @@ UnknownText_0x196fa8: ; 0x196fa8 ; 0x196fd2 UnknownText_0x196fd2: ; 0x196fd2 - text $52, " received" + text "<PLAYER> received" line "MYSTERY EGG." done ; 0x196feb @@ -267,7 +267,7 @@ UnknownText_0x19714a: ; 0x19714a UnknownText_0x197185: ; 0x197185 text "OAK: Aha! So" - line "you're ", $14, "!" + line "you're <PLAY_G>!" para "I'm OAK! A #MON" line "researcher." @@ -331,7 +331,7 @@ UnknownText_0x197185: ; 0x197185 ; 0x1973cc UnknownText_0x1973cc: ; 0x1973cc - text $52, " received" + text "<PLAYER> received" line "#DEX!" done ; 0x1973de @@ -350,7 +350,7 @@ UnknownText_0x1973de: ; 0x1973de line "GOLDENROD for my" cont "usual radio show." - para $14, ", I'm" + para "<PLAY_G>, I'm" line "counting on you!" done ; 0x197476 @@ -363,7 +363,7 @@ UnknownText_0x197476: ; 0x197476 para "That's rare! " line "I, I want it…" - para $14, ", would you" + para "<PLAY_G>, would you" line "care to trade it?" para "I can offer this" diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm index 9c521c31a..73a03df26 100644 --- a/maps/NewBarkTown.asm +++ b/maps/NewBarkTown.asm @@ -196,7 +196,7 @@ UnknownText_0x1a80f7: done UnknownText_0x1a8134: - text "Wait, ", $14, "!" + text "Wait, <PLAY_G>!" done UnknownText_0x1a813e: @@ -223,7 +223,7 @@ UnknownText_0x1a81c4: done UnknownText_0x1a81f2: - text "Hi, ", $14, "!" + text "Hi, <PLAY_G>!" line "Leaving again?" para "You should tell" @@ -240,7 +240,7 @@ UnknownText_0x1a8236: done UnknownText_0x1a8274: - text "Yo, ", $52, "!" + text "Yo, <PLAYER>!" para "I hear PROF.ELM" line "discovered some" @@ -269,7 +269,7 @@ UnknownText_0x1a82e8: done UnknownText_0x1a8328: - text $52, "'s House" + text "<PLAYER>'s House" done UnknownText_0x1a8332: diff --git a/maps/OaksLab.asm b/maps/OaksLab.asm index 0978f32df..3cc401364 100644 --- a/maps/OaksLab.asm +++ b/maps/OaksLab.asm @@ -79,7 +79,7 @@ OaksLabPC: jumptext OaksLabPCText OakWelcomeKantoText: - text "OAK: Ah, ", $14, "!" + text "OAK: Ah, <PLAY_G>!" line "It's good of you" para "to come all this" @@ -117,7 +117,7 @@ OakOpenMtSilverText: line "assessment of you." para "Tell you what," - line $14, ". I'll make" + line "<PLAY_G>. I'll make" para "arrangements so" line "that you can go to" @@ -137,7 +137,7 @@ OakOpenMtSilverText: para "we can make an" line "exception in your" - cont "case, ", $14, "." + cont "case, <PLAY_G>." para "Go up to INDIGO" line "PLATEAU. You can" @@ -180,7 +180,7 @@ OakYesKantoBadgesText: line "for you." para "Keep trying hard," - line $14, "!" + line "<PLAY_G>!" done UnknownText_0x19b7fb: ; 0x19b7fb @@ -246,7 +246,7 @@ OaksLabPCText: line "away." para "I heard rumors" - line "that ", $14, " is" + line "that <PLAY_G> is" para "getting quite a" line "reputation." diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm index 5b1f90b93..30b87100e 100644 --- a/maps/OlivineGym.asm +++ b/maps/OlivineGym.asm @@ -141,7 +141,7 @@ UnknownText_0x9c2bb: ; 0x9c2bb ; 0x9c33a UnknownText_0x9c33a: ; 0x9c33a - text $52, " received" + text "<PLAYER> received" line "MINERALBADGE." done ; 0x9c354 @@ -157,7 +157,7 @@ UnknownText_0x9c354: ; 0x9c354 ; 0x9c393 UnknownText_0x9c393: ; 0x9c393 - text $52, " received" + text "<PLAYER> received" line "TM09." done ; 0x9c3a5 diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm index e23eb7eee..82105c505 100644 --- a/maps/OlivineLighthouse6F.asm +++ b/maps/OlivineLighthouse6F.asm @@ -209,7 +209,7 @@ UnknownText_0x60d99: ; 0x60d99 ; 0x60dc3 UnknownText_0x60dc3: ; 0x60dc3 - text $52, " handed the" + text "<PLAYER> handed the" line "SECRETPOTION to" cont "JASMINE." done diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm index 01f8c5526..5bd8d87ef 100644 --- a/maps/OlivinePort.asm +++ b/maps/OlivinePort.asm @@ -345,7 +345,7 @@ UnknownText_0x74af6: ; 0x74af6 ; 0x74b11 UnknownText_0x74b11: ; 0x74b11 - text $52, " flashed" + text "<PLAYER> flashed" line "the S.S.TICKET." para "That's it." @@ -354,7 +354,7 @@ UnknownText_0x74b11: ; 0x74b11 ; 0x74b41 UnknownText_0x74b41: ; 0x74b41 - text $52, " tried to" + text "<PLAYER> tried to" line "show the S.S." cont "TICKET…" diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm index 809f0d40a..eeb291f41 100644 --- a/maps/PewterGym.asm +++ b/maps/PewterGym.asm @@ -133,13 +133,13 @@ UnknownText_0x1a29bb: ; 0x1a29bb ; 0x1a2a3d UnknownText_0x1a2a3d: ; 0x1a2a3d - text $52, " received" + text "<PLAYER> received" line "BOULDERBADGE." done ; 0x1a2a57 UnknownText_0x1a2a57: ; 0x1a2a57 - text "BROCK: ", $14, "," + text "BROCK: <PLAY_G>," line "thanks. I enjoyed" para "battling you, even" diff --git a/maps/PokeCenter2F.asm b/maps/PokeCenter2F.asm index ad6314ede..254c2d2a3 100644 --- a/maps/PokeCenter2F.asm +++ b/maps/PokeCenter2F.asm @@ -1029,7 +1029,7 @@ UnknownText_0x19307c: ; 0x19307c UnknownText_0x19308b: ; 0x19308b text "Sorry--@" text_from_ram StringBuffer1 - db $0 + text "" line "can't be taken." prompt ; 0x1930a8 @@ -1077,7 +1077,7 @@ UnknownText_0x19315f: ; 0x19315f UnknownText_0x193190: ; 0x193190 text "Hello! You're" - line $52, ", right?" + line "<PLAYER>, right?" para "I have some-" line "thing for you." diff --git a/maps/PokemonFanClub.asm b/maps/PokemonFanClub.asm index 99c23de62..594053c6d 100644 --- a/maps/PokemonFanClub.asm +++ b/maps/PokemonFanClub.asm @@ -193,7 +193,7 @@ UnknownText_0x191a72: ; 0x191a72 ; 0x191ae0 UnknownText_0x191ae0: ; 0x191ae0 - text "Hello, ", $14, "!" + text "Hello, <PLAY_G>!" para "Did you come see" line "me about my #-" @@ -264,7 +264,7 @@ UnknownText_0x191c5a: ; 0x191c5a ; 0x191d0a UnknownText_0x191d0a: ; 0x191d0a - text $52, " received" + text "<PLAYER> received" line "# DOLL." done ; 0x191d1e diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm index bb5945fd8..9aff6eced 100644 --- a/maps/RadioTower1F.asm +++ b/maps/RadioTower1F.asm @@ -285,8 +285,9 @@ UnknownText_0x5cf5a: ; 0x5cf5a ; 0x5cf79 UnknownText_0x5cf79: ; 0x5cf79 - db $0, $56, $4f - db $56, $57 + text $56 + line $56 + done ; 0x5cf7e UnknownText_0x5cf7e: ; 0x5cf7e @@ -430,7 +431,7 @@ UnknownText_0x5d37b: ; 0x5d37b ; 0x5d3c0 UnknownText_0x5d3c0: ; 0x5d3c0 - text $52, "'s #GEAR" + text "<PLAYER>'s #GEAR" line "can now double as" cont "a radio!" done diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm index e44f1952e..7d21f8fef 100644 --- a/maps/RadioTower2F.asm +++ b/maps/RadioTower2F.asm @@ -626,9 +626,9 @@ UnknownText_0x5de84: ; 0x5de84 para "What was your name" line "again?" - para "…", $14, ", OK!" + para "…<PLAY_G>, OK!" - para "Come on, ", $14, "." + para "Come on, <PLAY_G>." line "Join the show." done ; 0x5dedd @@ -641,7 +641,7 @@ UnknownText_0x5dedd: ; 0x5dedd line "shout out today's" para "password for" - line $14, "!" + line "<PLAY_G>!" done ; 0x5df29 @@ -690,7 +690,7 @@ UnknownText_0x5e054: ; 0x5e054 text "BUENA: Yup! Our" line "contestant was" - para $14, "." + para "<PLAY_G>." line "Thanks for coming!" para "I hope all you" @@ -753,7 +753,7 @@ UnknownText_0x5e1ee: ; 0x5e1ee cont "30 points, but…" para "You came by so" - line "often, ", $14, "." + line "often, <PLAY_G>." para "I'll make you a" line "special deal!" @@ -764,7 +764,7 @@ UnknownText_0x5e1ee: ; 0x5e1ee ; 0x5e2bf UnknownText_0x5e2bf: ; 0x5e2bf - text "BUENA: ", $14, "," + text "BUENA: <PLAY_G>," line "do you want to" para "register my phone" @@ -773,7 +773,7 @@ UnknownText_0x5e2bf: ; 0x5e2bf ; 0x5e2f3 UnknownText_0x5e2f3: ; 0x5e2f3 - text $52, " registered" + text "<PLAYER> registered" line "BUENA's number." done ; 0x5e310 @@ -792,7 +792,7 @@ UnknownText_0x5e33c: ; 0x5e33c ; 0x5e35e UnknownText_0x5e35e: ; 0x5e35e - text "BUENA: ", $14, "," + text "BUENA: <PLAY_G>," line "your phone list" para "has no room left" diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm index 6d38adb0d..166427aa2 100644 --- a/maps/RadioTower3F.asm +++ b/maps/RadioTower3F.asm @@ -416,7 +416,7 @@ UnknownText_0x5eaa4: ; 0x5eaa4 ; 0x5eabc UnknownText_0x5eabc: ; 0x5eabc - text $52, " inserted" + text "<PLAYER> inserted" line "the CARD KEY." done ; 0x5ead6 diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index 8257692f1..12a9d29e9 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -291,7 +291,7 @@ Executivef1BeatenText: ; 0x6031e ; 0x60358 UnknownText_0x60358: ; 0x60358 - text $52, ", isn't it?" + text "<PLAYER>, isn't it?" para "A brat like you" line "won't appreciate" @@ -361,7 +361,7 @@ UnknownText_0x6050e: ; 0x6050e ; 0x605b2 UnknownText_0x605b2: ; 0x605b2 - text "DIRECTOR: ", $14, "," + text "DIRECTOR: <PLAY_G>," line "thank you!" para "Your courageous" @@ -430,7 +430,7 @@ UnknownText_0x6062c: ; 0x6062c UnknownText_0x60824: ; 0x60824 text "DIRECTOR: Hello," - line $14, "!" + line "<PLAY_G>!" para "You know, I love" line "#MON." diff --git a/maps/RedsHouse2F.asm b/maps/RedsHouse2F.asm index 864c9d3a9..b7cc6e30e 100644 --- a/maps/RedsHouse2F.asm +++ b/maps/RedsHouse2F.asm @@ -15,7 +15,7 @@ MapRedsHouse2FSignpost1Script: ; 0x19b04d ; 0x19b050 UnknownText_0x19b050: ; 0x19b050 - text $52, " played the" + text "<PLAYER> played the" line "N64." para "Better get going--" diff --git a/maps/Route26.asm b/maps/Route26.asm index 6dade6303..11a18129c 100644 --- a/maps/Route26.asm +++ b/maps/Route26.asm @@ -467,7 +467,7 @@ UnknownText_0x1a50d7: ; 0x1a50d7 CooltrainerfBeth1SeenText: ; 0x1a5136 text "I lost to a train-" - line "er named ", $53, "." + line "er named <RIVAL>." para "He was really" line "strong, but…" diff --git a/maps/Route2Gate.asm b/maps/Route2Gate.asm index fb4ec0110..96fa34642 100644 --- a/maps/Route2Gate.asm +++ b/maps/Route2Gate.asm @@ -11,7 +11,7 @@ ScientistScript_0x9b952: ; 0x9b952 ; 0x9b955 UnknownText_0x9b955: ; 0x9b955 - text "Are you ", $14, "?" + text "Are you <PLAY_G>?" para "I work as PROF." line "OAK's AIDE." diff --git a/maps/Route31.asm b/maps/Route31.asm index 2c9f5eafa..5510703fc 100644 --- a/maps/Route31.asm +++ b/maps/Route31.asm @@ -378,7 +378,7 @@ UnknownText_0x1a5761: ; 0x1a5761 ; 0x1a5790 UnknownText_0x1a5790: ; 0x1a5790 - text $52, " handed" + text "<PLAYER> handed" line "over the #MON" cont "holding the MAIL." done diff --git a/maps/Route32.asm b/maps/Route32.asm index 3898a667f..a914d4e17 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -651,7 +651,7 @@ UnknownText_0x190790: done UnknownText_0x1907ab: - text $52, ", right?" + text "<PLAYER>, right?" line "Some guy wearing" para "glasses was look-" diff --git a/maps/Route35Goldenrodgate.asm b/maps/Route35Goldenrodgate.asm index 6f80f9d2e..2cb966dcc 100644 --- a/maps/Route35Goldenrodgate.asm +++ b/maps/Route35Goldenrodgate.asm @@ -123,7 +123,7 @@ UnknownText_0x69e48: ; 0x69e48 ; 0x69eb8 UnknownText_0x69eb8: ; 0x69eb8 - text $52, " received a" + text "<PLAYER> received a" line "#MON with MAIL." done ; 0x69ed6 diff --git a/maps/Route35NationalParkgate.asm b/maps/Route35NationalParkgate.asm index 54a2115ee..35087647a 100644 --- a/maps/Route35NationalParkgate.asm +++ b/maps/Route35NationalParkgate.asm @@ -284,7 +284,7 @@ UnknownText_0x6a39d: ; 0x6a39d ; 0x6a3c7 UnknownText_0x6a3c7: ; 0x6a3c7 - text $52, " received" + text "<PLAYER> received" line "20 PARK BALLS." done ; 0x6a3e2 @@ -341,7 +341,7 @@ UnknownText_0x6a537: ; 0x6a537 ; 0x6a56b UnknownText_0x6a56b: ; 0x6a56b - text $52, "'s #MON" + text "<PLAYER>'s #MON" line "were left with the" cont "CONTEST HELPER." done @@ -415,7 +415,7 @@ UnknownText_0x6a71f: ; 0x6a71f UnknownText_0x6a79a: ; 0x6a79a text "You still have @" text_from_ram StringBuffer3 - db $0 + text "" line "minute(s) left." para "Do you want to" diff --git a/maps/Route36.asm b/maps/Route36.asm index b63d9dbfe..bbf3ddc2a 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -490,7 +490,7 @@ UnknownText_0x19426b: ; 0x19426b ; 0x194290 UnknownText_0x194290: ; 0x194290 - text $52, " used the" + text "<PLAYER> used the" line "SQUIRTBOTTLE." done ; 0x1942aa @@ -572,7 +572,7 @@ UnknownText_0x1944d0: ; 0x1944d0 ; 0x19451a UnknownText_0x19451a: ; 0x19451a - text $52, " received" + text "<PLAYER> received" line "TM08." done ; 0x19452c diff --git a/maps/Route36NationalParkgate.asm b/maps/Route36NationalParkgate.asm index 9c9a4ef9a..a6ac1cd71 100644 --- a/maps/Route36NationalParkgate.asm +++ b/maps/Route36NationalParkgate.asm @@ -546,7 +546,7 @@ UnknownText_0x6ae87: ; 0x6ae87 ; 0x6aeb1 UnknownText_0x6aeb1: ; 0x6aeb1 - text $52, " received" + text "<PLAYER> received" line "20 PARK BALLS." done ; 0x6aecc @@ -603,7 +603,7 @@ UnknownText_0x6b021: ; 0x6b021 ; 0x6b055 UnknownText_0x6b055: ; 0x6b055 - text $52, "'s #MON" + text "<PLAYER>'s #MON" line "were left with the" cont "CONTEST HELPER." done @@ -677,7 +677,7 @@ UnknownText_0x6b209: ; 0x6b209 UnknownText_0x6b284: ; 0x6b284 text "You still have @" text_from_ram StringBuffer3 - db $0 + text "" line "minute(s) left." para "Do you want to" @@ -923,7 +923,7 @@ UnknownText_0x6b910: ; 0x6b910 ; 0x6b97f UnknownText_0x6b97f: ; 0x6b97f - text $52, "?" + text "<PLAYER>?" para "Here's the prize" line "we were holding" diff --git a/maps/Route39Barn.asm b/maps/Route39Barn.asm index 0ee245ac9..21dd2117a 100644 --- a/maps/Route39Barn.asm +++ b/maps/Route39Barn.asm @@ -171,7 +171,7 @@ UnknownText_0x9cda2: ; 0x9cda2 ; 0x9cdbc UnknownText_0x9cdbc: ; 0x9cdbc - text $52, " gave a" + text "<PLAYER> gave a" line "BERRY to MILTANK." done ; 0x9cdd8 @@ -195,13 +195,13 @@ UnknownText_0x9ce1b: ; 0x9ce1b ; 0x9ce3c UnknownText_0x9ce3c: ; 0x9ce3c - text $52, " has no" + text "<PLAYER> has no" line "BERRIES…" done ; 0x9ce4f UnknownText_0x9ce4f: ; 0x9ce4f - text $52, " wouldn't" + text "<PLAYER> wouldn't" line "give a BERRY." para "MILTANK looks sad." diff --git a/maps/Route39Farmhouse.asm b/maps/Route39Farmhouse.asm index 2c5ead1ea..fb3fea844 100644 --- a/maps/Route39Farmhouse.asm +++ b/maps/Route39Farmhouse.asm @@ -188,7 +188,7 @@ UnknownText_0x9d156: ; 0x9d156 ; 0x9d1b5 UnknownText_0x9d1b5: ; 0x9d1b5 - text $52, " received" + text "<PLAYER> received" line "TM13." done ; 0x9d1c7 diff --git a/maps/Route43.asm b/maps/Route43.asm index 1c3bf0459..dab2919c0 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -512,7 +512,7 @@ PokemaniacRonSeenText: ; 0x19d386 text "Would you get" line "this?" - para "Some ", $53, " guy" + para "Some <RIVAL> guy" line "made fun of my" cont "#MON!" diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm index d15ec4617..bf2f5c238 100644 --- a/maps/Route43Gate.asm +++ b/maps/Route43Gate.asm @@ -266,7 +266,7 @@ UnknownText_0x19ad9b: ; 0x19ad9b ; 0x19ae1b UnknownText_0x19ae1b: ; 0x19ae1b - text $52, " received" + text "<PLAYER> received" line "TM30." done ; 0x19ae2d diff --git a/maps/RuinsofAlphResearchCenter.asm b/maps/RuinsofAlphResearchCenter.asm index b7c08255c..54d1e078d 100644 --- a/maps/RuinsofAlphResearchCenter.asm +++ b/maps/RuinsofAlphResearchCenter.asm @@ -233,7 +233,7 @@ UnknownText_0x59278: ; 0x59278 ; 0x592fa UnknownText_0x592fa: ; 0x592fa - text $52, "'s #DEX" + text "<PLAYER>'s #DEX" line "was upgraded." done ; 0x59311 diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm index 43066d00a..8945a13c0 100644 --- a/maps/SaffronGym.asm +++ b/maps/SaffronGym.asm @@ -229,7 +229,7 @@ UnknownText_0x189df4: ; 0x189df4 ; 0x189e95 UnknownText_0x189e95: ; 0x189e95 - text $52, " received" + text "<PLAYER> received" line "MARSHBADGE." done ; 0x189ead diff --git a/maps/SeafoamGym.asm b/maps/SeafoamGym.asm index 3c39974d9..6d9abd027 100644 --- a/maps/SeafoamGym.asm +++ b/maps/SeafoamGym.asm @@ -104,7 +104,7 @@ UnknownText_0x1ab646: ; 0x1ab646 ; 0x1ab683 UnknownText_0x1ab683: ; 0x1ab683 - text $52, " received" + text "<PLAYER> received" line "VOLCANOBADGE." done ; 0x1ab69d diff --git a/maps/SilverCaveRoom3.asm b/maps/SilverCaveRoom3.asm index 3e48a663c..c172b641b 100644 --- a/maps/SilverCaveRoom3.asm +++ b/maps/SilverCaveRoom3.asm @@ -36,8 +36,9 @@ RedScript_0x18c603: ; 0x18c603 ; 0x18c637 UnknownText_0x18c637: ; 0x18c637 - db $0, $56, $4f - db $56, $57 + text $56 + line $56 + done ; 0x18c63c UnknownText_0x18c63c: ; 0x18c63c @@ -46,8 +47,9 @@ UnknownText_0x18c63c: ; 0x18c63c ; 0x18c63f UnknownText_0x18c63f: ; 0x18c63f - db $0, $56, $4f - db $56, $57 + text $56 + line $56 + done ; 0x18c644 SilverCaveRoom3_MapEventHeader: ; 0x18c644 diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm index fe9c388b2..7093978e1 100644 --- a/maps/SlowpokeWellB1F.asm +++ b/maps/SlowpokeWellB1F.asm @@ -214,7 +214,7 @@ KurtSlowpokeWellVictoryMovementData: ; 0x5a6a5 UnknownText_0x5a6b5: ; 0x5a6b5 text "KURT: Hey there," - line $52, "!" + line "<PLAYER>!" para "The guard up top" line "took off when I" @@ -237,7 +237,7 @@ UnknownText_0x5a6b5: ; 0x5a6b5 para "Ah, it can't be" line "helped." - para $52, ", show them" + para "<PLAYER>, show them" line "how gutsy you are" cont "in my place!" done @@ -245,7 +245,7 @@ UnknownText_0x5a6b5: ; 0x5a6b5 KurtLeaveSlowpokeWellText: ; 0x5a7ca text "KURT: Way to go," - line $52, "!" + line "<PLAYER>!" para "TEAM ROCKET has" line "taken off." @@ -386,7 +386,7 @@ UnknownText_0x5abcb: ; 0x5abcb ; 0x5ac09 UnknownText_0x5ac09: ; 0x5ac09 - text $52, " read the" + text "<PLAYER> read the" line "MAIL." para "Be good and look" diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index e34714ad4..98055aca6 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -263,7 +263,7 @@ UnknownText_0x184aec: ; 0x184aec ; 0x184bc8 UnknownText_0x184bc8: ; 0x184bc8 - text $53, " used an" + text "<RIVAL> used an" line "ESCAPE ROPE!" done ; 0x184be0 diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index cf5ef5261..a018050f1 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -766,7 +766,7 @@ UnknownText_0x6d5d8: ; 0x6d5d8 ; 0x6d64e UnknownText_0x6d64e: ; 0x6d64e - text "Sorry, ", $14, "." + text "Sorry, <PLAY_G>." line "I saw how well you" para "were doing, so I" @@ -806,7 +806,7 @@ UnknownText_0x6d6cf: ; 0x6d6cf para "makes me feel" line "guilty." - para $14, ", let's" + para "<PLAY_G>, let's" line "split the job." done ; 0x6d7ea @@ -841,7 +841,7 @@ UnknownText_0x6d809: ; 0x6d809 ; 0x6d8e6 UnknownText_0x6d8e6: ; 0x6d8e6 - text $52, " received" + text "<PLAYER> received" line "HM06." done ; 0x6d8f8 @@ -865,7 +865,7 @@ UnknownText_0x6d8f8: ; 0x6d8f8 ; 0x6d994 UnknownText_0x6d994: ; 0x6d994 - text $14, "…" + text "<PLAY_G>…" para "The journey to be-" line "coming the #MON" @@ -909,7 +909,7 @@ UnknownText_0x6da97: ; 0x6da97 ; 0x6daf7 UnknownText_0x6daf7: ; 0x6daf7 - text "LANCE: ", $14, "," + text "LANCE: <PLAY_G>," line "let's give it our" cont "best for #MON." done @@ -1005,7 +1005,7 @@ UnknownText_0x6dd39: ; 0x6dd39 UnknownText_0x6dd6b: ; 0x6dd6b text "The door's closed…" - para $52, " entered" + para "<PLAYER> entered" line "the password." para "The door opened!" diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index b2018735f..839dc89ee 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -429,7 +429,7 @@ UnknownText_0x6e179: ; 0x6e179 line "very graciously" cont "told me so." - para $14, ", let's go" + para "<PLAY_G>, let's go" line "get the passwords." done ; 0x6e235 @@ -675,7 +675,7 @@ UnknownText_0x6e970: ; 0x6e970 UnknownText_0x6e9a3: ; 0x6e9a3 text "The door's closed…" - para $52, " entered" + para "<PLAYER> entered" line "the two passwords." para "The door opened!" diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm index f26d2496c..9b82906df 100644 --- a/maps/TinTower1F.asm +++ b/maps/TinTower1F.asm @@ -349,7 +349,7 @@ UnknownText_0x185203: ; 0x185203 line "but you were even" para "more incredible," - line $52, "." + line "<PLAYER>." para "I heard SUICUNE's" line "mystic power" @@ -370,7 +370,7 @@ UnknownText_0x185203: ; 0x185203 line "me that fantastic" cont "battle." - para "Later, ", $52, "!" + para "Later, <PLAYER>!" done ; 0x185386 @@ -483,7 +483,7 @@ UnknownText_0x1856a3: ; 0x1856a3 line "to see the #MON" para "of rainbow colors," - line $52, "." + line "<PLAYER>." para "It happened just" line "as I envisioned." diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm index 56cc5a81d..e0a500b86 100644 --- a/maps/VermilionGym.asm +++ b/maps/VermilionGym.asm @@ -190,7 +190,7 @@ UnknownText_0x192238: ; 0x192238 ; 0x192277 UnknownText_0x192277: ; 0x192277 - text $52, " received" + text "<PLAYER> received" line "THUNDERBADGE." done ; 0x192291 diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index 69c67b427..bce464809 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -259,7 +259,7 @@ UnknownText_0x74fa7: done UnknownText_0x74fc2: - text $52, " flashed" + text "<PLAYER> flashed" line "the S.S.TICKET." para "That's it." @@ -267,7 +267,7 @@ UnknownText_0x74fc2: done UnknownText_0x74ff2: - text $52, " tried to" + text "<PLAYER> tried to" line "show the S.S." cont "TICKET…" diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm index 6f9b2c371..eac74251b 100644 --- a/maps/VictoryRoad.asm +++ b/maps/VictoryRoad.asm @@ -203,7 +203,7 @@ UnknownText_0x7455f: ; 0x7455f para "#MON with me." line "I'm invincible!" - para $52, "!" + para "<PLAYER>!" line "I challenge you!" done ; 0x7463d diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm index 4fe31d0b4..786843bbb 100644 --- a/maps/VioletGym.asm +++ b/maps/VioletGym.asm @@ -188,7 +188,7 @@ UnknownText_0x6854a: ; 0x6854a ; 0x685af UnknownText_0x685af: ; 0x685af - text $52, " received" + text "<PLAYER> received" line "ZEPHYRBADGE." done ; 0x685c8 diff --git a/maps/VioletPokeCenter1F.asm b/maps/VioletPokeCenter1F.asm index 4960ba22e..8f3b1555c 100644 --- a/maps/VioletPokeCenter1F.asm +++ b/maps/VioletPokeCenter1F.asm @@ -113,7 +113,7 @@ MovementData_0x69551: ; 0x69551 ; 0x69555 UnknownText_0x69555: ; 0x69555 - text $14, ", long" + text "<PLAY_G>, long" line "time, no see." para "PROF.ELM asked me" @@ -138,7 +138,7 @@ UnknownText_0x695c5: ; 0x695c5 line "with other active" cont "#MON to hatch." - para $14, ", you're" + para "<PLAY_G>, you're" line "the only person" cont "we can rely on." @@ -166,7 +166,7 @@ UnknownText_0x696f2: ; 0x696f2 ; 0x69712 UnknownText_0x69712: ; 0x69712 - text $14, ", will you" + text "<PLAY_G>, will you" line "take the EGG?" done ; 0x6972d diff --git a/maps/ViridianGym.asm b/maps/ViridianGym.asm index a4ab70017..84d89c35c 100644 --- a/maps/ViridianGym.asm +++ b/maps/ViridianGym.asm @@ -111,7 +111,7 @@ UnknownText_0x9abae: ; 0x9abae ; 0x9ac0f UnknownText_0x9ac0f: ; 0x9ac0f - text $52, " received" + text "<PLAYER> received" line "EARTHBADGE." done ; 0x9ac27 diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm index 9c61d5e84..c77d3ec27 100644 --- a/maps/WillsRoom.asm +++ b/maps/WillsRoom.asm @@ -92,7 +92,7 @@ MovementData_0x18052c: ; 0x18052c UnknownText_0x180531: ; 0x180531 text "Welcome to #MON" - line "LEAGUE, ", $52, "." + line "LEAGUE, <PLAYER>." para "Allow me to intro-" line "duce myself. I am" @@ -133,7 +133,7 @@ UnknownText_0x180644: ; 0x180644 para "stand above all" line "trainers!" - para "Now, ", $52, ", move" + para "Now, <PLAYER>, move" line "on and experience" para "the true ferocity" |