From b195069c77fe3b675a67e32cc289e63157f87fc1 Mon Sep 17 00:00:00 2001 From: Kara Alexandra Date: Mon, 8 Jun 2026 21:36:19 -0500 Subject: [PATCH] Text updates --- Rom.py | 10 ++- Text.py | 183 +++++++++++++++++++++--------------------- data/base2current.bps | Bin 158510 -> 158515 bytes 3 files changed, 98 insertions(+), 95 deletions(-) diff --git a/Rom.py b/Rom.py index c1f4bb52..8a437707 100644 --- a/Rom.py +++ b/Rom.py @@ -2912,7 +2912,7 @@ def write_strings(rom, world, player, team, is_mystery=False): tt['sign_ganon'] = 'Ganon only respects those who have done everything.' tt['ganon_fall_in'] = Ganon1_texts[random.randint(0, len(Ganon1_texts) - 1)] tt['ganon_fall_in_alt'] = 'You cannot defeat me until you finish your goal!' - tt['ganon_phase_3_alt'] = 'Got wax in\nyour ears?\nI can not die!' + tt['ganon_phase_3_alt'] = 'Got wax in\nyour ears?\nI cannot die!' def get_custom_goal_text(type): goal_text = world.custom_goals[player][type]['goaltext'] @@ -2931,7 +2931,13 @@ def write_strings(rom, world, player, team, is_mystery=False): if world.custom_goals[player]['murahgoal'] and 'goaltext' in world.custom_goals[player]['murahgoal']: tt['murahdahla'] = get_custom_goal_text('murahgoal') - tt['kakariko_tavern_fisherman'] = TavernMan_texts[random.randint(0, len(TavernMan_texts) - 1)] + tavern_texts = random.sample(TavernMan_texts, 5) + + tt['tavern_old_man_awake'] = tavern_texts.pop() + tt['tavern_old_man_unactivated_flute'] = tavern_texts.pop() + tt['tavern_old_man_know_tree_unactivated_flute'] = tavern_texts.pop() + tt['tavern_old_man_have_flute'] = tavern_texts.pop() + tt['kakariko_tavern_fisherman'] = tavern_texts.pop() pedestalitem = world.get_location('Master Sword Pedestal', player).item pedestal_text = 'Some Hot Air' if pedestalitem is None else hint_text(pedestalitem, True) if pedestalitem.pedestal_hint_text is not None else 'Unknown Item' diff --git a/Text.py b/Text.py index 761f2f17..b347d9b3 100644 --- a/Text.py +++ b/Text.py @@ -50,18 +50,18 @@ Uncle_texts = [ "Don't worry.\nI got this\ncovered.", "Race you to\nthe castle!", "\n Hi", - "I'M JUST GOING\nOUT FOR A\nPACK OF SMOKES", + "I'm just going\nout for a\npack of smokes.", "It's dangerous\nto go alone.\nSee ya!", - "ARE YOU A BAD\nENOUGH DUDE TO\nRESCUE ZELDA?", + "Are you a bad\nenough dude to\nrescue Zelda?", "\n\n I AM ERROR", "This seed is\nsub 2 hours,\nguaranteed.", "The chest is\na secret to\neverybody.", "I'm off to\nfind the\nwind fish.", "The shortcut\nto Ganon\nis this way!", - "THE MOON IS\nCRASHING! RUN\nFOR YOUR LIFE!", + "The moon is\ncrashing! Run\nfor your life!", "Time to fight\nhe who must\nnot be named.", - "RED MAIL\nIS FOR\nCOWARDS.", - "HEY!\n\nLISTEN!", + "Red mail\nis for\ncowards.", + "Hey!\n\nListen!", "Well\nexcuuuuuse me,\nprincess!", "5,000 Rupee\nreward for >\nYou're boned.", "Welcome to\nStoops Lonk's\nHoose", @@ -230,97 +230,92 @@ Ganon1_texts = [ ] Ganon_Phase_3_No_Silvers_texts = [ - "Did you find\nthe arrows on\nPlanet Zebes?", + "Did you find\nthe arrows\non Planet Zebes?", "Did you find\nthe arrows?\nI think not.", - "Silver arrows?\nI have never\nheard of them", + "Silver arrows?\nI have never\nheard of them.", "Did you find\nthe arrows on\nThe Moon?", - "Did you find\nthe arrows\nIn dev null?", - "I have sold\nthe arrows for\na green big 20", + "Did you find\nthe arrows\nin /dev/null?", + "I have sold\nthe arrows for\na green big 20.", "Did you find\nthe arrows in\nCount Dracula?", - "Error 404\nSilver arrows\nnot found.", - "No arrows for\nyou today.\nSorry.", + " Error 404\nSilver Arrows\n Not Found", + "No arrows\nfor you today.\nSorry.", "No arrows?\nCheck your\njunk mail." - "Did you find\nthe arrows in\nJabu's belly?", - "Silver is not\nan appropriate\narrow material", - "Did you find\nthe arrows in\nNarnia?", - "DID YOU FIND\nTHE ARROWS IN\nKEFKA'S TOWER", - "Did you find\nthe arrows in\nyour Recycle Bin?", + "Did you find\nthe arrows\nin Jabu's belly?", + "Silver is not\nan appropriate\narrow material.", + "Did you find\nthe arrows\nin nNarnia?", + "Did you find\nthe arrows\nin nKefka's Tower.", + "Did you find\nthe arrows\nin nyour Recycle Bin?", "Silver Arrows?\n\nLUL", - "Imagine\nfinding the\narrows", - "Did you find\nsilvers in\nscenic Ohio?", - "Did you find\nthe arrows in\n*mumblemumble*", - "Did you find\nthe arrows in\nthe hourglass?", - "Silver Arrows\nare so v30", - "OH, NO, THEY\nACTUALLY SAID\nSILVER MARROW", - "SURELY THE\nLEFTMOST TILES\nWILL STAY UP", - "Did you find\nthe arrows in\nWorld 4-2?", - "SILLY HERO,\nSILVER IS FOR\nWEREWOLVES!", - "Did you find\nthe silvers in\nGanti's ears", + "\nImagine finding\nthe arrows.", + "Did you find\nthe arrows\nin scenic Ohio?", + "Did you find\nthe arrows\nin •mumblemumble•", + "Did you find\nthe arrows\nin the hourglass?", + "\nSilver Arrows\nare so main branch.", + "Did you find\nthe arrows\nin World 4-2?", + "Did you find\nthe arrows\nin Ghanti's ears?", ] Ganon_Phase_3_No_Weakness_texts = [ - "Error 404\nWeakness\nnot found.", - "No weakness\nfor you today.\nSorry", - "Careful, all\nthat spinning\nmakes me dizzy", - "Are you ready\nTo spin\nTo win?", - "\nSpin To Win!\n", - "SURELY THE\nLEFTMOST TILES\nWILL STAY UP", - "You Spin Me\nRight Round\nLike A Record", - "SILLY HERO,\nSILVER IS FOR\nWEREWOLVES!", + "\n Error 404\nWeakness Not Found", + "No weakness\nfor you today.\nSorry.", + "Careful, all\nthat spinning\nmakes me dizzy.", + "Are you ready\nto spin\nto win?", + "\n Spin To Win!\n", + "Surely the\nleftmost tiles\nwill stay up!", + "You spin me\nright round\nlike a record.", + "Oh, no, they\nactually said\nsilver •marrow•.", + "Silly hero,\nsilver is for\nwerewolves!", ] TavernMan_texts = [ - "What do you\ncall a blind\ndinosaur?\na doyouthink-\nhesaurus.", - "A blind man\nwalks into\na bar.\nAnd a table.\nAnd a chair.", - "What do ducks\nlike to eat?\n\nQuackers!", - "How do you\nset up a party\nin space?\n\nYou planet!", - "I'm glad I\nknow sign\nlanguage.\nIt's pretty\nhandy.", - "What did Zelda\nsay to Link at\na secure door?\n\nTRIFORCE!", - "I am on a\nseafood diet.\n\nEvery time\nI see food,\nI eat it.", - "I've decided\nto sell my\nvacuum.\nIt was just\ngathering\ndust.", - "What's the best\ntime to go to\nthe dentist?\n\nTooth-hurtie!", - "Why can't a\nbike stand on\nits own?\n\nIt's two-tired!", - "If you haven't\nfound Quake\nyet…\nit's not your\nfault.", - "Why is Peter\nPan always\nflying?\nBecause he\nNeverlands!", - "I once told a\njoke to Armos.\n\nBut he\nremained\nstone-faced!", - "Lanmola was\nlate to our\ndinner party.\nHe just came\nfor the desert", - "Moldorm is\nsuch a\nprankster.\nAnd I fall for\nit every time!", - "Helmasaur is\nthrowing a\nparty.\nI hope it's\na masquerade!", - "I'd like to\nknow Arrghus\nbetter.\nBut he won't\ncome out of\nhis shell!", - "Mothula didn't\nhave much fun\nat the party.\nHe's immune to\nspiked punch!", - "Don't set me\nup with that\nchick from\nSteve's Town.\n\n\nI'm not\ninterested in\na Blind date!", - "Kholdstare is\nafraid to go\nto the circus.\nHungry kids\nthought he was\ncotton candy!", - "I asked who\nVitreous' best\nfriends are.\nHe said,\n'Me, Myself,\nand Eye!'", - "Trinexx can be\na hothead or\nhe can be an\nice guy. In\nthe end, he's\na solid\nindividual!", - "Bari thought I\nhad moved out\nof town.\nHe was shocked\nto see me!", - "I can only get\nWeetabix\naround here.\nI have to go\nto Steve's\nTown for Count\nChocula!", - "Don't argue\nwith a frozen\nDeadrock.\nHe'll never\nchange his\nposition!", - "I offered a\ndrink to a\nself-loathing\nGhini.\nHe said he\ndidn't like\nspirits!", - "I was supposed\nto meet Gibdo\nfor lunch.\nBut he got\nwrapped up in\nsomething!", - "Goriya sure\nhas changed\nin this game.\nI hope he\ncomes back\naround!", - "Hinox actually\nwants to be a\nlawyer.\nToo bad he\nbombed the\nBar exam!", - "I'm surprised\nMoblin's tusks\nare so gross.\nHe always has\nhis Trident\nwith him!", - "Don't tell\nStalfos I'm\nhere.\nHe has a bone\nto pick with\nme!", - "I got\nWallmaster to\nhelp me move\nfurniture.\nHe was really\nhandy!", - "Wizzrobe was\njust here.\nHe always\nvanishes right\nbefore we get\nthe check!", - "I shouldn't\nhave picked up\nZora's tab.\nThat guy\ndrinks like\na fish!", - "I was sharing\na drink with\nPoe.\nFor no reason,\nhe left in a\nheartbeat!", - "Don't trust\nhorsemen on\nDeath Mountain.\nThey're Lynel\nthe time!", - "Today's\nspecial is\nbattered bat.\nGot slapped\nfor offering a\nlady a Keese!", - "Don't walk\nunder\npropellered\npineapples.\nYou may end up\nwearing\na pee hat!", - "My girlfriend\nburrowed under\nthe sand.\nSo I decided\nto Leever!", - "Geldman wants\nto be a\nBroadway star.\nHe's always\npracticing\nJazz Hands!", - "Octoballoon\nmust be mad\nat me.\nHe blows up\nat the sight\nof me!", - "Toppo is a\ntotal pothead.\n\nHe hates it\nwhen you take\naway his grass", - "I lost my\nshield by\nthat house.\nWhy did they\nput up a\nPikit fence?!", - "Know that fox\nin Steve's\nTown?\nHe'll Pikku\npockets if you\naren't careful", - "Dash through\nDark World\nbushes.\nYou'll see\nGanon is tryin\nto Stal you!", - "Eyegore!\n\nYou gore!\nWe all gore\nthose jerks\nwith arrows!", - "I like my\nwhiskey neat.\n\nSome prefer it\nOctoroks!", - "I consoled\nFreezor over a\ncup of coffee.\nHis problems\njust seemed to\nmelt away!", - "Magic droplets\nof water don't\nshut up.\nThey just\nKyameron!", - "I bought hot\nwings for\nSluggula.\nThey gave him\nexplosive\ndiarrhea!", - "Hardhat Beetle\nwon't\nLet It Be?\nTell it to Get\nBack or give\nit a Ticket to\nRide down\na hole!", + "What do you call a blind dinosaur?\n\nA doyouthink-\nhesaurus.", + "What do ducks like to eat?\n\nQuackers!", + "How do you set up a party in space?\n\nYou planet!", + "I'm glad I know sign language.\nIt's pretty handy.", + "What did Zelda say to Link at a secure door?\n\nTriforce!", + "I am on a seafood diet.\n\nEvery time I see food, I eat it.", + "I've decided to sell my vacuum.\n\nIt was just gathering dust.", + "What's the best time to go to the dentist?\n\nTooth-hurtie!", + "Why can't a bike stand on its own?\n\nIt's two-tired!", + "If you haven't found Quake yet…\n\nit's not your fault.", + "Why is Peter Pan always flying?\n\nBecause he Neverlands!", + "I once told a joke to Armos.\n\nBut he remained stone-faced!", + "Lanmola was late to our dinner party.\n\nHe just came for the desert", + "Moldorm is such a prankster.\n\nAnd I fall for it every time!", + "Helmasaur is throwing a party.\n\nI hope it's a masquerade!", + "I'd like to know Arrghus better.\n\nBut he won't come out of his shell!", + "Mothula didn't have much fun at the party.\n\nHe's immune to spiked punch!", + "Kholdstare is afraid to go to the circus.\n\nHungry kids thought he was cotton candy!", + "I asked who Vitreous' best friends are.\n\nHe said, \"Me, Myself, and Eye!\"", + "Trinexx can be a hothead or he can be an ice guy. In the end, he's a solid individual!", + "Bari thought I had moved out of town.\n\nHe was shocked to see me!", + "Don't argue with a frozen Deadrock.\n\nHe'll never change his position!", + "I offered a drink to a self-loathing Ghini.\n\nHe said he didn't like spirits!", + "I was supposed to meet Gibdo for lunch.\n\nBut he got wrapped up in something!", + "Goriya sure has changed in this game.\n\nI hope he comes back around!", + "Hinox actually wants to be a lawyer.\n\nToo bad he bombed the bar exam!", + "I'm surprised Moblin's tusks are so gross.\n\nHe always has his Trident with him!", + "Don't tell Stalfos I'm here.\n\nHe has a bone to pick with me!", + "I got Wallmaster to help me move furniture.\n\nHe was really handy!", + "Wizzrobe was just here.\n\nHe always vanishes right before we get the check!", + "I shouldn't have picked up Zora's tab.\n\nThat guy drinks like a fish!", + "I was sharing a drink with Poe.\n\nFor no reason, he left in a heartbeat!", + "Don't trust horsemen on Death Mountain.\n\nThey're Lynel the time!", + "Today's special is battered bat.\n\nGot slapped for offering a lady a Keese!", + "Don't walk under propellered pineapples.\n\nYou may end up wearing a pee hat!", + "My girlfriend burrowed under the sand.\n\nSo I decided to Leever!", + "Geldman wants to be a Broadway star.\n\nHe's always practicing Jazz Hands!", + "Octoballoon must be mad at me.\n\nHe blows up at the sight of me!", + "Toppo is a total pothead.\n\nHe hates it when you take away his grass", + "I lost my shield by that house.\n\nWhy did they put up a Pikit fence?!", + "Know that fox in Steve's Town?\n\nHe'll Pikku pockets if you aren't careful", + "Dash through Dark World bushes.\n\nYou'll see Ganon is tryin to Stal you!", + "Eyegore!\n\nYou gore!\n\nWe all gore those jerks with arrows!", + "I like my whiskey neat.\n\nSome prefer it Octoroks!", + "I consoled Freezor over a cup of coffee.\n\nHis problems just seemed to melt away!", + "Magic droplets of water don't shut up.\n\nThey just Kyameron!", + "I bought hot wings for Sluggula.\n\nThey gave him explosive diarrhea!", + "Hardhat Beatle won't Let It Be?\n\nTell it to Get Back or give it a Ticket to Ride down a hole!", ] junk_texts = [ @@ -349,16 +344,15 @@ junk_texts = [ ] KingsReturn_texts = [ - 'Who is this even', + "Who is this even", 'When did he get here', - 'The Harem' ] * 2 + [ - "the return of the king", - "fellowship of the ring", - "the two towers", + "The Return of the King", + "Fellowship of the Ring", + "The Two Towers", ] Sanctuary_texts = [ - 'A Priest\'s love' + "a priest's love" ] * 2 + [ "the loyal priest", "read a book", @@ -488,7 +482,7 @@ class Credits(object): ], 'pedestal': [ SceneSmallCreditLine(19, 'and the master sword'), - SceneSmallAltCreditLine(21, 'sleeps again···'), + SceneSmallAltCreditLine(21, 'sleeps again…'), SceneLargeCreditLine(23, 'Forever!'), ], } @@ -832,6 +826,8 @@ class CharTextMapper(object): class RawMBTextMapper(CharTextMapper): char_map = {' ': 0xFF, + '/': 0x97, + '•': 0x98, '≥': 0x99, # Cursor '『': 0xC4, '』': 0xC5, @@ -1315,7 +1311,8 @@ class GoldCreditMapper(CharTextMapper): class GreenCreditMapper(CharTextMapper): char_map = {' ': 0x9F, - '.': 0x52, + '…': 0xFD, + '.': 0xFE, '·': 0x52} alpha_offset = -0x29 alpha_lower_offset = -0x29 diff --git a/data/base2current.bps b/data/base2current.bps index 257b393a4ae277d072f1b49a8eb285ee07c596f9..aec296c329d9d018af93598becee52b5fe29ee4b 100644 GIT binary patch delta 69 zcmV-L0J{IK)(NxL39yU<1V9JB_=AuGw~zw?ni~QcfR`&D0Ur`Q002KJ{wewffmbe} bUnhkifrnTh0k>Em0?tbavb!wi%W36jXjB=K delta 64 zcmV-G0KfmU)(NiG39yU<1kVUC_k)lFw~zw?ni~Q6mn