From e2c2e20f93f43848542362a5deee677e88f9507d Mon Sep 17 00:00:00 2001 From: yenatch Date: Sat, 27 Jun 2015 21:59:17 -0700 Subject: [PATCH] Use charmaps for special string codepoints. Also fix all the text. Also fix some unreferenced scripts that were interpreted as text. --- engine/pokedex.asm | 27 +- macros/charmap.asm | 10 + main.asm | 43 ++- maps/AzaleaGym.asm | 2 +- maps/AzaleaTown.asm | 2 +- maps/BattleTower1F.asm | 220 +++++++----- maps/BlackthornDragonSpeechHouse.asm | 8 +- maps/BlackthornGym1F.asm | 2 +- maps/BrunosRoom.asm | 2 +- maps/BurnedTower1F.asm | 2 +- maps/BurnedTowerB1F.asm | 4 +- maps/CeladonCafe.asm | 4 +- maps/CeladonDeptStore6F.asm | 2 +- maps/CeladonGym.asm | 2 +- maps/CeladonMansion2F.asm | 2 +- maps/CeladonMansionRoof.asm | 2 +- maps/CeladonPokeCenter1F.asm | 8 +- maps/CeruleanGym.asm | 2 +- maps/CherrygroveCity.asm | 2 +- maps/CianwoodCity.asm | 6 +- maps/CianwoodGym.asm | 2 +- maps/CianwoodPharmacy.asm | 2 +- maps/CianwoodPokeCenter1F.asm | 2 +- maps/CopycatsHouse2F.asm | 36 +- maps/DayCare.asm | 2 +- maps/DragonShrine.asm | 9 +- maps/DragonsDenB1F.asm | 8 +- maps/EcruteakGym.asm | 4 +- maps/EcruteakPokeCenter1F.asm | 2 +- maps/ElmsHouse.asm | 2 +- maps/ElmsLab.asm | 58 ++-- maps/FastShipCabins_SE_SSE_CaptainsCabin.asm | 2 +- maps/FuchsiaGym.asm | 2 +- maps/GoldenrodBikeShop.asm | 2 +- maps/GoldenrodBillsHouse.asm | 8 +- maps/GoldenrodCity.asm | 3 +- maps/GoldenrodGym.asm | 2 +- maps/GoldenrodPokeCenter1F.asm | 4 +- maps/HallOfFame.asm | 2 +- maps/IlexForest.asm | 4 +- maps/IndigoPlateauPokeCenter1F.asm | 2 +- maps/KarensRoom.asm | 2 +- maps/KrissHouse1F.asm | 14 +- maps/KurtsHouse.asm | 8 +- maps/LakeofRage.asm | 8 +- maps/LancesRoom.asm | 10 +- maps/LavRadioTower1F.asm | 2 +- maps/MahoganyGym.asm | 2 +- maps/MahoganyMart1F.asm | 4 +- maps/MahoganyRedGyaradosSpeechHouse.asm | 9 +- maps/ManiasHouse.asm | 2 +- maps/MountMoon.asm | 6 +- maps/MountMortarB1F.asm | 2 +- maps/MrPokemonsHouse.asm | 12 +- maps/NewBarkTown.asm | 8 +- maps/OaksLab.asm | 10 +- maps/OlivineGym.asm | 4 +- maps/OlivineLighthouse6F.asm | 2 +- maps/OlivinePort.asm | 4 +- maps/PewterGym.asm | 4 +- maps/PokeCenter2F.asm | 4 +- maps/PokemonFanClub.asm | 4 +- maps/RadioTower1F.asm | 7 +- maps/RadioTower2F.asm | 16 +- maps/RadioTower3F.asm | 2 +- maps/RadioTower5F.asm | 6 +- maps/RedsHouse2F.asm | 2 +- maps/Route26.asm | 2 +- maps/Route2Gate.asm | 2 +- maps/Route31.asm | 2 +- maps/Route32.asm | 2 +- maps/Route35Goldenrodgate.asm | 2 +- maps/Route35NationalParkgate.asm | 6 +- maps/Route36.asm | 4 +- maps/Route36NationalParkgate.asm | 8 +- maps/Route39Barn.asm | 6 +- maps/Route39Farmhouse.asm | 2 +- maps/Route43.asm | 2 +- maps/Route43Gate.asm | 2 +- maps/RuinsofAlphResearchCenter.asm | 2 +- maps/SaffronGym.asm | 2 +- maps/SeafoamGym.asm | 2 +- maps/SilverCaveRoom3.asm | 10 +- maps/SlowpokeWellB1F.asm | 8 +- maps/SproutTower3F.asm | 2 +- maps/TeamRocketBaseB2F.asm | 12 +- maps/TeamRocketBaseB3F.asm | 4 +- maps/TinTower1F.asm | 6 +- maps/VermilionGym.asm | 2 +- maps/VermilionPort.asm | 4 +- maps/VictoryRoad.asm | 2 +- maps/VioletGym.asm | 2 +- maps/VioletPokeCenter1F.asm | 6 +- maps/ViridianGym.asm | 2 +- maps/WillsRoom.asm | 4 +- misc/mobile_42.asm | 2 +- text/battle.asm | 291 ++++++++-------- text/common.asm | 19 +- text/common_2.asm | 74 ++-- text/common_3.asm | 113 +++--- text/common_4.asm | 192 ++++++----- text/phone/beverly_overworld.asm | 2 +- text/phone/bill.asm | 25 +- text/phone/buena.asm | 32 +- text/phone/elm.asm | 32 +- text/phone/extra.asm | 40 +-- text/phone/extra3.asm | 50 +-- text/phone/huey_overworld.asm | 4 +- text/phone/jose_overworld.asm | 2 +- text/phone/kenji_overworld.asm | 2 +- text/phone/mom.asm | 22 +- text/phone/trainers1.asm | 341 ++++++++++--------- text/sweethoney.asm | 2 +- 113 files changed, 1068 insertions(+), 951 deletions(-) diff --git a/engine/pokedex.asm b/engine/pokedex.asm index 62c04cb12..5bf01fb8e 100644 --- a/engine/pokedex.asm +++ b/engine/pokedex.asm @@ -1205,9 +1205,10 @@ Unknown_408b2: ; 408b2 ; 408bd String_408bd: ; 408bd - db "NEW #DEX MODE", $4e - db "OLD #DEX MODE", $4e - db "A to Z MODE@" + db "NEW #DEX MODE" + next "OLD #DEX MODE" + next "A to Z MODE" + db "@" ; 408e5 String_408e5: ; 408e5 @@ -1753,23 +1754,23 @@ Unknown_40e7d: ; 40e7d ; 40e85 String_40e85: ; 40e85 - db $e1, $e2, " are listed by", $4e - db "evolution type.@" + db $e1, $e2, " are listed by" + next "evolution type.@" ; 40ea6 String_40ea6: ; 40ea6 - db $e1, $e2, " are listed by", $4e - db "official type.@" + db $e1, $e2, " are listed by" + next "official type.@" ; 40ec6 String_40ec6: ; 40ec6 - db $e1, $e2, " are listed", $4e - db "alphabetically.@" + db $e1, $e2, " are listed" + next "alphabetically.@" ; 40ee4 String_40ee4: ; 40ee4 - db "UNOWN are listed", $4e - db "in catching order.@" + db "UNOWN are listed" + next "in catching order.@" ; 40f08 Function40f08: ; 40f08 (10:4f08) @@ -2031,8 +2032,8 @@ Function41107: ; 41107 ; 41126 String_41126: ; 41126 - db "The specified type", $4e - db "was not found.@" + db "The specified type" + next "was not found.@" ; 41148 Function41148: ; 41148 (10:5148) diff --git a/macros/charmap.asm b/macros/charmap.asm index 0478f68ab..b6344a1fa 100644 --- a/macros/charmap.asm +++ b/macros/charmap.asm @@ -273,3 +273,13 @@ charmap "ー", $e3 charmap "ァ", $e9 + + charmap "", $52 + charmap "", $53 + charmap "", $38 + charmap "", $39 + charmap "", $59 + charmap "", $5a + charmap "", $3f + + charmap "", $14 ; + gender diff --git a/main.asm b/main.asm index aabe9b6e0..cd970f697 100644 --- a/main.asm +++ b/main.asm @@ -639,7 +639,7 @@ MenuDataHeader_0x5efb: ; 5efb MenuData2_0x5f03: ; 5f03 db $00 ; flags db 4 ; items - db "PLAYER ", $52, "@" + db "PLAYER @" db "BADGES@" db " @" db "TIME@" @@ -667,7 +667,7 @@ Function5f1c: ; 5f1c ret .Player - db $52, "@" + db "@" ; 5f40 Function5f40: ; 5f40 @@ -13109,22 +13109,39 @@ StartMenu:: ; 125cd .PokedexString db "#DEX@" .PartyString db "#MON@" .PackString db "PACK@" -.StatusString db $52, "@" +.StatusString db "@" .SaveString db "SAVE@" .OptionString db "OPTION@" .ExitString db "EXIT@" .PokegearString db $24, "GEAR@" .QuitString db "QUIT@" -.PokedexDesc db "#MON", $4e, "database@" -.PartyDesc db "Party ", $4a, $4e, "status@" -.PackDesc db "Contains", $4e, "items@" -.PokegearDesc db "Trainer's", $4e, "key device@" -.StatusDesc db "Your own", $4e, "status@" -.SaveDesc db "Save your", $4e, "progress@" -.OptionDesc db "Change", $4e, "settings@" -.ExitDesc db "Close this", $4e, "menu@" -.QuitDesc db "Quit and", $4e, "be judged.@" +.PokedexDesc db "#MON" + next "database@" + +.PartyDesc db "Party ", $4a + next "status@" + +.PackDesc db "Contains" + next "items@" + +.PokegearDesc db "Trainer's" + next "key device@" + +.StatusDesc db "Your own" + next "status@" + +.SaveDesc db "Save your" + next "progress@" + +.OptionDesc db "Change" + next "settings@" + +.ExitDesc db "Close this" + next "menu@" + +.QuitDesc db "Quit and" + next "be judged.@" .OpenMenu ; 127e5 @@ -19412,7 +19429,7 @@ Unknown_155e6: ; 155e6 dw Function156ab, String_15623 ; 155fa -String_155fa: db $52, "'s PC@" +String_155fa: db "'s PC@" String_15600: db "BILL's PC@" String_15609: db "PROF.OAK's PC@" String_15616: db "HALL OF FAME@" 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 " 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 ", 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 ". 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 " 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 " 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, ?" 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 "? 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 ", 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 ", 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 " found" line "@" text_from_ram StringBuffer3 text "!" done NoRoomForLeftoversText: - text "But ", $52, " can't" + text "But 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 " 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 " 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 " 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 ", 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, !" done ; 0x7201a UnknownText_0x7201a: ; 0x7201a text "Oh, by the way," - line $52, "." + line "." 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, !" 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 " 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 "'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 "." 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, ." line "Let's battle now!" done @@ -314,7 +314,7 @@ UnknownText_0x1a05a1: UnknownText_0x1a05c3: text "You're amazing," - line $52, "!" + line "!" 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 " 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 " 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 "! 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 ": Hi! Do" line "you like #MON?" - para $52, ": Uh, no, I" + para ": Uh, no, I" line "just asked you." - para $52, ": Huh?" + para ": Huh?" line "You're strange!" done ; 0x18b028 @@ -219,17 +219,17 @@ UnknownText_0x18b028: ; 0x18b028 ; 0x18b064 UnknownText_0x18b064: ; 0x18b064 - text $52, ": Hi!" + text ": Hi!" line "I heard that you" para "lost your favorite" line "# DOLL." - para $52, ": If I find" + para ": If I find" line "it, you'll give me" cont "a rail PASS?" - para $52, ": I'll go" + para ": 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 ": Hi!" line "Thanks a lot for" cont "the rail PASS!" - para $52, ": Pardon?" + para ": Pardon?" - para $52, ": Is it" + para ": 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 ": Hi. You" line "must like #MON." - para $52, ": No, not" + para ": No, not" line "me. I asked you." - para $52, ": Pardon?" + para ": Pardon?" line "You're weird!" done ; 0x18b366 UnknownText_0x18b366: ; 0x18b366 - text $52, ": Hi. Did" + text ": Hi. Did" line "you really lose" cont "your # DOLL?" - para $52, ": You'll" + para ": You'll" line "really give me a" para "rail PASS if I" line "find it for you?" - para $52, ": Sure," + para ": 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 ": Thank you" line "for the rail PASS!" - para $52, ": …Pardon?" + para ": …Pardon?" - para $52, ": Is it" + para ": 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 " 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 ", 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 " received" line "DRATINI!" done ; 0x18d6ac @@ -697,7 +697,7 @@ UnknownText_0x18d9bf: ; 0x18d9bf ; 0x18d9f2 UnknownText_0x18d9f2: ; 0x18d9f2 - text $52, " received" + text " 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 " received" line "TM24." done ; 0x18ca0d @@ -384,7 +384,7 @@ UnknownText_0x18cc2e: ; 0x18cc2e UnknownText_0x18cc83: ; 0x18cc83 text "…" - line "What? ", $52, "?" + line "What? ?" para "…No, I won't" line "battle you now…" @@ -501,7 +501,7 @@ UnknownText_0x18cf0f: ; 0x18cf0f ; 0x18cf41 UnknownText_0x18cf41: ; 0x18cf41 - text $52, " found" + text " 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 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 " received" line "FOGBADGE." done ; 0x9a059 @@ -465,7 +465,7 @@ EcruteakGymGuyText: ; 0x9a3e8 ; 0x9a452 EcruteakGymGuyWinText: ; 0x9a452 - text "Whew, ", $52, "." + text "Whew, ." 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, , 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, ! 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: !" 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, ." para "You see…" @@ -834,7 +834,7 @@ UnknownText_0x78fb6: ; 0x78fb6 ; 0x790fa UnknownText_0x790fa: ; 0x790fa - text "Thanks, ", $14, "!" + text "Thanks, !" para "You're a great" line "help!" @@ -902,7 +902,7 @@ UnknownText_0x791df: ; 0x791df para "I know!" - para $14, ", can you" + para ", 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, !" para "Go on. Pick one!" done @@ -973,7 +973,7 @@ ChoseStarterText: ; 0x79487 ; 0x794ad ReceivedStarterText: ; 0x794ad - text $52, " received" + text " received" line "@" text_from_ram StringBuffer3 text "!" @@ -1012,12 +1012,12 @@ ElmDirectionsText2: ; 0x79581 done ElmDirectionsText3: ; 0x795db - text $14, ", I'm" + text ", I'm" line "counting on you!" done GotElmsNumberText: ; 0x795f3 - text $52, " got ELM's" + text " got ELM's" line "phone number." done @@ -1048,7 +1048,7 @@ ElmsLabHealingMachineText2: done ElmAfterTheftText1: ; 0x796cd - text "ELM: ", $14, ", this" + text "ELM: , this" line "is terrible…" para "Oh, yes, what was" @@ -1058,7 +1058,7 @@ ElmAfterTheftText1: ; 0x796cd ; 0x79712 ElmAfterTheftText2: ; 0x79712 - text $52, " handed" + text " 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 ", 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, . You" line "may have what it" para "takes to become" @@ -1114,7 +1114,7 @@ ElmAfterTheftText5: ; 0x79780 ; 0x798cf ElmAfterTheftText6: ; 0x798cf - text "…", $14, ". The" + text "…. The" line "road to the" para "championship will" @@ -1136,7 +1136,7 @@ ElmStudyingEggText: ; 0x7993c ; 0x7997d ElmAideHasEggText: ; 0x7997d - text "ELM: ", $14, "?" + text "ELM: ?" line "Didn't you meet my" cont "assistant?" @@ -1159,7 +1159,7 @@ ElmWaitingEggHatchText: ; 0x79a1b ; 0x79a40 UnknownText_0x79a40: ; 0x79a40 - text $14, "? I thought" + text "? 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: , you" line "look great!" done ; 0x79a8b @@ -1194,7 +1194,7 @@ ShowElmTogepiText3: ; 0x79a9f ; 0x79b1c ElmGiveEverstoneText1: ; 0x79b1c - text "Thanks, ", $14, "!" + text "Thanks, !" line "You're helping" para "unravel #MON" @@ -1227,7 +1227,7 @@ ElmGiveEverstoneText2: ; 0x79b8d ; 0x79c37 UnknownText_0x79c37: ; 0x79c37 - text "ELM: ", $14, ", I'll" + text "ELM: , 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, !" 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, !" done ; 0x79df3 ElmGiveTicketText1: ; 0x79df3 - text "ELM: ", $14, "!" + text "ELM: !" 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, ." 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 ", 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 "!" 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 " line "was his name." para "Thanks for helping" @@ -1425,7 +1425,7 @@ ElmsLabWindowText2: done ElmsLabTravelTip1Text: - text $52, " opened a" + text " opened a" line "book." para "Travel Tip 1:" @@ -1435,7 +1435,7 @@ ElmsLabTravelTip1Text: done ElmsLabTravelTip2Text: - text $52, " opened a" + text " opened a" line "book." para "Travel Tip 2:" @@ -1445,7 +1445,7 @@ ElmsLabTravelTip2Text: done ElmsLabTravelTip3Text: - text $52, " opened a" + text " opened a" line "book." para "Travel Tip 3:" @@ -1456,7 +1456,7 @@ ElmsLabTravelTip3Text: done ElmsLabTravelTip4Text: - text $52, " opened a" + text " 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 ", 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 " 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 " 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, !" 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 "?" done ; 0x54d3f @@ -150,7 +150,7 @@ UnknownText_0x54d3f: ; 0x54d3f ; 0x54dae UnknownText_0x54dae: ; 0x54dae - text $52, " received" + text " received" line "EEVEE!" done ; 0x54dc1 @@ -230,7 +230,7 @@ UnknownText_0x54f9e: ; 0x54f9e ; 0x54fd9 UnknownText_0x54fd9: ; 0x54fd9 - text $52, " recorded" + text " 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 " 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 ", isn't it?" para "Congratulations!" @@ -873,7 +873,7 @@ UnknownText_0x6252a: ; 0x6252a ; 0x62549 UnknownText_0x62549: ; 0x62549 - text $52, " gave away" + text " 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 ", 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 " 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 ", 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 "!" 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 ?" 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, …! Our" line "neighbor, PROF." para "ELM, was looking" @@ -342,7 +342,7 @@ UnknownText_0x7a8e5: ; 0x7a8e5 ; 0x7a957 UnknownText_0x7a957: ; 0x7a957 - text $52, ", do it!" + text ", 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 "!" para "I'm visiting!" done NeighborDayIntroText: - text "Hello, ", $14, "!" + text "Hello, !" line "I'm visiting!" done NeighborNiteIntroText: text "Good evening," - line $14, "!" + line "!" para "I'm visiting!" done NeighborText: - text $14, ", have you" + text ", 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 ", 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, !" 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, !" line "I just finished" cont "your BALL. Here!" done @@ -645,7 +645,7 @@ UnknownText_0x18e949: ; 0x18e949 ; 0x18e95c UnknownText_0x18e95c: ; 0x18e95c - text $52, "!" + text "!" 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 ?" 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 "." 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, ." done UnknownText_0x70371: @@ -378,7 +378,7 @@ UnknownText_0x703cb: done UnknownText_0x703df: - text $52, " obtained a" + text " 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 "!" 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 "." 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 "!" para "It's been a long" line "while." @@ -336,7 +336,7 @@ UnknownText_0x18121b: ; 0x18121b line "severed." para "Congratulations," - line $14, "!" + line "!" done ; 0x18134b @@ -352,7 +352,7 @@ UnknownText_0x18137b: ; 0x18137b line "getting to be a" cont "bit too noisy…" - para $14, ", could you" + para ", 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 " 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 " 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 "?" 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: , 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 " 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 "." 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 ", 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, ." 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 " 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 ." para "PROF.ELM said that" line "you would visit." @@ -204,7 +204,7 @@ UnknownText_0x196fa8: ; 0x196fa8 ; 0x196fd2 UnknownText_0x196fd2: ; 0x196fd2 - text $52, " received" + text " 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 !" para "I'm OAK! A #MON" line "researcher." @@ -331,7 +331,7 @@ UnknownText_0x197185: ; 0x197185 ; 0x1973cc UnknownText_0x1973cc: ; 0x1973cc - text $52, " received" + text " 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 ", 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 ", 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, !" done UnknownText_0x1a813e: @@ -223,7 +223,7 @@ UnknownText_0x1a81c4: done UnknownText_0x1a81f2: - text "Hi, ", $14, "!" + text "Hi, !" line "Leaving again?" para "You should tell" @@ -240,7 +240,7 @@ UnknownText_0x1a8236: done UnknownText_0x1a8274: - text "Yo, ", $52, "!" + text "Yo, !" para "I hear PROF.ELM" line "discovered some" @@ -269,7 +269,7 @@ UnknownText_0x1a82e8: done UnknownText_0x1a8328: - text $52, "'s House" + text "'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, !" 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 ". 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, ." para "Go up to INDIGO" line "PLATEAU. You can" @@ -180,7 +180,7 @@ OakYesKantoBadgesText: line "for you." para "Keep trying hard," - line $14, "!" + line "!" done UnknownText_0x19b7fb: ; 0x19b7fb @@ -246,7 +246,7 @@ OaksLabPCText: line "away." para "I heard rumors" - line "that ", $14, " is" + line "that 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 " received" line "MINERALBADGE." done ; 0x9c354 @@ -157,7 +157,7 @@ UnknownText_0x9c354: ; 0x9c354 ; 0x9c393 UnknownText_0x9c393: ; 0x9c393 - text $52, " received" + text " 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 " 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 " 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 " 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 " received" line "BOULDERBADGE." done ; 0x1a2a57 UnknownText_0x1a2a57: ; 0x1a2a57 - text "BROCK: ", $14, "," + text "BROCK: ," 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 ", 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, !" para "Did you come see" line "me about my #-" @@ -264,7 +264,7 @@ UnknownText_0x191c5a: ; 0x191c5a ; 0x191d0a UnknownText_0x191d0a: ; 0x191d0a - text $52, " received" + text " 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 "'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 "…, OK!" - para "Come on, ", $14, "." + para "Come on, ." line "Join the show." done ; 0x5dedd @@ -641,7 +641,7 @@ UnknownText_0x5dedd: ; 0x5dedd line "shout out today's" para "password for" - line $14, "!" + line "!" done ; 0x5df29 @@ -690,7 +690,7 @@ UnknownText_0x5e054: ; 0x5e054 text "BUENA: Yup! Our" line "contestant was" - para $14, "." + para "." 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, ." 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: ," line "do you want to" para "register my phone" @@ -773,7 +773,7 @@ UnknownText_0x5e2bf: ; 0x5e2bf ; 0x5e2f3 UnknownText_0x5e2f3: ; 0x5e2f3 - text $52, " registered" + text " registered" line "BUENA's number." done ; 0x5e310 @@ -792,7 +792,7 @@ UnknownText_0x5e33c: ; 0x5e33c ; 0x5e35e UnknownText_0x5e35e: ; 0x5e35e - text "BUENA: ", $14, "," + text "BUENA: ," 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 " 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 ", 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: ," line "thank you!" para "Your courageous" @@ -430,7 +430,7 @@ UnknownText_0x6062c: ; 0x6062c UnknownText_0x60824: ; 0x60824 text "DIRECTOR: Hello," - line $14, "!" + line "!" 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 " 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 ." 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 ?" 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 " 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 ", 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 " 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 " received" line "20 PARK BALLS." done ; 0x6a3e2 @@ -341,7 +341,7 @@ UnknownText_0x6a537: ; 0x6a537 ; 0x6a56b UnknownText_0x6a56b: ; 0x6a56b - text $52, "'s #MON" + text "'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 " used the" line "SQUIRTBOTTLE." done ; 0x1942aa @@ -572,7 +572,7 @@ UnknownText_0x1944d0: ; 0x1944d0 ; 0x19451a UnknownText_0x19451a: ; 0x19451a - text $52, " received" + text " 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 " received" line "20 PARK BALLS." done ; 0x6aecc @@ -603,7 +603,7 @@ UnknownText_0x6b021: ; 0x6b021 ; 0x6b055 UnknownText_0x6b055: ; 0x6b055 - text $52, "'s #MON" + text "'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 "?" 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 " gave a" line "BERRY to MILTANK." done ; 0x9cdd8 @@ -195,13 +195,13 @@ UnknownText_0x9ce1b: ; 0x9ce1b ; 0x9ce3c UnknownText_0x9ce3c: ; 0x9ce3c - text $52, " has no" + text " has no" line "BERRIES…" done ; 0x9ce4f UnknownText_0x9ce4f: ; 0x9ce4f - text $52, " wouldn't" + text " 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 " 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 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 " 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 "'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 " 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 " 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 "!" 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 ", 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 "!" para "TEAM ROCKET has" line "taken off." @@ -386,7 +386,7 @@ UnknownText_0x5abcb: ; 0x5abcb ; 0x5ac09 UnknownText_0x5ac09: ; 0x5ac09 - text $52, " read the" + text " 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 " 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, ." 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 ", let's" line "split the job." done ; 0x6d7ea @@ -841,7 +841,7 @@ UnknownText_0x6d809: ; 0x6d809 ; 0x6d8e6 UnknownText_0x6d8e6: ; 0x6d8e6 - text $52, " received" + text " received" line "HM06." done ; 0x6d8f8 @@ -865,7 +865,7 @@ UnknownText_0x6d8f8: ; 0x6d8f8 ; 0x6d994 UnknownText_0x6d994: ; 0x6d994 - text $14, "…" + text "…" 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: ," 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 " 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 ", 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 " 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 "." 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, !" done ; 0x185386 @@ -483,7 +483,7 @@ UnknownText_0x1856a3: ; 0x1856a3 line "to see the #MON" para "of rainbow colors," - line $52, "." + line "." 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 " 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 " flashed" line "the S.S.TICKET." para "That's it." @@ -267,7 +267,7 @@ UnknownText_0x74fc2: done UnknownText_0x74ff2: - text $52, " tried to" + text " 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 "!" 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 " 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 ", 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 ", 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 ", 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 " 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, ." 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, , move" line "on and experience" para "the true ferocity" diff --git a/misc/mobile_42.asm b/misc/mobile_42.asm index 1950a1812..3fc90d836 100644 --- a/misc/mobile_42.asm +++ b/misc/mobile_42.asm @@ -1324,7 +1324,7 @@ String_108a79: ; 108a79 db "─ №", $f2 next "" next "おや/" - next $73, "№", $f2, "" + next $73, "№", $f2 db "@" ; 108a87 diff --git a/text/battle.asm b/text/battle.asm index bc67cd95e..3f29835aa 100644 --- a/text/battle.asm +++ b/text/battle.asm @@ -1,5 +1,5 @@ BattleText_0x80730: ; 0x80730 - text $52, " picked up" + text " picked up" line "¥@" deciram wPayDayMoney, $36 text "!" @@ -18,8 +18,8 @@ HookedPokemonAttackedText: ; 0x8075c text "The hooked" line "@" text_from_ram EnemyMonNick - text $55 - db "attacked!" + text "" + cont "attacked!" prompt ; 0x80778 @@ -39,7 +39,7 @@ WildCelebiAppearedText: ; 0x80793 ; 0x807a9 WantsToBattleText:: ; 0x807a9 - text $3f + text "" line "wants to battle!" prompt ; 0x807bd @@ -61,43 +61,43 @@ BattleText_0x807cf: ; 0x807cf ; 0x807e2 HurtByPoisonText: ; 0x807e2 - text $5a + text "" line "is hurt by poison!" prompt ; 0x807f8 HurtByBurnText: ; 0x807f8 - text $5a, "'s" + text "'s" line "hurt by its burn!" prompt ; 0x8080e LeechSeedSapsText: ; 0x8080e text "LEECH SEED saps" - line $5a, "!" + line "!" prompt ; 0x80822 HasANightmareText: ; 0x80822 - text $5a + text "" line "has a NIGHTMARE!" prompt ; 0x80836 HurtByCurseText: ; 0x80836 - text $5a, "'s" + text "'s" line "hurt by the CURSE!" prompt ; 0x8084d SandstormHitsText: ; 0x8084d text "The SANDSTORM hits" - line $5a, "!" + line "!" prompt ; 0x80864 PerishCountText: ; 0x80864 - text $5a, "'s" + text "'s" line "PERISH count is @" deciram wd265, $11 text "!" @@ -105,7 +105,7 @@ PerishCountText: ; 0x80864 ; 0x80880 BattleText_0x80880: ; 0x80880 - text $59 + text "" line "recovered with" cont "@" text_from_ram StringBuffer1 @@ -114,7 +114,7 @@ BattleText_0x80880: ; 0x80880 ; 0x80899 BattleText_0x80899: ; 0x80899 - text $5a + text "" line "recovered PP using" cont "@" text_from_ram StringBuffer1 @@ -123,14 +123,14 @@ BattleText_0x80899: ; 0x80899 ; 0x808b6 BattleText_0x808b6: ; 0x808b6 - text $59 + text "" line "was hit by FUTURE" cont "SIGHT!" prompt ; 0x808d2 BattleText_0x808d2: ; 0x808d2 - text $5a, "'s" + text "'s" line "SAFEGUARD faded!" prompt ; 0x808e7 @@ -193,26 +193,26 @@ BattleText_0x809a8: ; 0x809a8 ; 0x809be GotMoneyForWinningText: - text $52, " got ¥@" + text " got ¥@" deciram wc686, $36 text "" line "for winning!" prompt BattleText_0x809da: ; 0x809da - text $3f + text "" line "was defeated!" prompt ; 0x809eb TiedAgainstText: ; 0x809eb text "Tied against" - line $3f, "!" + line "!" prompt ; 0x809fc SentSomeToMomText: - text $52, " got ¥@" + text " got ¥@" deciram wc686, $36 text "" line "for winning!" @@ -228,7 +228,7 @@ SentAllToMomText: prompt BattleText_0x80a4f: ; 0x80a4f - text $53, ": Huh? I" + text ": Huh? I" line "should've chosen" cont "your #MON!" prompt @@ -247,7 +247,7 @@ BattleText_0x80a83: ; 0x80a83 ; 0x80a93 BattleText_0x80a93: ; 0x80a93 - text $53, ": Yes!" + text ": Yes!" line "I guess I chose a" cont "good #MON!" prompt @@ -255,24 +255,24 @@ BattleText_0x80a93: ; 0x80a93 LostAgainstText: ; 0x80ab9 text "Lost against" - line $3f, "!" + line "!" prompt ; 0x80aca BattleText_0x80aca: ; 0x80aca - text $3f + text "" line "is about to use" cont "@" text_from_ram EnemyMonNick text "." - para "Will ", $52 + para "Will " line "change #MON?" done ; 0x80af8 BattleText_0x80af8: ; 0x80af8 - text $3f + text "" line "sent out" cont "@" text_from_ram EnemyMonNick @@ -310,7 +310,7 @@ BattleText_0x80b77: ; 0x80b77 ; 0x80b89 BattleText_0x80b89: ; 0x80b89 - text $5a + text "" line "fled using a" cont "@" text_from_ram StringBuffer1 @@ -324,13 +324,13 @@ BattleText_0x80ba0: ; 0x80ba0 ; 0x80bae BattleText_0x80bae: ; 0x80bae - text $5a, "'s" + text "'s" line "hurt by SPIKES!" prompt ; 0x80bc2 RecoveredUsingText: ; 0x80bc2 - text $59 + text "" line "recovered using a" cont "@" text_from_ram StringBuffer1 @@ -339,11 +339,11 @@ RecoveredUsingText: ; 0x80bc2 ; 0x80bde BattleText_0x80bde: ; 0x80bde - text $5a, "'s" + text "'s" line "@" text_from_ram StringBuffer1 - text $55 - db "activated!" + text "" + cont "activated!" prompt ; 0x80bf3 @@ -387,7 +387,7 @@ BattleText_0x80c72: ; 0x80c72 ; 0x80c8a BattleText_0x80c8a: ; 0x80c8a - text $59, "'s" + text "'s" line "ENCORE ended!" prompt ; 0x80c9c @@ -423,43 +423,43 @@ BattleText_0x80cd1: ; 0x80cd1 ; 0x80ce7 FastAsleepText: ; 0x80ce7 - text $5a + text "" line "is fast asleep!" prompt ; 0x80cfa WokeUpText: ; 0x80cfa - text $5a + text "" line "woke up!" prompt ; 0x80d06 FrozenSolidText: ; 0x80d06 - text $5a + text "" line "is frozen solid!" prompt ; 0x80d1a FlinchedText: ; 0x80d1a - text $5a + text "" line "flinched!" prompt ; 0x80d27 MustRechargeText: ; 0x80d27 - text $5a + text "" line "must recharge!" prompt ; 0x80d39 DisabledNoMoreText: ; 0x80d39 - text $5a, "'s" + text "'s" line "disabled no more!" prompt ; 0x80d4f IsConfusedText: ; 0x80d4f - text $5a + text "" line "is confused!" prompt ; 0x80d5f @@ -471,13 +471,13 @@ HurtItselfText: ; 0x80d5f ; 0x80d81 ConfusedNoMoreText: ; 0x80d81 - text $5a, "'s" + text "'s" line "confused no more!" prompt ; 0x80d97 BecameConfusedText: ; 0x80d97 - text $59 + text "" line "became confused!" prompt ; 0x80dab @@ -486,19 +486,19 @@ BattleText_0x80dab: ; 0x80dab text "A @" text_from_ram StringBuffer1 text " rid" - line $59 + line "" cont "of its confusion." prompt ; 0x80dcc AlreadyConfusedText: ; 0x80dcc - text $59, "'s" + text "'s" line "already confused!" prompt ; 0x80de2 BattleText_0x80de2: ; 0x80de2 - text $5a, "'s" + text "'s" line "hurt by" cont "@" text_from_ram StringBuffer1 @@ -507,7 +507,7 @@ BattleText_0x80de2: ; 0x80de2 ; 0x80df5 BattleText_0x80df5: ; 0x80df5 - text $5a + text "" line "was released from" cont "@" text_from_ram StringBuffer1 @@ -516,52 +516,52 @@ BattleText_0x80df5: ; 0x80df5 ; 0x80e11 UsedBindText: ; 0x80e11 - text $5a + text "" line "used BIND on" - cont $59, "!" + cont "!" prompt ; 0x80e24 WhirlpoolTrapText: ; 0x80e24 - text $59 + text "" line "was trapped!" prompt ; 0x80e34 FireSpinTrapText: ; 0x80e34 - text $59 + text "" line "was trapped!" prompt ; 0x80e44 WrappedByText: ; 0x80e44 - text $59 + text "" line "was WRAPPED by" - cont $5a, "!" + cont "!" prompt ; 0x80e59 ClampedByText: ; 0x80e59 - text $59 + text "" line "was CLAMPED by" - cont $5a, "!" + cont "!" prompt ; 0x80e6e StoringEnergyText: ; 0x80e6e - text $5a + text "" line "is storing energy!" prompt ; 0x80e84 UnleashedEnergyText: ; 0x80e84 - text $5a + text "" line "unleashed energy!" prompt ; 0x80e99 HungOnText: ; 0x80e99 - text $59 + text "" line "hung on with" cont "@" text_from_ram StringBuffer1 @@ -570,27 +570,27 @@ HungOnText: ; 0x80e99 ; 0x80eb0 EnduredText: ; 0x80eb0 - text $59 + text "" line "ENDURED the hit!" prompt ; 0x80ec4 InLoveWithText: ; 0x80ec4 - text $5a + text "" line "is in love with" - cont $59, "!" + cont "!" prompt ; 0x80eda InfatuationText: ; 0x80eda - text $5a, "'s" + text "'s" line "infatuation kept" cont "it from attacking!" prompt ; 0x80f02 DisabledMoveText: ; 0x80f02 - text $5a, "'s" + text "'s" line "@" text_from_ram StringBuffer1 text " is" @@ -647,7 +647,7 @@ NoPPLeftText: ; 0x80f99 ; 0x80fba HasNoPPLeftText: ; 0x80fba - text $5a + text "" line "has no PP left for" cont "@" text_from_ram StringBuffer2 @@ -656,52 +656,52 @@ HasNoPPLeftText: ; 0x80fba ; 0x80fd7 WentToSleepText: ; 0x80fd7 - text $5a + text "" line "went to sleep!" done ; 0x80fe9 RestedText: ; 0x80fe9 - text $5a + text "" line "fell asleep and" cont "became healthy!" done ; 0x8100c RegainedHealthText: ; 0x8100c - text $5a + text "" line "regained health!" prompt ; 0x81020 AttackMissedText: ; 0x81020 - text $5a, "'s" + text "'s" line "attack missed!" prompt ; 0x81033 AttackMissed2Text: ; 0x81033 - text $5a, "'s" + text "'s" line "attack missed!" prompt ; 0x81046 CrashedText: ; 0x81046 - text $5a + text "" line "kept going and" cont "crashed!" prompt ; 0x81061 UnaffectedText: ; 0x81061 - text $59, "'s" + text "'s" line "unaffected!" prompt ; 0x81071 DoesntAffectText: ; 0x81071 text "It doesn't affect" - line $59, "!" + line "!" prompt ; 0x81086 @@ -728,20 +728,20 @@ NotVeryEffectiveText: ; 0x810c1 ; 0x810da TookDownWithItText: ; 0x810da - text $59 + text "" line "took down with it," - cont $5a, "!" + cont "!" prompt ; 0x810f3 RageBuildingText: ; 0x810f3 - text $5a, "'s" + text "'s" line "RAGE is building!" prompt ; 0x81109 GotAnEncoreText: ; 0x81109 - text $59 + text "" line "got an ENCORE!" prompt ; 0x8111b @@ -753,13 +753,13 @@ SharedPainText: ; 0x8111b ; 0x81136 TookAimText: ; 0x81136 - text $5a + text "" line "took aim!" prompt ; 0x81143 SketchedText: ; 0x81143 - text $5a + text "" line "SKETCHED" cont "@" text_from_ram StringBuffer1 @@ -768,14 +768,14 @@ SketchedText: ; 0x81143 ; 0x81156 DestinyBondEffectText: ; 0x81156 - text $5a, "'s" + text "'s" line "trying to take its" cont "opponent with it!" prompt ; 0x8117f SpiteEffectText: ; 0x8117f - text $59, "'s" + text "'s" line "@" text_from_ram StringBuffer1 text " was" @@ -792,67 +792,67 @@ BellChimedText: ; 0x811a0 ; 0x811b1 FellAsleepText: ; 0x811b1 - text $59 + text "" line "fell asleep!" prompt ; 0x811c1 AlreadyAsleepText: ; 0x811c1 - text $59, "'s" + text "'s" line "already asleep!" prompt ; 0x811d5 WasPoisonedText: ; 0x811d5 - text $59 + text "" line "was poisoned!" prompt ; 0x811e6 BadlyPoisonedText: ; 0x811e6 - text $59, "'s" + text "'s" line "badly poisoned!" prompt ; 0x811fa AlreadyPoisonedText: ; 0x811fa - text $59, "'s" + text "'s" line "already poisoned!" prompt ; 0x81210 SuckedHealthText: ; 0x81210 text "Sucked health from" - line $59, "!" + line "!" prompt ; 0x81227 DreamEatenText: ; 0x81227 - text $59, "'s" + text "'s" line "dream was eaten!" prompt ; 0x8123c WasBurnedText: ; 0x8123c - text $59 + text "" line "was burned!" prompt ; 0x8124b DefrostedOpponentText: ; 0x8124b - text $59 + text "" line "was defrosted!" prompt ; 0x8125d WasFrozenText: ; 0x8125d - text $59 + text "" line "was frozen solid!" prompt ; 0x81272 WontRiseAnymoreText: ; 0x81272 - text $5a, "'s" + text "'s" line "@" text_from_ram StringBuffer2 text " won't" @@ -861,7 +861,7 @@ WontRiseAnymoreText: ; 0x81272 ; 0x8128f WontDropAnymoreText: ; 0x8128f - text $59, "'s" + text "'s" line "@" text_from_ram StringBuffer2 text " won't" @@ -870,19 +870,19 @@ WontDropAnymoreText: ; 0x8128f ; 0x812ac FledFromBattleText:: ; 0x812ac - text $5a + text "" line "fled from battle!" prompt ; 0x812c1 FledInFearText: ; 0x812c1 - text $59 + text "" line "fled in fear!" prompt ; 0x812d2 BlownAwayText: ; 0x812d2 - text $59 + text "" line "was blown away!" prompt ; 0x812e5 @@ -902,38 +902,38 @@ EnemyHitTimesText: ; 0x812f8 ; 0x8130b MistText: ; 0x8130b - text $5a, "'s" + text "'s" line "shrouded in MIST!" prompt ; 0x81321 ProtectedByMistText: ; 0x81321 - text $59, "'s" + text "'s" line "protected by MIST." prompt ; 0x81338 GettingPumpedText: ; 0x81338 interpret_data - text $5a, "'s" + text "'s" line "getting pumped!" prompt ; 0x8134d RecoilText: ; 0x8134d - text $5a, "'s" + text "'s" line "hit with recoil!" prompt ; 0x81362 MadeSubstituteText: ; 0x81362 - text $5a + text "" line "made a SUBSTITUTE!" prompt ; 0x81378 HasSubstituteText: ; 0x81378 - text $5a + text "" line "has a SUBSTITUTE!" prompt ; 0x8138d @@ -947,18 +947,18 @@ TooWeakSubText: ; 0x8138d SubTookDamageText: ; 0x813ad text "The SUBSTITUTE" line "took damage for" - cont $59, "!" + cont "!" prompt ; 0x813d0 SubFadedText: ; 0x813d0 - text $59, "'s" + text "'s" line "SUBSTITUTE faded!" prompt ; 0x813e6 LearnedMoveText: ; 0x813e6 - text $5a + text "" line "learned" cont "@" text_from_ram StringBuffer1 @@ -967,19 +967,19 @@ LearnedMoveText: ; 0x813e6 ; 0x813f8 WasSeededText: ; 0x813f8 - text $59 + text "" line "was seeded!" prompt ; 0x81407 EvadedText: ; 0x81407 - text $59 + text "" line "evaded the attack!" prompt ; 0x8141d WasDisabledText: ; 0x8141d - text $59, "'s" + text "'s" line "@" text_from_ram StringBuffer1 text " was" @@ -994,7 +994,7 @@ CoinsScatteredText: ; 0x81435 ; 0x81452 TransformedTypeText: ; 0x81452 - text $5a + text "" line "transformed into" cont "the @" text_from_ram StringBuffer1 @@ -1009,7 +1009,7 @@ EliminatedStatsText: ; 0x81476 ; 0x81499 TransformedText: ; 0x81499 - text $5a + text "" line "TRANSFORMED into" cont "@" text_from_ram StringBuffer1 @@ -1018,13 +1018,13 @@ TransformedText: ; 0x81499 ; 0x814b4 LightScreenEffectText: ; 0x814b4 - text $5a, "'s" + text "'s" line "SPCL.DEF rose!" prompt ; 0x814c7 ReflectEffectText: ; 0x814c7 - text $5a, "'s" + text "'s" line "DEFENSE rose!" prompt ; 0x814d9 @@ -1047,49 +1047,49 @@ ItFailedText: ; 0x81500 DidntAffect1Text: ; 0x8150c text "It didn't affect" - line $59, "!" + line "!" prompt ; 0x81520 DidntAffect2Text: ; 0x81520 text "It didn't affect" - line $59, "!" + line "!" prompt ; 0x81534 HPIsFullText: ; 0x81534 - text $5a, "'s" + text "'s" line "HP is full!" prompt ; 0x81544 DraggedOutText: ; 0x81544 - text $5a + text "" line "was dragged out!" prompt ; 0x81558 ParalyzedText: ; 0x81558 - text $59, "'s" + text "'s" line "paralyzed! Maybe" cont "it can't attack!" prompt ; 0x8157d FullyParalyzedText: ; 0x8157d - text $5a, "'s" + text "'s" line "fully paralyzed!" prompt ; 0x81592 AlreadyParalyzedText: ; 0x81592 - text $59, "'s" + text "'s" line "already paralyzed!" prompt ; 0x815a9 ProtectedByText: ; 0x815a9 - text $59, "'s" + text "'s" line "protected by" cont "@" text_from_ram StringBuffer1 @@ -1098,55 +1098,56 @@ ProtectedByText: ; 0x815a9 ; 0x815c1 MirrorMoveFailedText: ; 0x815c1 - text "The MIRROR MOVE", $4e, "failed!" + text "The MIRROR MOVE" + next "failed!" prompt ; 0x815da StoleText: ; 0x815da - text $5a + text "" line "stole @" text_from_ram StringBuffer1 - text $55 - db "from its foe!" + text "" + cont "from its foe!" prompt ; 0x815f7 CantEscapeNowText: ; 0x815f7 - text $59 + text "" line "can't escape now!" prompt ; 0x8160b StartedNightmareText: ; 0x8160b - text $59 + text "" line "started to have a" cont "NIGHTMARE!" prompt ; 0x8162b WasDefrostedText: ; 0x8162b - text $5a + text "" line "was defrosted!" prompt ; 0x8163d PutACurseText: ; 0x8163d - text $5a + text "" line "cut its own HP and" para "put a CURSE on" - line $59, "!" + line "!" prompt ; 0x81665 ProtectedItselfText: ; 0x81665 - text $5a + text "" line "PROTECTED itself!" prompt ; 0x8167a ProtectingItselfText: ; 0x8167a - text $59, "'s" + text "'s" line "PROTECTING itself!" done ; 0x81691 @@ -1154,14 +1155,14 @@ ProtectingItselfText: ; 0x8167a SpikesText: ; 0x81691 text "SPIKES scattered" line "all around" - cont $59, "!" + cont "!" prompt ; 0x816b1 IdentifiedText: ; 0x816b1 - text $5a + text "" line "identified" - cont $59, "!" + cont "!" prompt ; 0x816c2 @@ -1178,25 +1179,25 @@ SandstormBrewedText: ; 0x816e4 ; 0x816f9 BracedItselfText: ; 0x816f9 - text $5a + text "" line "braced itself!" prompt ; 0x8170b FellInLoveText: ; 0x8170b - text $59 + text "" line "fell in love!" prompt ; 0x8171c CoveredByVeilText: ; 0x8171c - text $5a, "'s" + text "'s" line "covered by a veil!" prompt ; 0x81733 SafeguardProtectText: ; 0x81733 - text $59 + text "" line "is protected by" cont "SAFEGUARD!" prompt @@ -1210,20 +1211,20 @@ MagnitudeText: ; 0x81751 ; 0x81764 ReleasedByText: ; 0x81764 - text $5a + text "" line "was released by" - cont $59, "!" + cont "!" prompt ; 0x8177a ShedLeechSeedText: ; 0x8177a - text $5a + text "" line "shed LEECH SEED!" prompt ; 0x8178e BlewSpikesText: ; 0x8178e - text $5a + text "" line "blew away SPIKES!" prompt ; 0x817a3 @@ -1241,23 +1242,23 @@ SunGotBrightText: ; 0x817b8 ; 0x817d2 BellyDrumText: ; 0x817d2 - text $5a + text "" line "cut its HP and" cont "maximized ATTACK!" prompt ; 0x817f6 CopiedStatsText: ; 0x817f6 - text $5a + text "" line "copied the stat" para "changes of" - line $59, "!" + line "!" prompt ; 0x81817 ForesawAttackText: ; 0x81817 - text $5a + text "" line "foresaw an attack!" prompt ; 0x8182d @@ -1270,13 +1271,13 @@ BeatUpAttackText: ; 0x8182d ; 0x8183b RefusedGiftText: ; 0x8183b - text $59 + text "" line "refused the gift!" prompt ; 0x81850 IgnoredOrders2Text: ; 0x81850 - text $5a + text "" line "ignored orders!" prompt ; 0x81863 diff --git a/text/common.asm b/text/common.asm index f528f0bcc..74e143b13 100644 --- a/text/common.asm +++ b/text/common.asm @@ -247,9 +247,9 @@ UnknownText_0x1b05bf: ; 0x1b05bf ; 0x1b0621 UnknownText_0x1b0621: ; 0x1b0621 - text $52, ", the No.@" + text ", the No.@" text_from_ram StringBuffer3 - db $0 + text "" line "finisher, wins" cont "@" text_from_ram StringBuffer4 @@ -258,7 +258,7 @@ UnknownText_0x1b0621: ; 0x1b0621 ; 0x1b0648 UnknownText_0x1b0648: ; 0x1b0648 - text $52, " received" + text " received" line "@" text_from_ram StringBuffer4 text "." @@ -304,7 +304,7 @@ UnknownText_0x1b070d: ; 0x1b070d UnknownText_0x1b074e: ; 0x1b074e text_from_ram StringBuffer3 - db $0 + text "" line "#MON GYM" done ; 0x1b075c @@ -312,9 +312,10 @@ UnknownText_0x1b074e: ; 0x1b074e UnknownText_0x1b075c: ; 0x1b075c text "LEADER: @" text_from_ram StringBuffer4 - db $0, $51 - db "WINNING TRAINERS:" - line $52, $57 + text "" + para "WINNING TRAINERS:" + line "" + done ; 0x1b077f UnknownText_0x1b077f: ; 0x1b077f @@ -408,14 +409,14 @@ HappinessText1: done RegisteredNumber1Text: - text $52, " registered" + text " registered" line "@" text_from_ram StringBuffer3 text "'s number." done RegisteredNumber2Text: - text $52, " registered" + text " registered" line "@" text_from_ram StringBuffer3 text "'s number." diff --git a/text/common_2.asm b/text/common_2.asm index 7287ad78f..60a92f0c3 100644 --- a/text/common_2.asm +++ b/text/common_2.asm @@ -144,27 +144,31 @@ UnknownText_0x1bc1cf: ; 0x1bc1cf UnknownText_0x1bc1eb: ; 0x1bc1eb text "Your PASSCODE has" - line "been set.", $51 - db "Enter this number" - line "next time to open", $55 - db "the CARD FOLDER.", $51 - db $57 + line "been set." + para "Enter this number" + line "next time to open" + cont "the CARD FOLDER." + para "" + done ; 0x1bc23e UnknownText_0x1bc23e: ; 0x1bc23e - text "0000 is invalid!", $51 - db $57 + text "0000 is invalid!" + para "" + done ; 0x1bc251 UnknownText_0x1bc251: ; 0x1bc251 - text "Enter the CARD", $4e, "FOLDER PASSCODE." + text "Enter the CARD" + next "FOLDER PASSCODE." done ; 0x1bc272 UnknownText_0x1bc272: ; 0x1bc272 text "Incorrect" - line "PASSCODE!", $51 - db $57 + line "PASSCODE!" + para "" + done ; 0x1bc288 UnknownText_0x1bc288: ; 0x1bc288 @@ -283,7 +287,8 @@ UnknownText_0x1bc404: ; 0x1bc404 UnknownText_0x1bc42c: ; 0x1bc42c text "The password is:" - line $57 + line "" + done ; 0x1bc43f UnknownText_0x1bc43f: ; 0x1bc43f @@ -347,8 +352,8 @@ UnknownText_0x1bc51c: ; 0x1bc51c text "Put away the" line "@" text_from_ram StringBuffer3 - text $51 - db "and set up the" + text "" + para "and set up the" line "@" text_from_ram StringBuffer4 text "." @@ -399,7 +404,7 @@ UnknownText_0x1bc5ef: ; 0x1bc5ef ; 0x1bc615 UnknownText_0x1bc615: ; 0x1bc615 - text "Hi, ", $52, "!" + text "Hi, !" line "How are you?" prompt ; 0x1bc62a @@ -1286,11 +1291,12 @@ UnknownText_0x1bcf96: ; 0x1bcf96 UnknownText_0x1bcf99: ; 0x1bcf99 text "" - line $57 + line "" + done ; 0x1bcf9c UnknownText_0x1bcf9c: ; 0x1bcf9c - text $3f + text "" line "withdrew" cont "@" text_from_ram EnemyMonNick @@ -1299,11 +1305,11 @@ UnknownText_0x1bcf9c: ; 0x1bcf9c ; 0x1bcfaf UnknownText_0x1bcfaf: ; 0x1bcfaf - text $3f + text "" line "used @" text_from_ram wd050 - text $55 - db "on @" + text "" + cont "on @" text_from_ram EnemyMonNick text "!" prompt @@ -1383,7 +1389,8 @@ UnknownText_0x1bd0d8: ; 0x1bd0d8 UnknownText_0x1bd109: ; 0x1bd109 text "There is no EGG." - line $58 + line "" + prompt ; 0x1bd11c UnknownText_0x1bd11c: ; 0x1bd11c @@ -1528,7 +1535,7 @@ UnknownText_0x1bd308: ; 0x1bd308 ; 0x1bd321 UnknownText_0x1bd321: ; 0x1bd321 - text $52, " found" + text " found" line "@" text_from_ram StringBuffer3 text "!" @@ -1536,7 +1543,7 @@ UnknownText_0x1bd321: ; 0x1bd321 ; 0x1bd331 UnknownText_0x1bd331: ; 0x1bd331 - text "But ", $52, " has" + text "But has" line "no space left…" done ; 0x1bd34b @@ -1595,11 +1602,11 @@ UnknownText_0x1bd407: ; 0x1bd407 ; 0x1bd429 UnknownText_0x1bd429: ; 0x1bd429 - text $52, " traded" + text " traded" line "@" text_from_ram wd050 - text " for", $55 - db "@" + text " for" + cont "@" text_from_ram StringBuffer2 text ".@" db "@" @@ -1815,8 +1822,9 @@ UnknownText_0x1bd77f: ; 0x1bd77f UnknownText_0x1bd868: ; 0x1bd868 text "OK, I'll take care" - line "of your money.", $51 - db $56, $56, $56, $58 + line "of your money." + para $56, $56, $56 + prompt ; 0x1bd88e UnknownText_0x1bd88e: ; 0x1bd88e @@ -1895,7 +1903,7 @@ UnknownText_0x1bda25: ; 0x1bda25 text "OK, I'll save your" line "money. Trust me!" - para $52, ", stick" + para ", stick" line "with it!" done ; 0x1bda5b @@ -1907,7 +1915,7 @@ UnknownText_0x1bda5b: ; 0x1bda5b ; 0x1bda7e UnknownText_0x1bda7e: ; 0x1bda7e - text $52, ", don't" + text ", don't" line "give up!" done ; 0x1bda90 @@ -2059,7 +2067,7 @@ UnknownText_0x1bde04: ; 0x1bde04 ; 0x1bde1f UnknownText_0x1bde1f: ; 0x1bde1f - text $52, " got back" + text " got back" line "@" text_from_ram StringBuffer1 text "." @@ -2070,8 +2078,8 @@ UnknownText_0x1bde32: ; 0x1bde32 text "Huh? Back already?" line "Your @" text_from_ram StringBuffer1 - text $51 - db "needs a little" + text "" + para "needs a little" line "more time with us." para "If you want your" @@ -2128,7 +2136,7 @@ UnknownText_0x1bdf00: ; 0x1bdf00 ; 0x1bdfa5 UnknownText_0x1bdfa5: ; 0x1bdfa5 - text $52, " received" + text " received" line "the EGG!" done ; 0x1bdfba diff --git a/text/common_3.asm b/text/common_3.asm index 5599301df..7b15baf5e 100644 --- a/text/common_3.asm +++ b/text/common_3.asm @@ -292,8 +292,8 @@ UnknownText_0x1c04fa: ; 1c04fa text " sent" line "@" text_from_ram StringBuffer1 - text $55 - db "to @" + text "" + cont "to @" text_from_ram wc950 + 3 text "'s home." prompt @@ -422,7 +422,7 @@ UnknownText_0x1c06de: ; 1c06de ; 1c06ed UnknownText_0x1c06ed: ; 1c06ed - text $52, " used an" + text " used an" line "ESCAPE ROPE." done ; 1c0705 @@ -441,8 +441,9 @@ UnknownText_0x1c071a: ; 1c071a UnknownText_0x1c073b: ; 1c073b text "Can't use that" - line "here.", $51 - db $57 + line "here." + para "" + done ; 1c0751 UnknownText_0x1c0751: ; 1c0751 @@ -578,7 +579,7 @@ UnknownText_0x1c099a: ; 1c099a ; 1c09b2 UnknownText_0x1c09b2: ; 1c09b2 - text $52, " got on the" + text " got on the" line "@" text_from_ram StringBuffer2 text "." @@ -586,7 +587,7 @@ UnknownText_0x1c09b2: ; 1c09b2 ; 1c09c7 UnknownText_0x1c09c7: ; 1c09c7 - text $52, " got off" + text " got off" line "the @" text_from_ram StringBuffer2 text "." @@ -608,7 +609,7 @@ UnknownText_0x1c0a05: ; 1c0a05 ; 1c0a1c UnknownText_0x1c0a1c: ; 1c0a1c - text $52, " found" + text " found" line "@" text_from_ram StringBuffer3 text "!" @@ -616,17 +617,17 @@ UnknownText_0x1c0a1c: ; 1c0a1c ; 1c0a2c UnknownText_0x1c0a2c: ; 1c0a2c - text "But ", $52, " can't" + text "But can't" line "carry any more" cont "items." done ; 1c0a4e UnknownText_0x1c0a4e: ; 1c0a4e - text $52, " is out of" + text " is out of" line "useable #MON!" - para $52, " whited" + para " whited" line "out!" done ; 1c0a77 @@ -652,10 +653,10 @@ UnknownText_0x1c0acc: ; 1c0acc ; 1c0ada UnknownText_0x1c0ada: ; 1c0ada - text $52, " is out of" + text " is out of" line "useable #MON!" - para $52, " whited" + para " whited" line "out!" prompt ; 1c0b03 @@ -674,7 +675,7 @@ UnknownText_0x1c0b1a: ; 1c0b1a ; 1c0b3b UnknownText_0x1c0b3b: ; 1c0b3b - text $52, " sprinkled" + text " sprinkled" line "water." para "But nothing" @@ -683,7 +684,7 @@ UnknownText_0x1c0b3b: ; 1c0b3b ; 1c0b65 UnknownText_0x1c0b65: ; 1c0b65 - text $52, "'s #MON" + text "'s #MON" line "were all healed!" done ; 1c0b7f @@ -724,7 +725,7 @@ UnknownText_0x1c0bd8: ; 1c0bd8 ; 1c0bee UnknownText_0x1c0bee: ; 1c0bee - text "OAK: ", $52, "!" + text "OAK: !" line "This isn't the" cont "time to use that!" prompt @@ -774,7 +775,7 @@ UnknownText_0x1c0ca3: ; 1c0ca3 ; 1c0cc6 UnknownText_0x1c0cc6: ; 1c0cc6 - text $5a, "'s" + text "'s" line "@" text_from_ram StringBuffer2 db "@" @@ -796,7 +797,7 @@ UnknownText_0x1c0ce0: ; 1c0ce0 ; 1c0ceb UnknownText_0x1c0ceb: ; 1c0ceb - text $59, "'s" + text "'s" line "@" text_from_ram StringBuffer2 db "@" @@ -818,7 +819,7 @@ UnknownText_0x1c0d06: ; 1c0d06 ; 1c0d0e UnknownText_0x1c0d0e: ; 1c0d0e - text $5a, "@" + text "@" db "@" ; 1c0d12 @@ -859,7 +860,7 @@ UnknownText_0x1c0d6c: ; 1c0d6c ; 1c0d7a _ActorNameText: ; 1c0d7a - text $5a, "@" + text "@" db "@" ; 1c0d7e @@ -876,8 +877,8 @@ _UsedMove2Text: ; 1c0d87 ; 1c0d90 _UsedInsteadText: ; 1c0d90 - text "instead,", $55 - db "@" + text "instead," + cont "@" db "@" ; 1c0d9c @@ -916,8 +917,8 @@ _EndUsedMove5Text: ; 1c0dad ; 1c0db0 UnknownText_0x1c0db0: ; 1c0db0 - text "Huh?", $51 - db "@" + text "Huh?" + para "@" db "@" ; 1c0db8 @@ -1142,20 +1143,20 @@ UnknownText_0x1c10fa: ; 1c10fa text "This Bug-Catching" line "Contest winner is@" interpret_data - text "…", $51 - db "@" + text "…" + para "@" text_from_ram wd016 text "," - line "who caught a", $55 - db "@" + line "who caught a" + cont "@" text_from_ram StringBuffer1 text "!@" db "@" ; 1c113f UnknownText_0x1c113f: ; 1c113f - text $51 - db "The winning score" + text "" + para "The winning score" line "was @" deciram wd004, $23 text " points!" @@ -1166,8 +1167,8 @@ UnknownText_0x1c1166: ; 1c1166 text "Placing second was" line "@" text_from_ram wd016 - text ",", $51 - db "who caught a" + text "," + para "who caught a" line "@" text_from_ram StringBuffer1 text "!@" @@ -1175,8 +1176,8 @@ UnknownText_0x1c1166: ; 1c1166 ; 1c1196 UnknownText_0x1c1196: ; 1c1196 - text $51 - db "The score was" + text "" + para "The score was" line "@" deciram wd008, $23 text " points!" @@ -1187,8 +1188,8 @@ UnknownText_0x1c11b5: ; 1c11b5 text "Placing third was" line "@" text_from_ram wd016 - text ",", $51 - db "who caught a" + text "," + para "who caught a" line "@" text_from_ram StringBuffer1 text "!@" @@ -1196,8 +1197,8 @@ UnknownText_0x1c11b5: ; 1c11b5 ; 1c11e4 UnknownText_0x1c11e4: ; 1c11e4 - text $51 - db "The score was" + text "" + para "The score was" line "@" deciram wd00c, $23 text " points!" @@ -1216,8 +1217,8 @@ UnknownText_0x1c1203: ; 1c1203 ; 1c123a UnknownText_0x1c123a: ; 1c123a - text "CURRENT RECORD", $51 - db "@" + text "CURRENT RECORD" + para "@" text_from_ram StringBuffer1 text " caught by" line "@" @@ -1273,7 +1274,7 @@ UnknownText_0x1c1328: ; 1c1328 ; 1c1353 UnknownText_0x1c1353: ; 1c1353 - text $52, " turned on" + text " turned on" line "the PC." prompt ; 1c1368 @@ -1334,7 +1335,7 @@ _KrissPCNoRoomDepositText: ; 1c142d ; 1c144d UnknownText_0x1c144d: ; 1c144d - text $52, " turned on" + text " turned on" line "the PC." prompt ; 1c1462 @@ -1566,19 +1567,21 @@ _OakPCText4: ; 1c19aa UnknownText_0x1c19cd: ; 1c19cd text "Triple-theme" - line "trainer ranking!", $51 - db "The SAVE file you" - line "just sent might", $55 - db "make the rankings!", $51 - db $57 + line "trainer ranking!" + para "The SAVE file you" + line "just sent might" + cont "make the rankings!" + para "" + done ; 1c1a22 UnknownText_0x1c1a22: ; 1c1a22 text "There is no" - line "ranking data.", $51 - db "Link to obtain" - line "ranking data.", $51 - db $57 + line "ranking data." + para "Link to obtain" + line "ranking data." + para "" + done ; 1c1a5b UnknownText_0x1c1a5b: ; 1c1a5b @@ -1630,7 +1633,7 @@ UnknownText_0x1c1adf: ; 1c1adf ; 1c1b03 UnknownText_0x1c1b03: ; 1c1b03 - text "OAK: ", $52, "!" + text "OAK: !" line "This isn't the" cont "time to use that!" done @@ -1776,9 +1779,9 @@ _OakText1: ; 1c1d35 _OakText2: ; 1c1da4 text "This world is in-" - line "habited by crea-", $55 - db "tures that we call", $55 - db "#MON.@" + line "habited by crea-" + cont "tures that we call" + cont "#MON.@" db "@" ; 1c1de2 diff --git a/text/common_4.asm b/text/common_4.asm index 1ba35a33d..0278a20b9 100644 --- a/text/common_4.asm +++ b/text/common_4.asm @@ -5,7 +5,7 @@ _OakText6: ; 0x1c4000 ; 0x1c4026 _OakText7: ; 0x1c4026 - text $52, ", are you" + text ", are you" line "ready?" para "Your very own" @@ -219,7 +219,7 @@ UnknownText_0x1c456d: ; 0x1c456d ; 0x1c4590 UnknownText_0x1c4590: ; 0x1c4590 - text $52, " saved" + text " saved" line "the game." done ; 0x1c45a3 @@ -291,7 +291,7 @@ UnknownText_0x1c4706:: ; 0x1c4706 ; 0x1c4719 UnknownText_0x1c4719:: ; 0x1c4719 - text $52, " received" + text " received" line "@" text_from_ram StringBuffer4 text "." @@ -299,7 +299,7 @@ UnknownText_0x1c4719:: ; 0x1c4719 ; 0x1c472c UnknownText_0x1c472c:: ; 0x1c472c - text $52, " put the" + text " put the" line "@" text_from_ram StringBuffer1 text " in" @@ -366,16 +366,16 @@ UnknownText_0x1c4837: ; 0x1c4837 text "" line "came from @" text_from_ram wd02a - text $55 - db "in a trade?" + text "" + cont "in a trade?" para "@" text_from_ram wd00e text "" line "was where @" text_from_ram wd02a - text $55 - db "met @" + text "" + cont "met @" text_from_ram wd003 text "!" prompt @@ -489,8 +489,8 @@ UnknownText_0x1c4ae5: ; 0x1c4ae5 para "I'm sure that" line "seeing @" text_from_ram wd003 - text $51 - db "in battle would" + text "" + para "in battle would" line "excite anyone." done ; 0x1c4b92 @@ -507,8 +507,8 @@ UnknownText_0x1c4bae: ; 0x1c4bae ; 0x1c4baf UnknownText_0x1c4baf: ; 0x1c4baf - text $51 - db "evolved into" + text "" + para "evolved into" line "@" text_from_ram StringBuffer1 text "!" @@ -826,12 +826,13 @@ _MobileStadiumEntryText: ; 0x1c50c2 _MobileStadiumSuccessText: ; 0x1c5121 text "Data transfer is" - line "complete.", $51 - db "We hope you enjoy" - line "MOBILE STADIUM", $51 - db "battles in the N64" - line "#MON STADIUM 2.", $51 - db $57 + line "complete." + para "We hope you enjoy" + line "MOBILE STADIUM" + para "battles in the N64" + line "#MON STADIUM 2." + para "" + done ; 0x1c5182 UnknownText_0x1c5182: ; 0x1c5182 @@ -879,45 +880,49 @@ UnknownText_0x1c521c: ; 0x1c521c UnknownText_0x1c5238: ; 0x1c5238 text "The CARD FOLDER" - line "stores your and", $51 - db "your friends'" - line "CARDS.", $51 - db "A CARD contains" - line "information like", $51 - db "the person's name," - line "phone number and", $55 - db "profile.", $51 - db $57 + line "stores your and" + para "your friends'" + line "CARDS." + para "A CARD contains" + line "information like" + para "the person's name," + line "phone number and" + cont "profile." + para "" + done ; 0x1c52bc UnknownText_0x1c52bc: ; 0x1c52bc - text "This is your CARD.", $51 - db "Once you've" - line "entered your phone", $51 - db "number, you can" - line "trade CARDS with", $55 - db "your friends.", $51 - db $57 + text "This is your CARD." + para "Once you've" + line "entered your phone" + para "number, you can" + line "trade CARDS with" + cont "your friends." + para "" + done ; 0x1c531e UnknownText_0x1c531e: ; 0x1c531e text "If you have your" - line "friend's CARD, you", $51 - db "can use it to make" - line "a call from a", $51 - db "mobile phone on" - line "the 2nd floor of a", $55 - db "#MON CENTER.", $51 - db $57 + line "friend's CARD, you" + para "can use it to make" + line "a call from a" + para "mobile phone on" + line "the 2nd floor of a" + cont "#MON CENTER." + para "" + done ; 0x1c5394 UnknownText_0x1c5394: ; 0x1c5394 text "To safely store" - line "your collection of", $51 - db "CARDS, you must" - line "set a PASSCODE for", $55 - db "your CARD FOLDER.", $51 - db $57 + line "your collection of" + para "CARDS, you must" + line "set a PASSCODE for" + cont "your CARD FOLDER." + para "" + done ; 0x1c53ee UnknownText_0x1c53ee: ; 0x1c53ee @@ -945,8 +950,9 @@ UnknownText_0x1c5494: ; 0x1c5494 UnknownText_0x1c54b9: ; 0x1c54b9 text "The CARD FOLDER" - line "has been deleted.", $51 - db $57 + line "has been deleted." + para "" + done ; 0x1c54dd UnknownText_0x1c54dd: ; 0x1c54dd @@ -983,7 +989,8 @@ UnknownText_0x1c5580: ; 0x1c5580 ; 0x1c5588 UnknownText_0x1c5588: ; 0x1c5588 - text "", $56, $57 + text $56 + done ; 0x1c558b UnknownText_0x1c558b: ; 0x1c558b @@ -1053,7 +1060,8 @@ UnknownText_0x1c5677: ; 0x1c5677 ; 0x1c5678 UnknownText_0x1c5678: ; 0x1c5678 - text "Which move should", $4e, "be forgotten?" + text "Which move should" + next "be forgotten?" done ; 0x1c5699 @@ -1110,8 +1118,8 @@ UnknownText_0x1c574d: ; 0x1c574d UnknownText_0x1c574e: ; 0x1c574e text " Poof!@" interpret_data - text $51 - db "@" + text "" + para "@" text_from_ram wd050 text " forgot" line "@" @@ -1181,7 +1189,8 @@ UnknownText_0x1c5823: ; 0x1c5823 ; 0x1c5824 UnknownText_0x1c5824: ; 0x1c5824 - text "", $56, $57 + text $56 + done ; 0x1c5827 UnknownText_0x1c5827: ; 0x1c5827 @@ -1222,20 +1231,23 @@ UnknownText_0x1c58bc: ; 0x1c58bc ; 0x1c58d1 UnknownText_0x1c58d1: ; 0x1c58d1 - text "Here you go!", $51 - db $57 + text "Here you go!" + para "" + done ; 0x1c58e0 UnknownText_0x1c58e0: ; 0x1c58e0 text "You don't have" - line "enough points.", $51 - db $57 + line "enough points." + para "" + done ; 0x1c58ff UnknownText_0x1c58ff: ; 0x1c58ff text "You have no room" - line "for it.", $51 - db $57 + line "for it." + para "" + done ; 0x1c591a UnknownText_0x1c591a: ; 0x1c591a @@ -1245,14 +1257,16 @@ UnknownText_0x1c591a: ; 0x1c591a ; 0x1c5937 UnknownText_0x1c5937: ; 0x1c5937 - text "Excuse me!", $51 - db $57 + text "Excuse me!" + para "" + done ; 0x1c5944 UnknownText_0x1c5944: ; 0x1c5944 text "Excuse me." - line "You're not ready.", $51 - db $57 + line "You're not ready." + para "" + done ; 0x1c5962 UnknownText_0x1c5962: ; 0x1c5962 @@ -1263,44 +1277,50 @@ UnknownText_0x1c5962: ; 0x1c5962 UnknownText_0x1c5983: ; 0x1c5983 text "You need at least" - line "three #MON.", $51 - db $57 + line "three #MON." + para "" + done ; 0x1c59a3 UnknownText_0x1c59a3: ; 0x1c59a3 text "Sorry, an EGG" - line "doesn't qualify.", $51 - db $57 + line "doesn't qualify." + para "" + done ; 0x1c59c3 UnknownText_0x1c59c3: ; 0x1c59c3 text "Only three #MON" - line "may be entered.", $51 - db $57 + line "may be entered." + para "" + done ; 0x1c59e5 UnknownText_0x1c59e5: ; 0x1c59e5 text "The @" text_from_ram StringBuffer2 text " #MON" - line "must all be", $55 - db "different kinds.", $51 - db $57 + line "must all be" + cont "different kinds." + para "" + done ; 0x1c5a13 UnknownText_0x1c5a13: ; 0x1c5a13 text "The @" text_from_ram StringBuffer2 text " #MON" - line "must not hold the", $55 - db "same items.", $51 - db $57 + line "must not hold the" + cont "same items." + para "" + done ; 0x1c5a42 UnknownText_0x1c5a42: ; 0x1c5a42 text "You can't take an" - line "EGG!", $51 - db $57 + line "EGG!" + para "" + done ; 0x1c5a5a UnknownText_0x1c5a5a: ; 0x1c5a5a @@ -1374,8 +1394,8 @@ UnknownText_0x1c5b38: ; 0x1c5b38 UnknownText_0x1c5b53: ; 0x1c5b53 text_from_ram EnemyMonNick text "'s data" - line "was newly added to", $55 - db "the #DEX.@" + line "was newly added to" + cont "the #DEX.@" sound0x2C text_waitbutton db "@" @@ -1431,7 +1451,7 @@ UnknownText_0x1c5c28: ; 0x1c5c28 ; 0x1c5c44 UnknownText_0x1c5c44: ; 0x1c5c44 - text $52, " played the" + text " played the" line "# FLUTE.@" text_waitbutton db "@" @@ -1495,8 +1515,8 @@ UnknownText_0x1c5d03: ; 0x1c5d03 text "There was a trophy" line "inside!@" sound0 - text $51 - db "@" + text "" + para "@" text_from_ram PlayerName text " sent the" line "trophy home." @@ -1515,7 +1535,7 @@ UnknownText_0x1c5d50: ; 0x1c5d50 ; 0x1c5d6e UnknownText_0x1c5d6e: ; 0x1c5d6e - text "OAK: ", $52, "!" + text "OAK: !" line "This isn't the" cont "time to use that!" prompt @@ -1566,7 +1586,7 @@ UnknownText_0x1c5e3a: ; 0x1c5e3a ; 0x1c5e68 UnknownText_0x1c5e68: ; 0x1c5e68 - text $52, " used the@" + text " used the@" text_dunno1 text_from_ram StringBuffer2 text "." @@ -1574,7 +1594,7 @@ UnknownText_0x1c5e68: ; 0x1c5e68 ; 0x1c5e7b UnknownText_0x1c5e7b: ; 0x1c5e7b - text $52, " got on the@" + text " got on the@" text_dunno1 text_from_ram StringBuffer2 text "." @@ -1582,7 +1602,7 @@ UnknownText_0x1c5e7b: ; 0x1c5e7b ; 0x1c5e90 UnknownText_0x1c5e90: ; 0x1c5e90 - text $52, " got off@" + text " got off@" text_dunno1 text "the @" text_from_ram StringBuffer2 diff --git a/text/phone/beverly_overworld.asm b/text/phone/beverly_overworld.asm index ec0add3ec..cd4b5b4d3 100644 --- a/text/phone/beverly_overworld.asm +++ b/text/phone/beverly_overworld.asm @@ -44,7 +44,7 @@ BeverlyPhoneFullText: done BeverlyGiftText: - text "Oh? ", $52, "? " + text "Oh? ? " line "I waited here for" para "you. I brought you" diff --git a/text/phone/bill.asm b/text/phone/bill.asm index 6705d35d4..293188909 100644 --- a/text/phone/bill.asm +++ b/text/phone/bill.asm @@ -29,21 +29,24 @@ BillPhoneNiteGreetingText: ; 0x1b44b5 done BillPhoneGeneriText: ; 0x1b44fe - db $0, "Who's calling?", $51 - db $14, ", is it?", $4f - db "Hang on a sec…", $51 - db $56, $4f - db $56, $57 + text "Who's calling?" + + para ", is it?" + line "Hang on a sec…" + + para $56 + line $56 + done BillPhoneNotFullText: ; 0x1b452a text "Thanks for" line "waiting!" - para $14, ", your BOX" + para ", your BOX" line "has room for @" TX_RAM StringBuffer3 - text $55 - db "more #MON." + text "" + cont "more #MON." para "Get out there and" line "fill it up!" @@ -53,7 +56,7 @@ BillPhoneNearlyFullText: ; 0x1b4587 text "Thanks for" line "waiting!" - para $14, ", your BOX" + para ", your BOX" line "has room for only" cont "@" TX_RAM StringBuffer3 @@ -67,7 +70,7 @@ BillPhoneFullText: ; 0x1b45ed text "Thanks for" line "waiting!" - para $14, ", your BOX" + para ", your BOX" line "is full!" para "You'll have to" @@ -78,7 +81,7 @@ BillPhoneFullText: ; 0x1b45ed done BillPhoneNewlyFullText: ; 0x1b4652 - text "Hi, ", $14, "?" + text "Hi, ?" line "It's me, BILL!" para "Thanks for using" diff --git a/text/phone/buena.asm b/text/phone/buena.asm index 1f1020703..d3390a74c 100644 --- a/text/phone/buena.asm +++ b/text/phone/buena.asm @@ -2,7 +2,7 @@ UnknownText_0xa0c28: ; 0xa0c28 text "Hi, this is BUENA…" para "Oh! Good morning," - line $14, "!" + line "!" para "I'm kind of foggy" line "in the morning…" @@ -11,7 +11,7 @@ UnknownText_0xa0c28: ; 0xa0c28 UnknownText_0xa0c72: ; 0xa0c72 text "Hi, this is BUENA…" - line "Oh! Hi, ", $14, "!" + line "Oh! Hi, !" para "Do you tune into" line "BUENA's show?" @@ -38,7 +38,7 @@ UnknownText_0xa0caf: ; 0xa0caf UnknownText_0xa0d42: ; 0xa0d42 text "Hi, this is BUENA…" - line "Oh! Hi, ", $14, "!" + line "Oh! Hi, !" para "I just got off" line "work. " @@ -49,7 +49,7 @@ UnknownText_0xa0d42: ; 0xa0d42 ; 0xa0d96 UnknownText_0xa0d96: ; 0xa0d96 - text $14, "!" + text "!" line "Hi, it's BUENA!" para "I got up early, so" @@ -58,7 +58,7 @@ UnknownText_0xa0d96: ; 0xa0d96 ; 0xa0dcf UnknownText_0xa0dcf: ; 0xa0dcf - text $14, "!" + text "!" line "Hi, it's BUENA!" para "I needed someone" @@ -67,7 +67,7 @@ UnknownText_0xa0dcf: ; 0xa0dcf ; 0xa0e01 UnknownText_0xa0e01: ; 0xa0e01 - text $14, "!" + text "!" line "Hi, it's BUENA!" para "I'm just on my" @@ -76,7 +76,7 @@ UnknownText_0xa0e01: ; 0xa0e01 ; 0xa0e29 UnknownText_0xa0e29: ; 0xa0e29 - text $14, "!" + text "!" line "Hi, it's BUENA!" para "I couldn't sleep," @@ -85,7 +85,7 @@ UnknownText_0xa0e29: ; 0xa0e29 ; 0xa0e5e UnknownText_0xa0e5e: ; 0xa0e5e - text "Oh. Hi, ", $14, "!" + text "Oh. Hi, !" para "You are how?" @@ -98,7 +98,7 @@ UnknownText_0xa0e5e: ; 0xa0e5e para "The RADIO TOWER is" line "in deep trouble!" - para $14, ", you'd" + para ", you'd" line "better be careful!" done ; 0xa0efb @@ -152,7 +152,7 @@ UnknownText_0xa0fcf: ; 0xa0fcf ; 0xa109d UnknownText_0xa109d: ; 0xa109d - text "Tell me, ", $14, "." + text "Tell me, ." line "Have you ever won" para "a prize on the" @@ -245,7 +245,7 @@ UnknownText_0xa1318: ; 0xa1318 ; 0xa13d8 UnknownText_0xa13d8: ; 0xa13d8 - text "Hey, ", $14, "." + text "Hey, ." line "You won that RADIO" para "CARD by beating" @@ -334,7 +334,7 @@ UnknownText_0xa15de: ; 0xa15de ; 0xa1717 UnknownText_0xa1717: ; 0xa1717 - text $14, ", tell me." + text ", tell me." para "When do you relax" line "the most?" @@ -367,7 +367,7 @@ UnknownText_0xa1717: ; 0xa1717 ; 0xa183d UnknownText_0xa183d: ; 0xa183d - text $14, ", what was" + text ", what was" line "the first #MON" cont "you ever caught?" @@ -426,7 +426,7 @@ UnknownText_0xa19b1: ; 0xa19b1 para "I'd much rather go" line "to the beach!" - para $14, ", I hope" + para ", I hope" line "you have enough" para "fun for both of us" @@ -478,7 +478,7 @@ UnknownText_0xa1bed: ; 0xa1bed para "STORE has a sale" line "on when we go…" - para $14, ", maybe we" + para ", maybe we" line "can hook up too!" para "Catch you later!" @@ -509,7 +509,7 @@ UnknownText_0xa1c88: ; 0xa1c88 ; 0xa1d5f UnknownText_0xa1d5f: ; 0xa1d5f - text "Hey, ", $14, ". You" + text "Hey, . You" line "use your #GEAR" para "to listen to the" diff --git a/text/phone/elm.asm b/text/phone/elm.asm index d6823777d..cea36061f 100644 --- a/text/phone/elm.asm +++ b/text/phone/elm.asm @@ -1,5 +1,5 @@ ElmPhoneStartText: ; 0x1b46fc - text "Hello, ", $14, "?" + text "Hello, ?" para "Try not to overdo" line "it." @@ -10,7 +10,7 @@ ElmPhoneStartText: ; 0x1b46fc done ElmPhoneSawMrPokemonText: ; 0x1b4749 - text "Hello, ", $14, "?" + text "Hello, ?" para "Did you meet MR." line "#MON? Great!" @@ -18,7 +18,7 @@ ElmPhoneSawMrPokemonText: ; 0x1b4749 done ElmPhonePokemonStolenText: ; 0x1b4784 - text $14, "? I'm very" + text "? I'm very" line "upset now." para "We had a #MON" @@ -29,7 +29,7 @@ ElmPhonePokemonStolenText: ; 0x1b4784 done ElmPhoneCheckingEggText: ; 0x1b47d5 - text "Hello, ", $14, "?" + text "Hello, ?" para "We're checking the" line "EGG now. It does" @@ -39,7 +39,7 @@ ElmPhoneCheckingEggText: ; 0x1b47d5 done ElmPhoneAssistantText: ; 0x1b481c - text "Hello, ", $14, "?" + text "Hello, ?" para "Did you see my" line "assistant? He's at" @@ -49,7 +49,7 @@ ElmPhoneAssistantText: ; 0x1b481c done ElmPhoneEggUnhatchedText: ; 0x1b4868 - text "Hello, ", $14, "?" + text "Hello, ?" para "How's the EGG? Has" line "anything changed?" @@ -59,7 +59,7 @@ ElmPhoneEggUnhatchedText: ; 0x1b4868 done ElmPhoneEggHatchedText: ; 0x1b48bb - text "Hello, ", $14, "?" + text "Hello, ?" line "How is the EGG?" para "What? It hatched?" @@ -71,7 +71,7 @@ ElmPhoneEggHatchedText: ; 0x1b48bb done ElmPhoneDiscovery1Text: ; 0x1b491f - text "Hello, ", $14, "?" + text "Hello, ?" para "I just made a new" line "discovery." @@ -84,7 +84,7 @@ ElmPhoneDiscovery1Text: ; 0x1b491f done ElmPhoneDiscovery2Text: ; 0x1b4982 - text "Hello, ", $14, "?" + text "Hello, ?" para "It's still a" line "mystery what kinds" @@ -97,7 +97,7 @@ ElmPhoneDiscovery2Text: ; 0x1b4982 done ElmPhonePokerusText: ; 0x1b49e7 - text "Hello, ", $14, "?" + text "Hello, ?" para "I discovered an" line "odd thing." @@ -130,7 +130,7 @@ ElmPhonePokerusText: ; 0x1b49e7 done ElmPhoneDisasterText: ; 0x1b4b17 - text "H-hello? ", $14, "?" + text "H-hello? ?" line "It's a disaster!" para "Uh, um, it's just" @@ -144,7 +144,7 @@ ElmPhoneDisasterText: ; 0x1b4b17 done ElmPhoneEggAssistantText: ; 0x1b4b87 - text "Hello, ", $14, "? We" + text "Hello, ? We" line "discovered some-" para "thing about the" @@ -159,7 +159,7 @@ ElmPhoneEggAssistantText: ; 0x1b4b87 done ElmPhoneRocketText: ; 0x1b4c06 - text $14, ", how are" + text ", how are" line "things going?" para "I called because" @@ -171,7 +171,7 @@ ElmPhoneRocketText: ; 0x1b4c06 para "They were talking" line "about TEAM ROCKET." - para $14, ", do you" + para ", do you" line "know anything" cont "about it?" @@ -186,7 +186,7 @@ ElmPhoneRocketText: ; 0x1b4c06 done ElmPhoneGiftText: ; 0x1b4d09 - text "Hello, ", $14, "?" + text "Hello, ?" para "I have something" line "here for you." @@ -198,7 +198,7 @@ ElmPhoneGiftText: ; 0x1b4d09 done ElmPhoneUnusedText: ; 0x1b4d5d - text "Hello, ", $14, "?" + text "Hello, ?" line "How's it going?" para "I got ahold of" diff --git a/text/phone/extra.asm b/text/phone/extra.asm index 4ec789f49..7953bee78 100644 --- a/text/phone/extra.asm +++ b/text/phone/extra.asm @@ -8,7 +8,7 @@ UnknownText_0x64000: ; 0x64000 ; 0x64032 UnknownText_0x64032: ; 0x64032 - text $14, ", have you" + text ", have you" line "heard?" para "GOLDENROD's RADIO" @@ -23,7 +23,7 @@ UnknownText_0x64032: ; 0x64032 ; 0x64099 UnknownText_0x64099: ; 0x64099 - text $14, ", I heard!" + text ", I heard!" para "You defeated that" line "WHITNEY?" @@ -43,7 +43,7 @@ UnknownText_0x640e6: ; 0x640e6 para "LIGHTHOUSE, didn't" line "you?" - para $14, ", I wish" + para ", I wish" line "you'd come see me" para "when I'm sick in" @@ -100,7 +100,7 @@ UnknownText_0x642bb: ; 0x642bb line "lady who looked a" para "lot like you," - line $14, "." + line "." para "What? That lady" line "was your mom?" @@ -127,7 +127,7 @@ UnknownText_0x643d4: ; 0x643d4 line "I saw!" para "You striding onto" - line "a ship, ", $14, "!" + line "a ship, !" para "I can't get over" line "how good you look" @@ -192,7 +192,7 @@ UnknownText_0x645ff: ; 0x645ff cont "the place." para "It just makes me" - line "sigh, ", $14, "." + line "sigh, ." para "How did you get so" line "strong?" @@ -241,7 +241,7 @@ UnknownText_0x646df: ; 0x646df ; 0x647d8 UnknownText_0x647d8: ; 0x647d8 - text $14, ", I heard!" + text ", I heard!" para "You're kicking up" line "a mighty ruckus" @@ -491,7 +491,7 @@ UnknownText_0x64e2f: ; 0x64e2f para "to @" text_from_ram StringBuffer5 - db $0 + text "" line "and pick it up?" done ; 0x64e90 @@ -561,8 +561,8 @@ UnknownText_0x6501c: ; 0x6501c text "You know what?" line "A wild @" text_from_ram StringBuffer4 - text $51 - db "got away from me" + text "" + para "got away from me" line "again." para "It was so close!" @@ -918,8 +918,8 @@ UnknownText_0x65ab2: ; 0x65ab2 text "Listen to this." line "My @" text_from_ram StringBuffer4 - text $51 - db "grins happily when" + text "" + para "grins happily when" line "I pinch its cheek." para "But it never grins" @@ -1121,7 +1121,7 @@ UnknownText_0x65ff2: ; 0x65ff2 UnknownText_0x66043: ; 0x66043 text "Yup, TULLY here…" - para $14, "? What?" + para "? What?" line "You're lost?" para "Our battle will be" @@ -1401,7 +1401,7 @@ UnknownText_0x66796: ; 0x66796 para "It's awful." line "My CLEFAIRY…" - para "Huh? ", $14, "?" + para "Huh? ?" para "Oh, sorry! I was" line "in a hurry, and I…" @@ -1497,8 +1497,8 @@ UnknownText_0x669ed: ; 0x669ed text "But get this, a" line "wild @" text_from_ram StringBuffer4 - text $51 - db "just barely eluded" + text "" + para "just barely eluded" line "us." para "I wanted to FLY" @@ -1533,7 +1533,7 @@ UnknownText_0x66aa5: ; 0x66aa5 ; 0x66ad1 UnknownText_0x66ad1: ; 0x66ad1 - text "Oh, ", $14, "!" + text "Oh, !" line "Hurry, hurry!" para "@" @@ -1808,7 +1808,7 @@ UnknownText_0x6717a: ; 0x6717a text_from_ram StringBuffer3 text "'s @" text_from_ram StringBuffer4 - db $0 + text "" line "is much stronger" cont "than before!" done @@ -1831,7 +1831,7 @@ UnknownText_0x671eb: ; 0x671eb para "A wild @" text_from_ram StringBuffer4 - db $0 + text "" line "got away from me" para "again. It's just" @@ -1869,7 +1869,7 @@ UnknownText_0x67294: ; 0x67294 ; 0x672d5 UnknownText_0x672d5: ; 0x672d5 - text "Oh, ", $14, "!" + text "Oh, !" line "Come battle ERIN!" para "I'll be waiting on" diff --git a/text/phone/extra3.asm b/text/phone/extra3.asm index bc154f84f..443338465 100644 --- a/text/phone/extra3.asm +++ b/text/phone/extra3.asm @@ -1,5 +1,5 @@ UnknownText_0x174000: ; 0x174000 - text "Hi, ", $14, "!" + text "Hi, !" line "Our BICYCLE sales" para "have gone through" @@ -216,7 +216,7 @@ UnknownText_0x1745c2: ; 0x1745c2 ; 0x174638 UnknownText_0x174638: ; 0x174638 - text "Hey, ", $14, "!" + text "Hey, !" para "Do you remember" line "your promise?" @@ -316,7 +316,7 @@ UnknownText_0x174895: ; 0x174895 para "in @" text_from_ram StringBuffer5 - db $0 + text "" line "when you can." done ; 0x1748ea @@ -372,7 +372,7 @@ UnknownText_0x1749c7: ; 0x1749c7 UnknownText_0x174a24: ; 0x174a24 text "My @" text_from_ram StringBuffer4 - db $0 + text "" line "might be greater" cont "than I imagined." @@ -452,7 +452,7 @@ UnknownText_0x174c29: ; 0x174c29 ; 0x174c49 UnknownText_0x174c49: ; 0x174c49 - text $14, ", why" + text ", why" line "aren't you here?" para "I'll take you down" @@ -485,8 +485,8 @@ UnknownText_0x174cf6: ; 0x174cf6 text "Oh, have you ever" line "seen a @" text_from_ram StringBuffer4 - text $55 - db "before?" + text "" + cont "before?" para "I just battled" line "one…" @@ -553,7 +553,7 @@ UnknownText_0x174ec5: ; 0x174ec5 ; 0x174ee2 UnknownText_0x174ee2: ; 0x174ee2 - text "Um… ", $14, "?" + text "Um… ?" line "What's wrong?" para "Did you forget our" @@ -671,7 +671,7 @@ UnknownText_0x17519b: ; 0x17519b ; 0x17520a UnknownText_0x17520a: ; 0x17520a - text $14, ", could you" + text ", could you" line "hurry over?" para "FARFETCH'D is" @@ -823,8 +823,8 @@ UnknownText_0x175591: ; 0x175591 text "Oh yeah, I took" line "down a @" text_from_ram StringBuffer4 - text $51 - db "in the wild the" + text "" + para "in the wild the" line "other day." para "It was a cakewalk." @@ -891,7 +891,7 @@ UnknownText_0x17571d: ; 0x17571d UnknownText_0x175786: ; 0x175786 text "What's keeping" - line "you, ", $52, "!" + line "you, !" para "Let's get down and" line "battle already!" @@ -927,8 +927,8 @@ UnknownText_0x175869: ; 0x175869 text "Oh yeah, we KO'd a" line "wild @" text_from_ram StringBuffer4 - text $51 - db "with one hit a" + text "" + para "with one hit a" line "while back." para "It went down so" @@ -989,7 +989,7 @@ UnknownText_0x1759f7: ; 0x1759f7 line "today." para "Are you going," - line $14, "?" + line "?" para "I'm trying to make" line "up my mind." @@ -1146,7 +1146,7 @@ UnknownText_0x175dd9: ; 0x175dd9 para "Heh, they're some" line "kind of feisty!" - para $14, ", you have" + para ", you have" line "to see this rare" para "sight! Get ready" @@ -1549,7 +1549,7 @@ UnknownText_0x176aef: ; 0x176aef para "wild @" text_from_ram StringBuffer4 - db $0 + text "" line "quite often." para "They're easily" @@ -1599,27 +1599,27 @@ UnknownText_0x176c47: ; 0x176c47 ; 0x176c61 UnknownText_0x176c61: ; 0x176c61 - text $52, "! It's" + text "! It's" line "mind-blowing!" para "I took a hike in" line "@" text_from_ram StringBuffer5 - text $55 - db "yesterday, see?" + text "" + cont "yesterday, see?" para "Well, there were" line "tons of @" text_from_ram StringBuffer4 - text $51 - db "around! You have" + text "" + para "around! You have" line "to see it!" para "I get this feeling" line "that @" text_from_ram StringBuffer4 - text $51 - db "may be timid." + text "" + para "may be timid." line "I didn't see any" para "where there are" @@ -1899,7 +1899,7 @@ UnknownText_0x177465: ; 0x177465 ; 0x1774c1 UnknownText_0x1774c1: ; 0x1774c1 - text "Oh, ", $14, "!" + text "Oh, !" line "How soon can I" para "expect to see you" diff --git a/text/phone/huey_overworld.asm b/text/phone/huey_overworld.asm index e063c4e2b..4629f8022 100644 --- a/text/phone/huey_overworld.asm +++ b/text/phone/huey_overworld.asm @@ -57,7 +57,7 @@ HueyRematchGiftText: para "I've battled you" line "over and over, but" - para $52, ", I haven't" + para ", I haven't" line "won once." para "I bought tons of" @@ -73,7 +73,7 @@ HueyRematchGiftText: line "it is…" para "Here, take this," - line $52, "." + line "." para "I won't be needing" line "it anymore…" diff --git a/text/phone/jose_overworld.asm b/text/phone/jose_overworld.asm index a2a163e8e..05e50172c 100644 --- a/text/phone/jose_overworld.asm +++ b/text/phone/jose_overworld.asm @@ -1,7 +1,7 @@ JoseAskNumber1Text: text "If my @" text_from_ram StringBuffer4 - db $0 + text "" line "sees anything" para "pretty, it goes" diff --git a/text/phone/kenji_overworld.asm b/text/phone/kenji_overworld.asm index 32bc968ba..a3206b946 100644 --- a/text/phone/kenji_overworld.asm +++ b/text/phone/kenji_overworld.asm @@ -43,7 +43,7 @@ KenjiPhoneFullText: KenjiGiftText: text "I wish to thank" - line "you, ", $52, "!" + line "you, !" para "I've been training" line "all alone…" diff --git a/text/phone/mom.asm b/text/phone/mom.asm index 2ed4bee15..f94ef388a 100644 --- a/text/phone/mom.asm +++ b/text/phone/mom.asm @@ -1,7 +1,7 @@ MomPhoneGreetingText: ; 0x1b4000 text "Hello?" - para "Oh, hi, ", $52, "!" + para "Oh, hi, !" line "Working hard?" done @@ -14,8 +14,8 @@ UnknownText_0x1b4021: ; 0x1b4021 para "Isn't that where" line "@" TX_RAM StringBuffer4 - text $51 - db "is? Did you go" + text "" + para "is? Did you go" line "take a look?" done @@ -27,7 +27,7 @@ MomPhoneGenericAreaText: ; 0x1b406b para "I've never gone" line "there. That's kind" - cont "of neat, ", $52, "." + cont "of neat, ." done MomPhoneNewBarkText: ; 0x1b40b1 @@ -64,7 +64,7 @@ UnknownText_0x1b4150: ; 0x1b4150 text "That sounds really" line "tough." - para "But, ", $52, ", I" + para "But, , I" line "know you're really" para "determined. You'll" @@ -87,7 +87,7 @@ UnknownText_0x1b41ea: ; 0x1b41ea done UnknownText_0x1b420d: ; 0x1b420d - text "Oh, ", $52, "," + text "Oh, ," line "you're not saving" para "any money. Would" @@ -115,7 +115,7 @@ MomPhoneWontSaveMoneyText: ; 0x1b42a3 done MomPhoneHangUpText: ; 0x1b42c0 - text $52, ", keep it" + text ", keep it" line "up! I'm rooting" cont "for you, baby!" done @@ -123,7 +123,7 @@ MomPhoneHangUpText: ; 0x1b42c0 MomPhoneNoPokemonText: ; 0x1b42ea text "Hello?" - para "Oh, hi, ", $52, "!" + para "Oh, hi, !" line "Wasn't PROF.ELM" cont "waiting for you?" done @@ -131,7 +131,7 @@ MomPhoneNoPokemonText: ; 0x1b42ea MomPhoneNoPokedexText: ; 0x1b431d text "Hello?" - para "Oh, hi, ", $52, "!" + para "Oh, hi, !" line "You're on a big" para "mission for PROF." @@ -141,7 +141,7 @@ MomPhoneNoPokedexText: ; 0x1b431d MomPhoneNoGymQuestText: ; 0x1b435f text "Hello?" - para "Hi, ", $52, "! If" + para "Hi, ! If" line "you're done with" para "your errand come" @@ -151,7 +151,7 @@ MomPhoneNoGymQuestText: ; 0x1b435f MomPhoneLectureText: ; 0x1b43a1 text "Hello?" - para "…… ", $52, "?" + para "…… ?" line "I heard from PROF." para "ELM that you went" diff --git a/text/phone/trainers1.asm b/text/phone/trainers1.asm index c40d5c97f..09747c44d 100644 --- a/text/phone/trainers1.asm +++ b/text/phone/trainers1.asm @@ -5,7 +5,7 @@ UnknownText_0x1b4dc5: ; 0x1b4dc5 text "…" para "Good morning," - line $14, "!" + line "!" done UnknownText_0x1b4ded: ; 0x1b4ded @@ -15,7 +15,7 @@ UnknownText_0x1b4ded: ; 0x1b4ded text "…" para "How's it going," - line $14, "?" + line "?" done UnknownText_0x1b4e16: ; 0x1b4e16 @@ -25,11 +25,11 @@ UnknownText_0x1b4e16: ; 0x1b4e16 text "…" para "Good evening," - line $14, "!" + line "!" done UnknownText_0x1b4e3e: ; 0x1b4e3e - text $14, ", good" + text ", good" line "morning!" para "It's me, @" @@ -39,7 +39,7 @@ UnknownText_0x1b4e3e: ; 0x1b4e3e done UnknownText_0x1b4e72: ; 0x1b4e72 - text $14, ", howdy!" + text ", howdy!" para "It's me, @" TX_RAM StringBuffer3 @@ -48,7 +48,7 @@ UnknownText_0x1b4e72: ; 0x1b4e72 done UnknownText_0x1b4e9e: ; 0x1b4e9e - text $14, ", good" + text ", good" line "evening!" para "It's me, @" @@ -77,7 +77,7 @@ UnknownText_0x1b4f21: ; 0x1b4f21 text "." para "Oh! Good morning," - line $52, "." + line "." done UnknownText_0x1b4f4d: ; 0x1b4f4d @@ -87,7 +87,7 @@ UnknownText_0x1b4f4d: ; 0x1b4f4d text "." para "Oh! Good day," - line $52, "." + line "." done UnknownText_0x1b4f75: ; 0x1b4f75 @@ -97,11 +97,11 @@ UnknownText_0x1b4f75: ; 0x1b4f75 text "." para "Oh! Good evening," - line $52, "." + line "." done UnknownText_0x1b4fa1: ; 0x1b4fa1 - text "Hello, ", $52, "." + text "Hello, ." line "Good morning." para "This is @" @@ -111,7 +111,7 @@ UnknownText_0x1b4fa1: ; 0x1b4fa1 done UnknownText_0x1b4fda: ; 0x1b4fda - text "Hi, ", $52, "." + text "Hi, ." line "This is @" TX_RAM StringBuffer3 text "." @@ -120,7 +120,7 @@ UnknownText_0x1b4fda: ; 0x1b4fda done UnknownText_0x1b5004: ; 0x1b5004 - text "Hi, ", $52, "." + text "Hi, ." line "This is @" TX_RAM StringBuffer3 text "." @@ -146,7 +146,7 @@ UnknownText_0x1b5073: ; 0x1b5073 text "." para "Huh? What's up," - line $52, "?" + line "?" done UnknownText_0x1b509b: ; 0x1b509b @@ -156,7 +156,7 @@ UnknownText_0x1b509b: ; 0x1b509b text "." para "Huh? What's up" - line $52, "?" + line "?" done UnknownText_0x1b50c2: ; 0x1b50c2 @@ -166,11 +166,11 @@ UnknownText_0x1b50c2: ; 0x1b50c2 text "." para "Huh? What's up" - line $52, "?" + line "?" done UnknownText_0x1b50e9: ; 0x1b50e9 - text "Yo, ", $52, "!" + text "Yo, !" line "You awake?" para "It's me, @" @@ -180,7 +180,7 @@ UnknownText_0x1b50e9: ; 0x1b50e9 done UnknownText_0x1b511a: ; 0x1b511a - text "Yo, ", $52, "! You" + text "Yo, ! You" line "free right now?" para "It's me, @" @@ -190,7 +190,7 @@ UnknownText_0x1b511a: ; 0x1b511a done UnknownText_0x1b5154: ; 0x1b5154 - text "Yo, ", $52, "!" + text "Yo, !" line "Were you asleep?" para "It's me, @" @@ -236,7 +236,7 @@ UnknownText_0x1b5270: ; 0x1b5270 TX_RAM StringBuffer3 text " speaking…" - para "Hi, ", $14, "!" + para "Hi, !" line "Good morning!" done @@ -246,7 +246,7 @@ UnknownText_0x1b52a5: ; 0x1b52a5 TX_RAM StringBuffer3 text " speaking…" - para "Hi, ", $14, "!" + para "Hi, !" done UnknownText_0x1b52cc: ; 0x1b52cc @@ -255,12 +255,12 @@ UnknownText_0x1b52cc: ; 0x1b52cc TX_RAM StringBuffer3 text " speaking…" - para "Hi, ", $14, "!" + para "Hi, !" line "Good evening!" done UnknownText_0x1b5301: ; 0x1b5301 - text $14, ", good" + text ", good" line "morning!" para "It's me, @" @@ -270,7 +270,7 @@ UnknownText_0x1b5301: ; 0x1b5301 done UnknownText_0x1b5335: ; 0x1b5335 - text "Hi, ", $14, "!" + text "Hi, !" para "It's me, @" TX_RAM StringBuffer3 @@ -279,7 +279,7 @@ UnknownText_0x1b5335: ; 0x1b5335 done UnknownText_0x1b535f: ; 0x1b535f - text $14, ", good" + text ", good" line "evening!" para "It's me, @" @@ -304,13 +304,14 @@ UnknownText_0x1b5393: ; 0x1b5393 done UnknownText_0x1b53f7: ; 0x1b53f7 - db $0, "Hello, this is", $4f - db "@" + text "Hello, this is" + line "@" TX_RAM StringBuffer3 - db $0, ".", $51 - db "Oh, ", $14, ".", $4f - db "Good morning.", $51 - db $57 + text "." + para "Oh, ." + line "Good morning." + para "" + done UnknownText_0x1b5424: ; 0x1b5424 text "Hello, this is" @@ -318,7 +319,7 @@ UnknownText_0x1b5424: ; 0x1b5424 TX_RAM StringBuffer3 text "." - para "Oh. Hi, ", $14, "." + para "Oh. Hi, ." done UnknownText_0x1b5446: ; 0x1b5446 @@ -327,13 +328,13 @@ UnknownText_0x1b5446: ; 0x1b5446 TX_RAM StringBuffer3 text "." - para "Oh, ", $14, "." + para "Oh, ." line "Good evening." done UnknownText_0x1b5472: ; 0x1b5472 text "Good morning," - line $14, "!" + line "!" para "This is @" TX_RAM StringBuffer3 @@ -342,7 +343,7 @@ UnknownText_0x1b5472: ; 0x1b5472 done UnknownText_0x1b54a6: ; 0x1b54a6 - text $14, ", hi!" + text ", hi!" line "This is @" TX_RAM StringBuffer3 text "." @@ -352,7 +353,7 @@ UnknownText_0x1b54a6: ; 0x1b54a6 done UnknownText_0x1b54d4: ; 0x1b54d4 - text "Hi, ", $14, "." + text "Hi, ." line "Good evening." para "This is @" @@ -386,7 +387,7 @@ UnknownText_0x1b55ae: ; 0x1b55ae TX_RAM StringBuffer3 text "…" - para "Oh, ", $14, "?" + para "Oh, ?" line "Good morning!" done @@ -396,7 +397,7 @@ UnknownText_0x1b55da: ; 0x1b55da TX_RAM StringBuffer3 text "…" - para "Oh, ", $14, "? Hi!" + para "Oh, ? Hi!" done UnknownText_0x1b55fc: ; 0x1b55fc @@ -405,12 +406,12 @@ UnknownText_0x1b55fc: ; 0x1b55fc TX_RAM StringBuffer3 text "…" - para "Oh, ", $14, "?" + para "Oh, ?" line "Good evening!" done UnknownText_0x1b5628: ; 0x1b5628 - text "Oh, ", $14, "?" + text "Oh, ?" para "Tweet! Yeah, it's" line "me, @" @@ -419,7 +420,7 @@ UnknownText_0x1b5628: ; 0x1b5628 done UnknownText_0x1b564c: ; 0x1b564c - text "Oh, ", $14, "?" + text "Oh, ?" para "Tweet! Yeah, it's" line "me, @" @@ -428,7 +429,7 @@ UnknownText_0x1b564c: ; 0x1b564c done UnknownText_0x1b5670: ; 0x1b5670 - text "Oh, ", $14, "?" + text "Oh, ?" para "Tweet! Yeah, it's" line "me, @" @@ -456,7 +457,7 @@ UnknownText_0x1b5702: ; 0x1b5702 TX_RAM StringBuffer3 text "…" - para "Oh. Hi, ", $52, "." + para "Oh. Hi, ." line "What's up?" done @@ -466,7 +467,7 @@ UnknownText_0x1b572e: ; 0x1b572e TX_RAM StringBuffer3 text "…" - para "Oh, hi, ", $52, "," + para "Oh, hi, ," line "what's up?" done @@ -476,7 +477,7 @@ UnknownText_0x1b575a: ; 0x1b575a TX_RAM StringBuffer3 text "…" - para "Oh, hi, ", $52, "," + para "Oh, hi, ," line "what's up?" done @@ -528,7 +529,7 @@ UnknownText_0x1b589a: ; 0x1b589a TX_RAM StringBuffer3 text " here!" - para "Oh, ", $52, "? You" + para "Oh, ? You" line "doing well?" done @@ -537,7 +538,7 @@ UnknownText_0x1b58c2: ; 0x1b58c2 TX_RAM StringBuffer3 text " here!" - para "Oh, ", $52, "? You" + para "Oh, ? You" line "doing well?" done @@ -546,12 +547,12 @@ UnknownText_0x1b58ea: ; 0x1b58ea TX_RAM StringBuffer3 text " here!" - para "Oh, ", $52, "? You" + para "Oh, ? You" line "doing well?" done UnknownText_0x1b5912: ; 0x1b5912 - text "Yo, ", $52, "!" + text "Yo, !" line "How're you doing?" para "This is @" @@ -561,7 +562,7 @@ UnknownText_0x1b5912: ; 0x1b5912 done UnknownText_0x1b5948: ; 0x1b5948 - text "Yo, ", $52, "! How's" + text "Yo, ! How's" line "it going?" para "This is @" @@ -571,7 +572,7 @@ UnknownText_0x1b5948: ; 0x1b5948 done UnknownText_0x1b597c: ; 0x1b597c - text "Yo, ", $52, "!" + text "Yo, !" line "How're you doing?" para "This is @" @@ -603,7 +604,7 @@ UnknownText_0x1b5a3b: ; 0x1b5a3b TX_RAM StringBuffer3 text " speaking." - para "Oh. Hi, ", $14, "!" + para "Oh. Hi, !" line "Good morning!" done @@ -613,7 +614,7 @@ UnknownText_0x1b5a74: ; 0x1b5a74 TX_RAM StringBuffer3 text " speaking." - para "Oh, hi, ", $14, "!" + para "Oh, hi, !" done UnknownText_0x1b5a9f: ; 0x1b5a9f @@ -622,12 +623,12 @@ UnknownText_0x1b5a9f: ; 0x1b5a9f TX_RAM StringBuffer3 text " speaking." - para "Oh, hi, ", $14, "!" + para "Oh, hi, !" line "Good evening!" done UnknownText_0x1b5ad8: ; 0x1b5ad8 - text $14, ", good" + text ", good" line "morning!" para "It's me, @" @@ -637,7 +638,7 @@ UnknownText_0x1b5ad8: ; 0x1b5ad8 done UnknownText_0x1b5b0b: ; 0x1b5b0b - text $14, ", howdy!" + text ", howdy!" para "It's me, @" TX_RAM StringBuffer3 @@ -647,7 +648,7 @@ UnknownText_0x1b5b0b: ; 0x1b5b0b UnknownText_0x1b5b37: ; 0x1b5b37 text "Good evening," - line $14, "!" + line "!" para "It's me, @" TX_RAM StringBuffer3 @@ -676,7 +677,7 @@ UnknownText_0x1b5b68: ; 0x1b5b68 done UnknownText_0x1b5c10: ; 0x1b5c10 - text "Yes? Ah, ", $14, "." + text "Yes? Ah, ." para "You're courteous" line "enough to state" @@ -686,7 +687,7 @@ UnknownText_0x1b5c10: ; 0x1b5c10 done UnknownText_0x1b5c63: ; 0x1b5c63 - text "Yes? Ah, ", $14, "." + text "Yes? Ah, ." para "You're courteous" line "enough to state" @@ -696,7 +697,7 @@ UnknownText_0x1b5c63: ; 0x1b5c63 done UnknownText_0x1b5cb6: ; 0x1b5cb6 - text "Yes? Ah, ", $14, "." + text "Yes? Ah, ." para "You're courteous" line "enough to state" @@ -738,36 +739,36 @@ UnknownText_0x1b5d51: ; 0x1b5d51 UnknownText_0x1b5d9f: ; 0x1b5d9f text "Hello, @" TX_RAM StringBuffer3 - db $0 + text "" line "speaking." - para "Oh, ", $14, "." + para "Oh, ." line "Good morning." done UnknownText_0x1b5dcc: ; 0x1b5dcc text "Hello, @" TX_RAM StringBuffer3 - db $0 + text "" line "speaking." - para "Oh, ", $14, "." + para "Oh, ." line "How are you?" done UnknownText_0x1b5df8: ; 0x1b5df8 text "Hello, @" TX_RAM StringBuffer3 - db $0 + text "" line "speaking." - para "Oh, ", $14, "." + para "Oh, ." line "Good evening." done UnknownText_0x1b5e25: ; 0x1b5e25 text "Good morning," - line $14, "." + line "." para "This is @" TX_RAM StringBuffer3 @@ -776,7 +777,7 @@ UnknownText_0x1b5e25: ; 0x1b5e25 done UnknownText_0x1b5e59: ; 0x1b5e59 - text "Hi, ", $14, "." + text "Hi, ." line "This is @" TX_RAM StringBuffer3 text "." @@ -787,7 +788,7 @@ UnknownText_0x1b5e59: ; 0x1b5e59 UnknownText_0x1b5e8e: ; 0x1b5e8e text "Good evening," - line $14, "." + line "." para "This is @" TX_RAM StringBuffer3 @@ -823,7 +824,7 @@ UnknownText_0x1b5f7a: ; 0x1b5f7a text " the" line "HIKER here." - para "Ah, ", $52, "!" + para "Ah, !" done UnknownText_0x1b5f9e: ; 0x1b5f9e @@ -832,7 +833,7 @@ UnknownText_0x1b5f9e: ; 0x1b5f9e text " the" line "HIKER here." - para "Ah, ", $52, "," + para "Ah, ," line "right?" done @@ -842,36 +843,36 @@ UnknownText_0x1b5fc9: ; 0x1b5fc9 text " the" line "HIKER here." - para "Ah, ", $52, ", isn't" + para "Ah, , isn't" line "it?" done UnknownText_0x1b5ff6: ; 0x1b5ff6 - text "Yo, ", $52, "?" + text "Yo, ?" para "This is @" TX_RAM StringBuffer3 - db $0 + text "" line "the HIKER!" done UnknownText_0x1b6017: ; 0x1b6017 text "Hey, is this" - line $52, "?" + line "?" para "This is @" TX_RAM StringBuffer3 - db $0 + text "" line "the HIKER!" done UnknownText_0x1b6041: ; 0x1b6041 - text $52, ", you still" + text ", you still" line "awake?" para "This is @" TX_RAM StringBuffer3 - db $0 + text "" line "the HIKER!" done @@ -897,7 +898,7 @@ UnknownText_0x1b60f5: ; 0x1b60f5 TX_RAM StringBuffer3 text " speaking." - para "Hey, ", $14, "!" + para "Hey, !" done UnknownText_0x1b611b: ; 0x1b611b @@ -907,7 +908,7 @@ UnknownText_0x1b611b: ; 0x1b611b text " speaking." para "This must be" - line $14, "." + line "." done UnknownText_0x1b6149: ; 0x1b6149 @@ -916,7 +917,7 @@ UnknownText_0x1b6149: ; 0x1b6149 TX_RAM StringBuffer3 text " speaking." - para "Ah, ", $14, "!" + para "Ah, !" done UnknownText_0x1b616e: ; 0x1b616e @@ -925,7 +926,7 @@ UnknownText_0x1b616e: ; 0x1b616e TX_RAM StringBuffer3 text "." - para $14, ", right?" + para ", right?" done UnknownText_0x1b618f: ; 0x1b618f @@ -934,7 +935,7 @@ UnknownText_0x1b618f: ; 0x1b618f TX_RAM StringBuffer3 text "." - para $14, ", what are" + para ", what are" line "you doing?" done @@ -944,7 +945,7 @@ UnknownText_0x1b61bd: ; 0x1b61bd TX_RAM StringBuffer3 text "." - para $14, ", sorry to" + para ", sorry to" line "call you so late." done @@ -968,7 +969,7 @@ UnknownText_0x1b626a: ; 0x1b626a TX_RAM StringBuffer3 text "…" - para "Oh, ", $14, "!" + para "Oh, !" line "Good morning!" done @@ -978,7 +979,7 @@ UnknownText_0x1b6296: ; 0x1b6296 TX_RAM StringBuffer3 text "…" - para "Oh, ", $14, "!" + para "Oh, !" line "Hi, how are you?" done @@ -988,12 +989,12 @@ UnknownText_0x1b62c5: ; 0x1b62c5 TX_RAM StringBuffer3 text "…" - para "Oh, ", $14, "!" + para "Oh, !" line "Good evening!" done UnknownText_0x1b62f1: ; 0x1b62f1 - text $14, "?" + text "?" para "It's @" TX_RAM StringBuffer3 @@ -1002,7 +1003,7 @@ UnknownText_0x1b62f1: ; 0x1b62f1 done UnknownText_0x1b630e: ; 0x1b630e - text $14, "?" + text "?" para "It's @" TX_RAM StringBuffer3 @@ -1011,7 +1012,7 @@ UnknownText_0x1b630e: ; 0x1b630e done UnknownText_0x1b6331: ; 0x1b6331 - text $14, "?" + text "?" para "It's @" TX_RAM StringBuffer3 @@ -1032,33 +1033,33 @@ UnknownText_0x1b6352: ; 0x1b6352 UnknownText_0x1b638c: ; 0x1b638c text "Hello? @" TX_RAM StringBuffer3 - db $0 + text "" line "here…" - para "Hey, ", $14, "!" + para "Hey, !" done UnknownText_0x1b63a8: ; 0x1b63a8 text "Hello? @" TX_RAM StringBuffer3 - db $0 + text "" line "here…" - para "Wow, ", $14, "!" + para "Wow, !" done UnknownText_0x1b63c4: ; 0x1b63c4 text "Hello? @" TX_RAM StringBuffer3 - db $0 + text "" line "here…" - para "Yippee, ", $14, "!" + para "Yippee, !" done UnknownText_0x1b63e3: ; 0x1b63e3 text "Uh, hello." - line $14, "?" + line "?" para "It's your pal," line "@" @@ -1068,7 +1069,7 @@ UnknownText_0x1b63e3: ; 0x1b63e3 UnknownText_0x1b6407: ; 0x1b6407 text "Uh, hello," - line $14, "?" + line "?" para "It's your buddy" line "@" @@ -1078,7 +1079,7 @@ UnknownText_0x1b6407: ; 0x1b6407 UnknownText_0x1b642c: ; 0x1b642c text "Uh, hello," - line $14, "?" + line "?" para "It's your sidekick" line "@" @@ -1092,7 +1093,7 @@ UnknownText_0x1b6454: ; 0x1b6454 TX_RAM StringBuffer3 text "." - para "…Huh, ", $14, "? Yo!" + para "…Huh, ? Yo!" done UnknownText_0x1b647e: ; 0x1b647e @@ -1101,7 +1102,7 @@ UnknownText_0x1b647e: ; 0x1b647e TX_RAM StringBuffer3 text "." - para "…Huh, ", $14, "? Yo!" + para "…Huh, ? Yo!" done UnknownText_0x1b64a8: ; 0x1b64a8 @@ -1110,7 +1111,7 @@ UnknownText_0x1b64a8: ; 0x1b64a8 TX_RAM StringBuffer3 text "." - para "…Huh, ", $14, "? Yo!" + para "…Huh, ? Yo!" done UnknownText_0x1b64d2: ; 0x1b64d2 @@ -1120,7 +1121,7 @@ UnknownText_0x1b64d2: ; 0x1b64d2 text " calling." para "What are you up" - line "to, ", $14, "?" + line "to, ?" done UnknownText_0x1b6506: ; 0x1b6506 @@ -1130,7 +1131,7 @@ UnknownText_0x1b6506: ; 0x1b6506 text " calling." para "Where are you now," - line $14, "?" + line "?" done UnknownText_0x1b6539: ; 0x1b6539 @@ -1140,7 +1141,7 @@ UnknownText_0x1b6539: ; 0x1b6539 text " calling." para "Are you awake now," - line $14, "?" + line "?" done UnknownText_0x1b656c: ; 0x1b656c @@ -1154,7 +1155,7 @@ UnknownText_0x1b659d: ; 0x1b659d TX_RAM StringBuffer3 text "!" - para "Is this ", $14, "?" + para "Is this ?" line "Good morning!" done @@ -1163,7 +1164,7 @@ UnknownText_0x1b65c7: ; 0x1b65c7 TX_RAM StringBuffer3 text "!" - para "Is that ", $14, "?" + para "Is that ?" done UnknownText_0x1b65e3: ; 0x1b65e3 @@ -1171,7 +1172,7 @@ UnknownText_0x1b65e3: ; 0x1b65e3 TX_RAM StringBuffer3 text "!" - para "Is that ", $14, "?" + para "Is that ?" line "Good evening!" done @@ -1197,7 +1198,7 @@ UnknownText_0x1b663b: ; 0x1b663b done UnknownText_0x1b6652: ; 0x1b6652 - text $14, ", are you" + text ", are you" line "raising your" cont "#MON properly?" @@ -1215,7 +1216,7 @@ UnknownText_0x1b66c8: ; 0x1b66c8 text " on the" line "line." - para "Hey! It's ", $14, "!" + para "Hey! It's !" done UnknownText_0x1b66ec: ; 0x1b66ec @@ -1225,7 +1226,7 @@ UnknownText_0x1b66ec: ; 0x1b66ec line "line." para "I know!" - line "It's ", $14, "!" + line "It's !" done UnknownText_0x1b6713: ; 0x1b6713 @@ -1234,12 +1235,12 @@ UnknownText_0x1b6713: ; 0x1b6713 text " on the" line "line." - para $14, "?" + para "?" line "What's up?" done UnknownText_0x1b6738: ; 0x1b6738 - text "Uh, ", $14, "?" + text "Uh, ?" para "It's me!" line "It's me, @" @@ -1248,7 +1249,7 @@ UnknownText_0x1b6738: ; 0x1b6738 done UnknownText_0x1b6757: ; 0x1b6757 - text "Uh, ", $14, "?" + text "Uh, ?" para "It's me!" line "It's me, @" @@ -1257,7 +1258,7 @@ UnknownText_0x1b6757: ; 0x1b6757 done UnknownText_0x1b6776: ; 0x1b6776 - text "Uh, ", $14, "?" + text "Uh, ?" para "It's me!" line "It's me, @" @@ -1284,7 +1285,7 @@ UnknownText_0x1b67e2: ; 0x1b67e2 TX_RAM StringBuffer3 text "…" - para "Hi, ", $14, "!" + para "Hi, !" line "Good morning!" done @@ -1294,7 +1295,7 @@ UnknownText_0x1b680e: ; 0x1b680e TX_RAM StringBuffer3 text "…" - para "Hi, ", $14, ", good" + para "Hi, , good" line "day!" done @@ -1304,12 +1305,12 @@ UnknownText_0x1b6836: ; 0x1b6836 TX_RAM StringBuffer3 text "…" - para "Hi, ", $14, ", good" + para "Hi, , good" line "evening!" done UnknownText_0x1b6862: ; 0x1b6862 - text "Hi, ", $14, ", good" + text "Hi, , good" line "morning!" para "It's @" @@ -1319,7 +1320,7 @@ UnknownText_0x1b6862: ; 0x1b6862 done UnknownText_0x1b6890: ; 0x1b6890 - text "Hi, ", $14, ", good" + text "Hi, , good" line "day!" para "It's @" @@ -1329,7 +1330,7 @@ UnknownText_0x1b6890: ; 0x1b6890 done UnknownText_0x1b68ba: ; 0x1b68ba - text "Hi, ", $14, ", good" + text "Hi, , good" line "evening!" para "It's @" @@ -1358,28 +1359,28 @@ UnknownText_0x1b68e8: ; 0x1b68e8 done UnknownText_0x1b69a8: ; 0x1b69a8 - text "Hi, ", $14, "?" + text "Hi, ?" para "Good morning pika." line "What's up pika?" done UnknownText_0x1b69d2: ; 0x1b69d2 - text "Hi, ", $14, "?" + text "Hi, ?" para "Good day pika," line "what's up pika?" done UnknownText_0x1b69f8: ; 0x1b69f8 - text "Hi, ", $14, "?" + text "Hi, ?" para "Good evening pika," line "what's up pika?" done UnknownText_0x1b6a22: ; 0x1b6a22 - text $14, " pika, good" + text " pika, good" line "morning!" para "It's @" @@ -1389,7 +1390,7 @@ UnknownText_0x1b6a22: ; 0x1b6a22 done UnknownText_0x1b6a56: ; 0x1b6a56 - text $14, " pika, good" + text " pika, good" line "pika day!" para "It's @" @@ -1399,7 +1400,7 @@ UnknownText_0x1b6a56: ; 0x1b6a56 done UnknownText_0x1b6a8b: ; 0x1b6a8b - text $14, " pika, good" + text " pika, good" line "evening!" para "It's @" @@ -1429,7 +1430,7 @@ UnknownText_0x1b6b39: ; 0x1b6b39 text "…" para "Oh, Good morning," - line $14, "." + line "." done UnknownText_0x1b6b65: ; 0x1b6b65 @@ -1439,7 +1440,7 @@ UnknownText_0x1b6b65: ; 0x1b6b65 text "…" para "That voice…" - line $14, ", right?" + line ", right?" done UnknownText_0x1b6b92: ; 0x1b6b92 @@ -1449,7 +1450,7 @@ UnknownText_0x1b6b92: ; 0x1b6b92 text "…" para "This must be" - line $14, "!" + line "!" done UnknownText_0x1b6bb9: ; 0x1b6bb9 @@ -1495,7 +1496,7 @@ UnknownText_0x1b6c96: ; 0x1b6c96 TX_RAM StringBuffer3 text " here…" - para "Ah, ", $52, ". What" + para "Ah, . What" line "can I do for you?" done @@ -1504,7 +1505,7 @@ UnknownText_0x1b6cc6: ; 0x1b6cc6 TX_RAM StringBuffer3 text " here…" - para "Ah, ", $52, ". What" + para "Ah, . What" line "can I do for you?" done @@ -1513,12 +1514,12 @@ UnknownText_0x1b6cf6: ; 0x1b6cf6 TX_RAM StringBuffer3 text " here…" - para "Ah, ", $52, ". What" + para "Ah, . What" line "can I do for you?" done UnknownText_0x1b6d26: ; 0x1b6d26 - text "Hiya, ", $52, ". How" + text "Hiya, . How" line "are you doing?" para "Hey! It's me," @@ -1528,7 +1529,7 @@ UnknownText_0x1b6d26: ; 0x1b6d26 done UnknownText_0x1b6d57: ; 0x1b6d57 - text "Hiya, ", $52, ", how" + text "Hiya, , how" line "are you doing?" para "Hey, it's me," @@ -1538,7 +1539,7 @@ UnknownText_0x1b6d57: ; 0x1b6d57 done UnknownText_0x1b6d88: ; 0x1b6d88 - text "Hiya, ", $52, ", how" + text "Hiya, , how" line "are you doing?" para "Hey, it's me," @@ -1562,7 +1563,7 @@ UnknownText_0x1b6db9: ; 0x1b6db9 para "Heh, my @" TX_RAM StringBuffer4 - db $0 + text "" line "is so tough, it" para "doesn't need to go" @@ -1576,7 +1577,7 @@ UnknownText_0x1b6e7c: ; 0x1b6e7c TX_RAM StringBuffer3 text "." - para "Oh, ", $14, "." + para "Oh, ." line "Good morning." done @@ -1586,7 +1587,7 @@ UnknownText_0x1b6ea6: ; 0x1b6ea6 TX_RAM StringBuffer3 text "." - para "Oh, ", $14, "." + para "Oh, ." line "Hello." done @@ -1596,12 +1597,12 @@ UnknownText_0x1b6ec9: ; 0x1b6ec9 TX_RAM StringBuffer3 text "." - para "Oh, ", $14, ", good" + para "Oh, , good" line "evening." done UnknownText_0x1b6ef3: ; 0x1b6ef3 - text "Is this ", $14, "?" + text "Is this ?" para "Good morning. This" line "is @" @@ -1610,7 +1611,7 @@ UnknownText_0x1b6ef3: ; 0x1b6ef3 done UnknownText_0x1b6f1c: ; 0x1b6f1c - text "Is this ", $14, "?" + text "Is this ?" para "Hi, it's @" TX_RAM StringBuffer3 @@ -1618,7 +1619,7 @@ UnknownText_0x1b6f1c: ; 0x1b6f1c done UnknownText_0x1b6f37: ; 0x1b6f37 - text "Is this ", $14, "?" + text "Is this ?" para "Good evening. This" line "is @" @@ -1655,7 +1656,7 @@ UnknownText_0x1b7019: ; 0x1b7019 TX_RAM StringBuffer3 text " here!" - para "Morning, ", $14, "!" + para "Morning, !" para "Are you using bird" line "#MON?" @@ -1667,7 +1668,7 @@ UnknownText_0x1b7057: ; 0x1b7057 TX_RAM StringBuffer3 text " here!" - para "Hi, ", $14, "!" + para "Hi, !" para "Are your bird" line "#MON flying?" @@ -1679,7 +1680,7 @@ UnknownText_0x1b7092: ; 0x1b7092 TX_RAM StringBuffer3 text " here!" - para "Evening, ", $14, "!" + para "Evening, !" line "Are you letting" para "your bird #MON" @@ -1688,7 +1689,7 @@ UnknownText_0x1b7092: ; 0x1b7092 UnknownText_0x1b70e7: ; 0x1b70e7 text "Good morning," - line $14, "!" + line "!" para "It's @" TX_RAM StringBuffer3 @@ -1697,7 +1698,7 @@ UnknownText_0x1b70e7: ; 0x1b70e7 done UnknownText_0x1b7112: ; 0x1b7112 - text "Hi, ", $14, "!" + text "Hi, !" para "It's @" TX_RAM StringBuffer3 @@ -1707,7 +1708,7 @@ UnknownText_0x1b7112: ; 0x1b7112 UnknownText_0x1b7132: ; 0x1b7132 text "Good evening," - line $14, "!" + line "!" para "It's @" TX_RAM StringBuffer3 @@ -1721,7 +1722,7 @@ UnknownText_0x1b7161: ; 0x1b7161 para "My @" TX_RAM StringBuffer4 - db $0 + text "" line "looks like it will" para "get tough enough" @@ -1737,7 +1738,7 @@ UnknownText_0x1b71d5: ; 0x1b71d5 TX_RAM StringBuffer3 text "…" - para "Ah, ", $14, "." + para "Ah, ." done UnknownText_0x1b71fc: ; 0x1b71fc @@ -1746,7 +1747,7 @@ UnknownText_0x1b71fc: ; 0x1b71fc TX_RAM StringBuffer3 text "…" - para "Ah, ", $14, ", is" + para "Ah, , is" line "it?" done @@ -1757,7 +1758,7 @@ UnknownText_0x1b722a: ; 0x1b722a text "…" para "Ah, if it isn't" - line $14, "." + line "." done UnknownText_0x1b725c: ; 0x1b725c @@ -1800,7 +1801,7 @@ UnknownText_0x1b730b: ; 0x1b730b TX_RAM StringBuffer3 text " here…" - para $52, "! Beautiful" + para "! Beautiful" line "morning, hey?" done @@ -1808,7 +1809,7 @@ UnknownText_0x1b7331: ; 0x1b7331 TX_RAM StringBuffer3 text " here…" - para $52, "! Beautiful" + para "! Beautiful" line "weather, hey?" done @@ -1816,26 +1817,26 @@ UnknownText_0x1b7357: ; 0x1b7357 TX_RAM StringBuffer3 text " here…" - para $52, "! Beautiful" + para "! Beautiful" line "moonlight, hey?" done UnknownText_0x1b737f: ; 0x1b737f - text "Hey, ", $52, "!" + text "Hey, !" line "This is @" TX_RAM StringBuffer3 text "!" done UnknownText_0x1b7397: ; 0x1b7397 - text "Hey, ", $52, "!" + text "Hey, !" line "This is @" TX_RAM StringBuffer3 text "!" done UnknownText_0x1b73af: ; 0x1b73af - text "Hey, ", $52, "!" + text "Hey, !" line "This is @" TX_RAM StringBuffer3 text "!" @@ -1848,7 +1849,7 @@ UnknownText_0x1b73c7: ; 0x1b73c7 text "!" para "Hah, and here's" - line $14, "!" + line "!" done UnknownText_0x1b73ef: ; 0x1b73ef @@ -1858,7 +1859,7 @@ UnknownText_0x1b73ef: ; 0x1b73ef text "!" para "Hah, and here's" - line $14, "!" + line "!" done UnknownText_0x1b7417: ; 0x1b7417 @@ -1868,11 +1869,11 @@ UnknownText_0x1b7417: ; 0x1b7417 text "!" para "Hah, and here's" - line $14, "!" + line "!" done UnknownText_0x1b743f: ; 0x1b743f - text $14, ", it's" + text ", it's" line "@" TX_RAM StringBuffer3 text "!" @@ -1882,7 +1883,7 @@ UnknownText_0x1b743f: ; 0x1b743f done UnknownText_0x1b746f: ; 0x1b746f - text $14, ", it's" + text ", it's" line "@" TX_RAM StringBuffer3 text "!" @@ -1892,7 +1893,7 @@ UnknownText_0x1b746f: ; 0x1b746f done UnknownText_0x1b749b: ; 0x1b749b - text $14, ", it's" + text ", it's" line "@" TX_RAM StringBuffer3 text "!" @@ -1920,7 +1921,7 @@ UnknownText_0x1b751a: ; 0x1b751a TX_RAM StringBuffer3 text "…" - para "Oh. Hi, ", $14, "!" + para "Oh. Hi, !" line "Good morning!" done @@ -1930,7 +1931,7 @@ UnknownText_0x1b7548: ; 0x1b7548 TX_RAM StringBuffer3 text "…" - para "Oh, hi, ", $14, "!" + para "Oh, hi, !" line "Yahoo!" done @@ -1940,11 +1941,11 @@ UnknownText_0x1b756f: ; 0x1b756f TX_RAM StringBuffer3 text "…" - para "Oh, hi, ", $14, "!" + para "Oh, hi, !" done UnknownText_0x1b758f: ; 0x1b758f - text $14, "!" + text "!" para "It's @" TX_RAM StringBuffer3 @@ -1953,7 +1954,7 @@ UnknownText_0x1b758f: ; 0x1b758f done UnknownText_0x1b75ac: ; 0x1b75ac - text $14, "!" + text "!" para "It's @" TX_RAM StringBuffer3 @@ -1962,7 +1963,7 @@ UnknownText_0x1b75ac: ; 0x1b75ac done UnknownText_0x1b75c9: ; 0x1b75c9 - text $14, "!" + text "!" para "It's @" TX_RAM StringBuffer3 diff --git a/text/sweethoney.asm b/text/sweethoney.asm index 334e62095..9bfa4f6b1 100644 --- a/text/sweethoney.asm +++ b/text/sweethoney.asm @@ -31,7 +31,7 @@ UnusedSweetHoneyGiveText: ; 0x55819 done UnusedGotSweetHoneyText: ; 0x5583e - text $52, " received" + text " received" line "SWEET HONEY." done