From 9869c6b5f8956173a1381d696761ca3a018a2309 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Fri, 11 Feb 2022 19:44:56 -0600 Subject: [PATCH 01/12] Improving some TF text --- Text.py | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/Text.py b/Text.py index 5257dc40..16009b64 100644 --- a/Text.py +++ b/Text.py @@ -89,48 +89,48 @@ Triforce_texts = [ 'Product has Hole in center. Bad seller, 0 out of 5.', 'Who stole the fourth triangle?', 'Trifource?\nMore Like Tritrice, am I right?' - '\n Well Done!', + '\n Well Done!', 'You just wasted 2 hours of your life.', 'This was meant to be a trapezoid', # these ones are from web randomizer - "\n G G", + "\n G G", "All your base\nare belong\nto us.", "You have ended\nthe domination\nof Dr. Wily", - " thanks for\n playing!!!", - "\n You Win!", - " Thank you!\n your quest\n is over.", - " A winner\n is\n you!", - "\n WINNER!!", - "\n I'm sorry\n\n but your\nprincess is in\nanother castle", - "\n success!", - " Whelp…\n that just\n happened", - " Oh hey…\n it's you", - "\n Wheeeeee!!", - " Time for\n another one?", - "and\n\n scene", - "\n GOT EM!!", + " Thanks for\n playing!!!", + "\n You Win!", + " Thank you!\n your quest\n is over.", + " A winner\n is\n you!", + "\n WINNER!!", + "\n I'm sorry\n\n but your\n princess is in\n another castle", + "\n Success!", + " Whelp…\n that just\n happened", + " Oh hey…\n it's you", + "\n Wheeeeee!!", + " Time for\n another one?", + "and\n\n scene", + "\n GOT EM!!", "\nTHE VALUUUE!!!", "Cool seed,\n\nright?", - "\n We did it!", - " Spam those\n emotes in\n wilds chat", - "\n O M G", - " Hello. Will\n you be my\n friend?", - " Beetorp\n was\n here!", + "\n We did it!", + " Spam those\n emotes in\n wilds chat", + "\n O M G", + " Hello. Will\n you be my\n friend?", + " Beetorp\n was\n here!", "The Wind Fish\nwill wake\nsoon. Hoot!", - "meow meow meow\nmeow meow meow\n oh my god!", + "Meow Meow Meow\nMeow Meow Meow\n Oh My God!", "Ahhhhhhhhh\nYa ya yaaaah\nYa ya yaaah", ".done\n\n.comment lol", "You get to\ndrink from\nthe firehose", "Do you prefer\n bacon, pork,\n or ham?", "You get one\nwish. Choose\nwisely, hero!", "Can you please\nbreak us three\nup? Thanks.", - " Pick us up\n before we\n get dizzy!", + " Pick us up\n before we\n get dizzy!", "Thank you,\nMikey. You’re\n2 minutes late", "This was a\n7000 series\ntrain.", - " I'd buy\n that for\n a rupee!", - " Did you like\n that bow\n placement?", + " I'd buy\n that for\n a rupee!", + " Did you like\n that bow\n placement?", "I promise the\nnext seed will\nbe better.", - "\n Honk.", + "\n Honk.", "Breakfast\nis served!", ] BombShop2_texts = ['Bombs!\nBombs!\nBiggest!\nBestest!\nGreatest!\nBoomest!'] From f58030da9ecab9e425d797181014fd586bf66b2a Mon Sep 17 00:00:00 2001 From: codemann8 Date: Mon, 21 Feb 2022 03:26:01 -0600 Subject: [PATCH 02/12] Updating tournament winners --- Text.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Text.py b/Text.py index 16009b64..6559bd5d 100644 --- a/Text.py +++ b/Text.py @@ -1742,7 +1742,7 @@ class TextTable(object): text['telepathic_tile_misery_mire'] = CompressedTextMapper.convert("{NOBORDER}\nLighting 4 torches will open your way forward!") text['hylian_text_2'] = CompressedTextMapper.convert("%%^= %==%\n ^ =%^=\n==%= ^^%^") text['desert_entry_translated'] = CompressedTextMapper.convert("Kneel before this stone, and magic will move around you.") - text['telepathic_tile_under_ganon'] = CompressedTextMapper.convert("Secondary tournament winners\n{HARP}\n ~~~2017~~~\nA: Zaen") + text['telepathic_tile_under_ganon'] = CompressedTextMapper.convert("Secondary tournament winners\n{HARP}\n ~~~2021~~~\nmatt7898\n\n ~~~2020~~~\nrelkin") text['telepathic_tile_palace_of_darkness'] = CompressedTextMapper.convert("{NOBORDER}\nThis is a funny looking Enemizer") # C0 text['telepathic_tile_desert_bonk_torch_room'] = CompressedTextMapper.convert("{NOBORDER}\nThings can be knocked down, if you fancy yourself a dashing dude.") @@ -1752,9 +1752,9 @@ class TextTable(object): text['telepathic_tile_ice_entrance'] = CompressedTextMapper.convert("{NOBORDER}\nYou can use Fire Rod or Bombos to pass.") text['telepathic_tile_ice_stalfos_knights_room'] = CompressedTextMapper.convert("{NOBORDER}\nKnock 'em down and then bomb them dead.") text['telepathic_tile_tower_of_hera_entrance'] = CompressedTextMapper.convert("{NOBORDER}\nThis is a bad place, with a guy who will make you fall…\n\n\na lot.") - text['houlihan_room'] = CompressedTextMapper.convert("Randomizer tournament winners\n{HARP}\n ~~~2018~~~\nS: Andy\n\n ~~~2017~~~\nA: ajneb174\nS: ajneb174") text['caught_a_bee'] = CompressedTextMapper.convert("Caught a Bee\n ≥ keep\n release\n{CHOICE}") text['caught_a_fairy'] = CompressedTextMapper.convert("Caught Fairy!\n ≥ keep\n release\n{CHOICE}") + text['houlihan_room'] = CompressedTextMapper.convert("Randomizer tournament winners\n{HARP}\n ~~~2021~~~\ndaaanty\n\n ~~~2019~~~\nJet082") text['no_empty_bottles'] = CompressedTextMapper.convert("Whoa, bucko!\nNo empty bottles.") text['game_race_boy_time'] = CompressedTextMapper.convert("Your time was\nᚎᚍ min ᚌᚋ sec.") text['game_race_girl'] = CompressedTextMapper.convert("You have 15 seconds,\nGo… Go… Go…") From c37736a5b1c2f76fc285284f6dc431ef87d956fa Mon Sep 17 00:00:00 2001 From: codemann8 Date: Mon, 21 Feb 2022 03:26:45 -0600 Subject: [PATCH 03/12] Some text updates --- Text.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Text.py b/Text.py index 6559bd5d..aa26b0fb 100644 --- a/Text.py +++ b/Text.py @@ -339,6 +339,7 @@ junk_texts = [ KingsReturn_texts = [ 'Who is this even', + 'When did he get here', 'The Harem' ] * 2 + [ "the return of the king", @@ -381,7 +382,7 @@ LostWoods_texts = [ ] * 2 + [ "the forest thief", "dancing pickles", - "flying vultures", + "flying crows", ] WishingWell_texts = [ "venus. queen of faeries", @@ -393,7 +394,7 @@ WishingWell_texts = [ "Venus Love Chain", "Venus Crescent Beam", ] -DesertPalace_texts = ['vultures rule the desert', 'literacy moves'] +DesertPalace_texts = ['vultures rule the desert', 'literacy that moves'] MountainTower_texts = ['the bully makes a friend', 'up up and away'] LinksHouse_texts = ['your uncle recovers', 'Home Sweet Home', 'Only one bed'] Lumberjacks_texts = [ @@ -1752,9 +1753,9 @@ class TextTable(object): text['telepathic_tile_ice_entrance'] = CompressedTextMapper.convert("{NOBORDER}\nYou can use Fire Rod or Bombos to pass.") text['telepathic_tile_ice_stalfos_knights_room'] = CompressedTextMapper.convert("{NOBORDER}\nKnock 'em down and then bomb them dead.") text['telepathic_tile_tower_of_hera_entrance'] = CompressedTextMapper.convert("{NOBORDER}\nThis is a bad place, with a guy who will make you fall…\n\n\na lot.") - text['caught_a_bee'] = CompressedTextMapper.convert("Caught a Bee\n ≥ keep\n release\n{CHOICE}") - text['caught_a_fairy'] = CompressedTextMapper.convert("Caught Fairy!\n ≥ keep\n release\n{CHOICE}") text['houlihan_room'] = CompressedTextMapper.convert("Randomizer tournament winners\n{HARP}\n ~~~2021~~~\ndaaanty\n\n ~~~2019~~~\nJet082") + text['caught_a_bee'] = CompressedTextMapper.convert("Caught a Bee\n ≥ Keep\n Release\n{CHOICE}") + text['caught_a_fairy'] = CompressedTextMapper.convert("Caught Fairy!\n ≥ Keep\n Release\n{CHOICE}") text['no_empty_bottles'] = CompressedTextMapper.convert("Whoa, bucko!\nNo empty bottles.") text['game_race_boy_time'] = CompressedTextMapper.convert("Your time was\nᚎᚍ min ᚌᚋ sec.") text['game_race_girl'] = CompressedTextMapper.convert("You have 15 seconds,\nGo… Go… Go…") From c5ab2b8853928be29a00fd4df6bb432bc182da2e Mon Sep 17 00:00:00 2001 From: codemann8 Date: Mon, 21 Feb 2022 03:57:41 -0600 Subject: [PATCH 04/12] More text capitalizations/updates --- Text.py | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/Text.py b/Text.py index aa26b0fb..23f4f999 100644 --- a/Text.py +++ b/Text.py @@ -1561,7 +1561,7 @@ class TextTable(object): text['tutorial_guard_7'] = CompressedTextMapper.convert("Jeeze! There really are a lot of things.") text['priest_sanctuary_before_leave'] = CompressedTextMapper.convert("Go be a hero!") text['sanctuary_enter'] = CompressedTextMapper.convert("YAY!\nYou saved Zelda!") - text['zelda_sanctuary_story'] = CompressedTextMapper.convert("Do you want to hear me say this again?\n{HARP}\n ≥ no\n yes\n{CHOICE}") + text['zelda_sanctuary_story'] = CompressedTextMapper.convert("Do you want to hear me say this again?\n{HARP}\n ≥ No\n Yes\n{CHOICE}") text['priest_sanctuary_before_pendants'] = CompressedTextMapper.convert("Go'on and get them pendants so you can beat up Agahnim.") text['priest_sanctuary_after_pendants_before_master_sword'] = CompressedTextMapper.convert("Kudos! But seriously, you should be getting the master sword, not having a kegger in here.") text['priest_sanctuary_dying'] = CompressedTextMapper.convert("They took her to the castle! Take your sword and save her!") @@ -1575,14 +1575,14 @@ class TextTable(object): text['zelda_push_throne'] = CompressedTextMapper.convert("Let's push it from the left!") text['zelda_switch_room_pull'] = CompressedTextMapper.convert("Pull this lever using A.") text['zelda_save_lets_go'] = CompressedTextMapper.convert("Let's get out of here!") - text['zelda_save_repeat'] = CompressedTextMapper.convert("I like talking, do you?\n ≥ no\n yes\n{CHOICE}") + text['zelda_save_repeat'] = CompressedTextMapper.convert("I like talking, do you?\n ≥ No\n Yes\n{CHOICE}") text['zelda_before_pendants'] = CompressedTextMapper.convert("You need to find all the pendants…\n\n\nNumpty.") text['zelda_after_pendants_before_master_sword'] = CompressedTextMapper.convert("Very pretty pendants, but really you should be getting that sword in the forest!") text['telepathic_zelda_right_after_master_sword'] = CompressedTextMapper.convert("{NOBORDER}\n{SPEED6}\nHi @,\nHave you been thinking about me?\narrrrrgghh…\n… … …") text['zelda_sewers'] = CompressedTextMapper.convert("Just a little further to the Sanctuary.") text['zelda_switch_room'] = CompressedTextMapper.convert("The Sanctuary!\n\nPull my finger") text['kakariko_saharalasa_wife'] = CompressedTextMapper.convert("Heya, @!\nLong time no see.\nYou want a master sword?\n\nWell good luck with that.") - text['kakariko_saharalasa_wife_sword_story'] = CompressedTextMapper.convert("It occurs to me that I like toast and jam, but cheese and crackers is better.\nYou like?\n ≥ cheese\n jam\n{CHOICE}") + text['kakariko_saharalasa_wife_sword_story'] = CompressedTextMapper.convert("It occurs to me that I like toast and jam, but cheese and crackers is better.\nYou like?\n ≥ Cheese\n Jam\n{CHOICE}") text['kakariko_saharalasa_wife_closing'] = CompressedTextMapper.convert("Anywho, I have things to do. You see those 2 ovens?\n\nYeah 2!\nWho has 2 ovens nowadays?") text['kakariko_saharalasa_after_master_sword'] = CompressedTextMapper.convert("Cool sword!\n\n\n…\n\n\n…\n\n\nPlease save us") text['kakariko_alert_guards'] = CompressedTextMapper.convert("GUARDS! HELP!\nThe creeper\n@ is here!") @@ -1592,7 +1592,7 @@ class TextTable(object): text['sahasrahla_quest_information'] = CompressedTextMapper.convert( "{BOTTOM}\n" + "Sahasrahla, I am. You would do well to find the 3 pendants from the 3 dungeons in the Light World.\n" - + "Understand?\n ≥ yes\n no\n{CHOICE}") + + "Understand?\n ≥ Yes\n No\n{CHOICE}") text['sahasrahla_bring_courage'] = CompressedTextMapper.convert( "{BOTTOM}\n" + "While you're here, could you do me a solid and get the green pendant from that dungeon?\n" @@ -1683,15 +1683,15 @@ class TextTable(object): text['talking_tree_other'] = CompressedTextMapper.convert("I can breathe!") text['item_get_pendant_power_alt'] = CompressedTextMapper.convert("We have the Pendant of Power! How robust!") text['item_get_pendant_wisdom_alt'] = CompressedTextMapper.convert("We have the Pendant of Wisdom! How astute!") - text['game_shooting_choice'] = CompressedTextMapper.convert("20 rupees.\n5 arrows.\nWin rupees!\nWant to play?\n ≥ yes\n no\n{CHOICE}") + text['game_shooting_choice'] = CompressedTextMapper.convert("20 rupees.\n5 arrows.\nWin rupees!\nWant to play?\n ≥ Yes\n No\n{CHOICE}") text['game_shooting_yes'] = CompressedTextMapper.convert("Let's do this!") text['game_shooting_no'] = CompressedTextMapper.convert("Where are you going? Straight up!") - text['game_shooting_continue'] = CompressedTextMapper.convert("Keep playing?\n ≥ yes\n no\n{CHOICE}") + text['game_shooting_continue'] = CompressedTextMapper.convert("Keep playing?\n ≥ Yes\n No\n{CHOICE}") text['pond_of_wishing'] = CompressedTextMapper.convert("-Wishing Pond-\n\n On Vacation") text['pond_item_select'] = CompressedTextMapper.convert("Pick something\nto throw in.\n{ITEMSELECT}") - text['pond_item_test'] = CompressedTextMapper.convert("You toss this?\n ≥ yup\n wrong\n{CHOICE}") + text['pond_item_test'] = CompressedTextMapper.convert("You toss this?\n ≥ Yup\n Wrong\n{CHOICE}") text['pond_will_upgrade'] = CompressedTextMapper.convert("You're honest, so I'll give you a present.") - text['pond_item_test_no'] = CompressedTextMapper.convert("You sure?\n ≥ oh yeah\n um\n{CHOICE}") + text['pond_item_test_no'] = CompressedTextMapper.convert("You sure?\n ≥ Oh yeah\n Um\n{CHOICE}") text['pond_item_test_no_no'] = CompressedTextMapper.convert("Well, I don't want it, so take it back.") text['pond_item_boomerang'] = CompressedTextMapper.convert("I don't much like you, so have this worse Boomerang.") # 90 @@ -1700,7 +1700,7 @@ class TextTable(object): text['pond_item_bottle_filled'] = CompressedTextMapper.convert("Bottle Filled!\nMoney Saved!") text['pond_item_sword'] = CompressedTextMapper.convert("Thank you for the sword, here is a stick of butter.") text['pond_of_wishing_happiness'] = CompressedTextMapper.convert("Happiness up!\nYou are now\nᚌᚋ happy!") - text['pond_of_wishing_choice'] = CompressedTextMapper.convert("Your wish?\n ≥more bombs\n more arrows\n{CHOICE}") + text['pond_of_wishing_choice'] = CompressedTextMapper.convert("Your wish?\n ≥More bombs\n More arrows\n{CHOICE}") text['pond_of_wishing_bombs'] = CompressedTextMapper.convert("Woo-hoo!\nYou can now\ncarry ᚌᚋ bombs") text['pond_of_wishing_arrows'] = CompressedTextMapper.convert("Woo-hoo!\nYou can now\nhold ᚌᚋ arrows") text['pond_of_wishing_full_upgrades'] = CompressedTextMapper.convert("Youhave all I can give you, here are your rupees back.") @@ -1721,7 +1721,7 @@ class TextTable(object): text['running_man'] = CompressedTextMapper.convert("Hi, Do you\nknow Veetorp?\n\nYou really\nshould. And\nall the other great guys who made this possible.\nGo thank them.\n\n\nIf you can catch them…") text['game_race_sign'] = CompressedTextMapper.convert("Why are you reading this sign? Run!!!") text['sign_bumper_cave'] = CompressedTextMapper.convert("You need Cape, but not Hookshot") - text['sign_catfish'] = CompressedTextMapper.convert("toss rocks\ntoss items\ntoss cookies") + text['sign_catfish'] = CompressedTextMapper.convert("Toss rocks\nToss items\nToss cookies") text['sign_north_village_of_outcasts'] = CompressedTextMapper.convert("↑ Skull Woods\n\n↓ Steve's Town") text['sign_south_of_bumper_cave'] = CompressedTextMapper.convert("\n→ Karkats cave") text['sign_east_of_pyramid'] = CompressedTextMapper.convert("\n→ Dark Palace") @@ -1729,7 +1729,7 @@ class TextTable(object): text['sign_east_of_mire'] = CompressedTextMapper.convert("\n← Misery Mire\n no way in.\n no way out.") text['sign_village_of_outcasts'] = CompressedTextMapper.convert("Have a Trulie Awesome Day!") # B0 - text['sign_before_wishing_pond'] = CompressedTextMapper.convert("waterfall\nup ahead\nmake wishes") + text['sign_before_wishing_pond'] = CompressedTextMapper.convert("Waterfall\nup ahead\nMake wishes") text['sign_before_catfish_area'] = CompressedTextMapper.convert("→↑ Have you met Woeful Ike?") text['castle_wall_guard'] = CompressedTextMapper.convert("Looking for a Princess? Look downstairs.") text['gate_guard'] = CompressedTextMapper.convert("No Lonks Allowed!") @@ -1785,7 +1785,7 @@ class TextTable(object): text['blacksmiths_still_working'] = CompressedTextMapper.convert("Something this precious takes time… Come back later.") text['blacksmiths_saving_bows'] = CompressedTextMapper.convert("Thanks!\n\nThanks!") text['blacksmiths_hammer_anvil'] = CompressedTextMapper.convert("Dernt Take Er Jerbs!") - text['dark_flute_boy_storytime'] = CompressedTextMapper.convert("Hi!\nI'm Stumpy\nI've been chillin' in this world for a while now, but I miss my flute. If I gave you a shovel, would you go digging for it?\n ≥ sure\n nahh\n{CHOICE}") + text['dark_flute_boy_storytime'] = CompressedTextMapper.convert("Hi!\nI'm Stumpy\nI've been chillin' in this world for a while now, but I miss my flute. If I gave you a shovel, would you go digging for it?\n ≥ Sure\n Nahh\n{CHOICE}") text['dark_flute_boy_get_shovel'] = CompressedTextMapper.convert("Schaweet! Here you go. Happy digging!") text['dark_flute_boy_no_get_shovel'] = CompressedTextMapper.convert("Oh I see, not good enough for you… FINE!") text['dark_flute_boy_flute_not_found'] = CompressedTextMapper.convert("Still haven't found the item? Dig in the Light World around here, dingus!") @@ -1799,7 +1799,7 @@ class TextTable(object): text['shop_fortune_teller_lw_hint_6'] = CompressedTextMapper.convert("{BOTTOM}\nBy the black cats, Spin, Hammer, or Net to hurt Agahnim") text['shop_fortune_teller_lw_hint_7'] = CompressedTextMapper.convert("{BOTTOM}\nBy the black cats, You can jump in the well by the blacksmiths") text['shop_fortune_teller_lw_no_rupees'] = CompressedTextMapper.convert("{BOTTOM}\nThe black cats are hungry, come back with rupees") - text['shop_fortune_teller_lw'] = CompressedTextMapper.convert("{BOTTOM}\nWelcome to the Fortune Shoppe!\nFancy a read?\n ≥I must know\n negative\n{CHOICE}") + text['shop_fortune_teller_lw'] = CompressedTextMapper.convert("{BOTTOM}\nWelcome to the Fortune Shoppe!\nFancy a read?\n ≥I must know\n Negative\n{CHOICE}") text['shop_fortune_teller_lw_post_hint'] = CompressedTextMapper.convert("{BOTTOM}\nFor ᚋᚌ rupees\nIt is done.\nBe gone!") text['shop_fortune_teller_lw_no'] = CompressedTextMapper.convert("{BOTTOM}\nWell then, why did you even come in here?") text['shop_fortune_teller_lw_hint_8'] = CompressedTextMapper.convert("{BOTTOM}\nBy the black cats, why you do?") @@ -1810,7 +1810,7 @@ class TextTable(object): text['shop_fortune_teller_lw_hint_13'] = CompressedTextMapper.convert("{BOTTOM}\nBy the black cats, big bombs blow up cracked walls in pyramids") text['shop_fortune_teller_lw_hint_14'] = CompressedTextMapper.convert("{BOTTOM}\nBy the black cats, you need all the crystals to open Ganon's Tower") text['shop_fortune_teller_lw_hint_15'] = CompressedTextMapper.convert("{BOTTOM}\nBy the black cats, Silver Arrows will defeat Ganon in his final phase") - text['dark_sanctuary'] = CompressedTextMapper.convert("For 20 rupees I'll tell you something?\nHow about it?\n ≥ yes\n no\n{CHOICE}") + text['dark_sanctuary'] = CompressedTextMapper.convert("For 20 rupees I'll tell you something?\nHow about it?\n ≥ Yes\n No\n{CHOICE}") text['dark_sanctuary_hint_0'] = CompressedTextMapper.convert("I once was a tea kettle, but then I moved up in the world, and now you can see me as this. Makes you wonder. What I could be next time.") # 100 text['dark_sanctuary_no'] = CompressedTextMapper.convert("Then go away!") @@ -1826,8 +1826,8 @@ class TextTable(object): text['sick_kid_trade'] = CompressedTextMapper.convert("{BOTTOM}\nCool Bottle! Here's something for you.") text['sick_kid_post_trade'] = CompressedTextMapper.convert("{BOTTOM}\nLeave me alone\nI'm sick. You have my item.") text['desert_thief_sitting'] = CompressedTextMapper.convert("………………………") - text['desert_thief_following'] = CompressedTextMapper.convert("why……………") - text['desert_thief_question'] = CompressedTextMapper.convert("I was a thief, I open purple chests!\nKeep secret?\n ≥ sure thing\n never!\n{CHOICE}") + text['desert_thief_following'] = CompressedTextMapper.convert("Why……………") + text['desert_thief_question'] = CompressedTextMapper.convert("I was a thief, I open purple chests!\nKeep secret?\n ≥ Sure thing\n Never!\n{CHOICE}") text['desert_thief_question_yes'] = CompressedTextMapper.convert("Cool, bring me any purple chests you find.") text['desert_thief_after_item_get'] = CompressedTextMapper.convert("You tell anyone and I will give you such a pinch!") text['desert_thief_reassure'] = CompressedTextMapper.convert("Bring chests. It's a secret to everyone.") @@ -1853,10 +1853,10 @@ class TextTable(object): text['bomb_shop_big_bomb'] = CompressedTextMapper.convert("30 bombs for 100 rupees, 100 rupees 1 BIG bomb. Good deals all day!") text['bomb_shop_big_bomb_buy'] = CompressedTextMapper.convert("Thanks!\nBoom goes the dynamite!") text['item_get_big_bomb'] = CompressedTextMapper.convert("YAY! press A to splode it!") - text['kiki_second_extortion'] = CompressedTextMapper.convert("For 100 more, I'll open this place.\nHow about it?\n ≥ open\n nah\n{CHOICE}") + text['kiki_second_extortion'] = CompressedTextMapper.convert("For 100 more, I'll open this place.\nHow about it?\n ≥ Open\n Nah\n{CHOICE}") text['kiki_second_extortion_no'] = CompressedTextMapper.convert("Heh, good luck getting in.") text['kiki_second_extortion_yes'] = CompressedTextMapper.convert("Yay! Rupees!\nOkay, let's do this!") - text['kiki_first_extortion'] = CompressedTextMapper.convert("I'm Kiki, I like rupees, may I have 10?\nHow about it?\n ≥ yes\n no\n{CHOICE}") + text['kiki_first_extortion'] = CompressedTextMapper.convert("I'm Kiki, I like rupees, may I have 10?\nHow about it?\n ≥ Yes\n No\n{CHOICE}") text['kiki_first_extortion_yes'] = CompressedTextMapper.convert("Nice. I'll tag along with you for a bit.") # 120 text['kiki_first_extortion_no'] = CompressedTextMapper.convert("Pfft. I have no reason to hang. See ya!") @@ -1929,7 +1929,7 @@ class TextTable(object): text['death_mountain_bully_with_pearl'] = CompressedTextMapper.convert("I think I forgot how to smile…") text['shop_darkworld_enter'] = CompressedTextMapper.convert("It's dangerous outside, buy my crap for safety.") # 160 - text['game_chest_village_of_outcasts'] = CompressedTextMapper.convert("Pay 30 rupees, open 2 chests. Are you lucky?\nSo, Play game?\n ≥ play\n never!\n{CHOICE}") + text['game_chest_village_of_outcasts'] = CompressedTextMapper.convert("Pay 30 rupees, open 2 chests. Are you lucky?\nSo, Play game?\n ≥ Play\n Never!\n{CHOICE}") text['game_chest_no_cash'] = CompressedTextMapper.convert("So, like, you need 30 rupees.\nSilly!") text['game_chest_not_played'] = CompressedTextMapper.convert("You want to play a game?\nTalk to me.") text['game_chest_played'] = CompressedTextMapper.convert("You've opened the chests!\nTime to go.") @@ -1960,17 +1960,17 @@ class TextTable(object): text['cukeman_2'] = CompressedTextMapper.convert("You found Shabadoo, huh?\nNiiiiice.") text['potion_shop_no_cash'] = CompressedTextMapper.convert("Yo! I'm not running a charity here.") text['kakariko_powdered_chicken'] = CompressedTextMapper.convert("Smallhacker…\n\n\nWas hiding, you found me!\n\n\nOkay, you can leave now.") - text['game_chest_south_of_kakariko'] = CompressedTextMapper.convert("Pay 20 rupees, open 1 chest. Are you lucky?\nSo, Play game?\n ≥ play\n never!\n{CHOICE}") + text['game_chest_south_of_kakariko'] = CompressedTextMapper.convert("Pay 20 rupees, open 1 chest. Are you lucky?\nSo, Play game?\n ≥ Play\n Never!\n{CHOICE}") text['game_chest_play_yes'] = CompressedTextMapper.convert("Good luck then") # 180 text['game_chest_play_no'] = CompressedTextMapper.convert("Well fine, I didn't want your rupees.") - text['game_chest_lost_woods'] = CompressedTextMapper.convert("Pay 100 rupees open 1 chest. Are you lucky?\nSo, Play game?\n ≥ play\n never!\n{CHOICE}") + text['game_chest_lost_woods'] = CompressedTextMapper.convert("Pay 100 rupees open 1 chest. Are you lucky?\nSo, Play game?\n ≥ Play\n Never!\n{CHOICE}") text['kakariko_flophouse_man_no_flippers'] = CompressedTextMapper.convert("I really hate mowing my yard.\nI moved my house and everyone else's to avoid it.\n{PAGEBREAK}\nI hope you don't mind.") text['kakariko_flophouse_man'] = CompressedTextMapper.convert("I really hate mowing my yard.\nI moved my house and everyone else's to avoid it.\n{PAGEBREAK}\nI hope you don't mind.") text['menu_start_2'] = CompressedTextMapper.convert("{MENU}\n{SPEED0}\n≥@'s House\n Sanctuary\n{CHOICE3}", False) text['menu_start_3'] = CompressedTextMapper.convert("{MENU}\n{SPEED0}\n≥@'s House\n Sanctuary\n Mountain Cave\n{CHOICE2}", False) text['menu_pause'] = CompressedTextMapper.convert("{SPEED0}\n≥Continue\n Save and Quit\n{CHOICE3}", False) - text['game_digging_choice'] = CompressedTextMapper.convert("Have 80 Rupees? Want to play digging game?\n ≥yes\n no\n{CHOICE}") + text['game_digging_choice'] = CompressedTextMapper.convert("Have 80 Rupees? Want to play digging game?\n ≥Yes\n No\n{CHOICE}") text['game_digging_start'] = CompressedTextMapper.convert("Okay, use the shovel with Y!") text['game_digging_no_cash'] = CompressedTextMapper.convert("Shovel rental is 80 rupees.\nI have all day") text['game_digging_end_time'] = CompressedTextMapper.convert("Time's up!\nTime for you to go.") @@ -1978,8 +1978,8 @@ class TextTable(object): text['game_digging_no_follower'] = CompressedTextMapper.convert("Something is following you. I don't like.") text['menu_start_4'] = CompressedTextMapper.convert("{MENU}\n{SPEED0}\n≥@'s House\n Mountain Cave\n{CHOICE3}", False) # Start of new text data - text['ganon_fall_in_alt'] = CompressedTextMapper.convert("You think you\nare ready to\nface me?\n\nI will not die\n\nunless you\ncomplete your\ngoals. Dingus!") - text['ganon_phase_3_alt'] = CompressedTextMapper.convert("Got wax in\nyour ears?\nI cannot die!") + text['ganon_fall_in_alt'] = CompressedTextMapper.convert("You think you are ready to face me?\n\nI will not die unless you complete your goals. Dingus!") + text['ganon_phase_3_alt'] = CompressedTextMapper.convert("Got wax in your ears? I cannot die!") # 190 text['sign_east_death_mountain_bridge'] = CompressedTextMapper.convert("How did you get up here?") text['fish_money'] = CompressedTextMapper.convert("It's a secret to everyone.") From a0d51327b8ee9f3a8f8cc9f5a3ac27000342a8f0 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Mon, 21 Feb 2022 04:40:13 -0600 Subject: [PATCH 05/12] Fix capitalization issue with hints --- Rom.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Rom.py b/Rom.py index a9e807cd..25b5e6e2 100644 --- a/Rom.py +++ b/Rom.py @@ -2304,7 +2304,7 @@ def write_strings(rom, world, player, team): this_location = world.find_items_not_key_only(flute_item, player) if this_location: this_hint = this_location[0].item.hint_text + ' can be found ' + hint_text(this_location[0]) + '.' - this_hint = this_hint.capitalize() + this_hint = this_hint[0].upper() + this_hint[1:] tt[hint_locations.pop(0)] = this_hint items_to_hint.remove(flute_item) if world.keyshuffle[player]: @@ -2321,7 +2321,7 @@ def write_strings(rom, world, player, team): random.shuffle(this_location) if this_location: this_hint = this_location[0].item.hint_text + ' can be found ' + hint_text(this_location[0]) + '.' - this_hint = this_hint.capitalize() + this_hint = this_hint[0].upper() + this_hint[1:] tt[hint_locations.pop(0)] = this_hint hint_count -= 1 From 9312a95ad51a3a6f174f31ac907912b464498582 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Tue, 22 Feb 2022 19:56:05 -0600 Subject: [PATCH 06/12] Fixed issue with mirror portal deleting after mirror bonk in Crossed OW --- Rom.py | 2 +- asm/owrando.asm | 7 +++++++ data/base2current.bps | Bin 91653 -> 91673 bytes 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Rom.py b/Rom.py index 25b5e6e2..1455f498 100644 --- a/Rom.py +++ b/Rom.py @@ -33,7 +33,7 @@ from source.classes.SFX import randomize_sfx JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = 'b46e08bfb572876dd51dc3108e7b9292' +RANDOMIZERBASEHASH = 'a30bdf1086fa4304d3b422eef2587f5b' class JsonRom(object): diff --git a/asm/owrando.asm b/asm/owrando.asm index 065cbfd8..06647861 100644 --- a/asm/owrando.asm +++ b/asm/owrando.asm @@ -166,6 +166,13 @@ OWMirrorSpriteMove: lda $1acf : eor #$80 : sta $1acf + lda #$2c : jml.l $07A985 ; what we wrote over } +OWMirrorSpriteRestore: +{ + lda.l OWMode+1 : and.b #!FLAG_OW_CROSSED : beq + + lda $1acf : and #$0f : sta $1acf + + rep #$30 : lda.w $04AC ; what we wrote over + rtl +} OWFluteCancel: { diff --git a/data/base2current.bps b/data/base2current.bps index b1c892c64de471dd24da8364acc172f3914a3e78..5c83c8341c8ab95b8596f6a6152f6eff74da1bfe 100644 GIT binary patch delta 218 zcmV<0044v0%mtau1+YZ{1hZ01t+Po1Y6A)=@sT2zh^p#%jI*@_LIVNuv-k&B1Ofqx zlTi$>0nL*E4Hp5evl$KW`ZT!+t zfVBl8o#_H=uLe+m$pP>Lk4l#=2mvPnW0zJ40VM)^wU>Pe0YU*tx4;MiodN;bmtG42 z7c`$VDjk5a1*QcchLfcQg^I#3V2?$B)z8ZFe(-0H%JY870Pq5-0nbW+FwhF0K7fIM Ur@yzX3jtAD2-V$01vFl7kG<+we*gdg delta 239 zcmV Date: Thu, 24 Feb 2022 06:06:20 -0600 Subject: [PATCH 07/12] Some changes to lowercase text for dungeon items --- Items.py | 106 +++++++++++++++++++++--------------------- Rom.py | 2 +- data/base2current.bps | Bin 91673 -> 91675 bytes 3 files changed, 54 insertions(+), 54 deletions(-) diff --git a/Items.py b/Items.py index 6d7f9627..f265a077 100644 --- a/Items.py +++ b/Items.py @@ -112,59 +112,59 @@ item_table = {'Bow': (True, False, None, 0x0B, 200, 'You have\nchosen the\narche 'Multi RNG': (False, True, None, 0x63, 100, 'something you may already have', None, None, None, None, 'unknown boy somethings again', 'a total mystery'), 'Magic Upgrade (1/2)': (True, False, None, 0x4E, 50, 'Your magic\npower has been\ndoubled!', 'and the spell power', 'the magic-saving kid', 'wizardry for sale', 'mekalekahi mekahiney ho', 'magic boy saves magic again', 'Half magic'), # can be required to beat mothula in an open seed in very very rare circumstance 'Magic Upgrade (1/4)': (True, False, None, 0x4F, 100, 'Your magic\npower has been\nquadrupled!', 'and the spell power', 'the magic-saving kid', 'wizardry for sale', 'mekalekahi mekahiney ho', 'magic boy saves magic again', 'Quarter magic'), # can be required to beat mothula in an open seed in very very rare circumstance - 'Small Key (Eastern Palace)': (False, False, 'SmallKey', 0xA2, 40, 'A small key to Armos Knights', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key to Eastern Palace'), - 'Big Key (Eastern Palace)': (False, False, 'BigKey', 0x9D, 60, 'A big key to Armos Knights', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a big key to Eastern Palace'), - 'Compass (Eastern Palace)': (False, True, 'Compass', 0x8D, 10, 'Now you can find the Armos Knights!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds boss again', 'a compass to Eastern Palace'), - 'Map (Eastern Palace)': (False, True, 'Map', 0x7D, 20, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a map to Eastern Palace'), - 'Small Key (Desert Palace)': (False, False, 'SmallKey', 0xA3, 40, 'A small key to the desert', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key to Desert Palace'), - 'Big Key (Desert Palace)': (False, False, 'BigKey', 0x9C, 60, 'A big key to the desert', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a big key to Desert Palace'), - 'Compass (Desert Palace)': (False, True, 'Compass', 0x8C, 10, 'Now you can find Lanmolas!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds boss again', 'a compass to Desert Palace'), - 'Map (Desert Palace)': (False, True, 'Map', 0x7C, 20, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a map to Desert Palace'), - 'Small Key (Tower of Hera)': (False, False, 'SmallKey', 0xAA, 40, 'A small key to Hera', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key to Tower of Hera'), - 'Big Key (Tower of Hera)': (False, False, 'BigKey', 0x95, 60, 'A big key to Hera', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a big key to Tower of Hera'), - 'Compass (Tower of Hera)': (False, True, 'Compass', 0x85, 10, 'Now you can find Moldorm!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds boss again', 'a compass to Tower of Hera'), - 'Map (Tower of Hera)': (False, True, 'Map', 0x75, 20, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a map to Tower of Hera'), - 'Small Key (Escape)': (False, False, 'SmallKey', 0xA0, 40, 'A small key to the castle', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key to Hyrule Castle'), - 'Big Key (Escape)': (False, False, 'BigKey', 0x9F, 60, 'A big key to the castle', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a big key to Hyrule Castle'), - 'Compass (Escape)': (False, True, 'Compass', 0x8F, 10, 'Now you can find no boss!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds null again', 'a compass to Hyrule Castle'), - 'Map (Escape)': (False, True, 'Map', 0x7F, 10, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a map to Hyrule Castle'), - 'Small Key (Agahnims Tower)': (False, False, 'SmallKey', 0xA4, 40, 'A small key to Agahnim', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key to Castle Tower'), - 'Big Key (Agahnims Tower)': (False, False, 'BigKey', 0x9B, 60, 'A big key to Agahnim', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a big key to Castle Tower'), - 'Compass (Agahnims Tower)': (False, True, 'Compass', 0x8B, 10, 'Now you can find Aga1!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds null again', 'a compass to Castle Tower'), - 'Map (Agahnims Tower)': (False, True, 'Map', 0x7B, 10, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a map to Castle Tower'), - 'Small Key (Palace of Darkness)': (False, False, 'SmallKey', 0xA6, 40, 'A small key to darkness', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key to Palace of Darkness'), - 'Big Key (Palace of Darkness)': (False, False, 'BigKey', 0x99, 60, 'A big key to darkness', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a big key to Palace of Darkness'), - 'Compass (Palace of Darkness)': (False, True, 'Compass', 0x89, 10, 'Now you can find Helmasaur King!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds boss again', 'a compass to Palace of Darkness'), - 'Map (Palace of Darkness)': (False, True, 'Map', 0x79, 20, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a map to Palace of Darkness'), - 'Small Key (Thieves Town)': (False, False, 'SmallKey', 0xAB, 40, 'A small key to thievery', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key to Thieves\' Town'), - 'Big Key (Thieves Town)': (False, False, 'BigKey', 0x94, 60, 'A big key to thievery', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a big key to Thieves\' Town'), - 'Compass (Thieves Town)': (False, True, 'Compass', 0x84, 10, 'Now you can find Blind!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds boss again', 'a compass to Thieves\' Town'), - 'Map (Thieves Town)': (False, True, 'Map', 0x74, 20, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a map to Thieves\' Town'), - 'Small Key (Skull Woods)': (False, False, 'SmallKey', 0xA8, 40, 'A small key to the woods', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key to Skull Woods'), - 'Big Key (Skull Woods)': (False, False, 'BigKey', 0x97, 60, 'A big key to the woods', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a big key to Skull Woods'), - 'Compass (Skull Woods)': (False, True, 'Compass', 0x87, 10, 'Now you can find Mothula!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds boss again', 'a compass to Skull Woods'), - 'Map (Skull Woods)': (False, True, 'Map', 0x77, 20, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a map to Skull Woods'), - 'Small Key (Swamp Palace)': (False, False, 'SmallKey', 0xA5, 40, 'A small key to the swamp', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key to Swamp Palace'), - 'Big Key (Swamp Palace)': (False, False, 'BigKey', 0x9A, 60, 'A big key to the swamp', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a big key to Swamp Palace'), - 'Compass (Swamp Palace)': (False, True, 'Compass', 0x8A, 10, 'Now you can find Arrghus!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds boss again', 'a compass to Swamp Palace'), - 'Map (Swamp Palace)': (False, True, 'Map', 0x7A, 20, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a map to Swamp Palace'), - 'Small Key (Ice Palace)': (False, False, 'SmallKey', 0xA9, 40, 'A small key to the iceberg', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key to Ice Palace'), - 'Big Key (Ice Palace)': (False, False, 'BigKey', 0x96, 60, 'A big key to the iceberg', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a big key to Ice Palace'), - 'Compass (Ice Palace)': (False, True, 'Compass', 0x86, 10, 'Now you can find Kholdstare!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds boss again', 'a compass to Ice Palace'), - 'Map (Ice Palace)': (False, True, 'Map', 0x76, 20, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a map to Ice Palace'), - 'Small Key (Misery Mire)': (False, False, 'SmallKey', 0xA7, 40, 'A small key to the mire', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key to Misery Mire'), - 'Big Key (Misery Mire)': (False, False, 'BigKey', 0x98, 60, 'A big key to the mire', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a big key to Misery Mire'), - 'Compass (Misery Mire)': (False, True, 'Compass', 0x88, 10, 'Now you can find Vitreous!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds boss again', 'a compass to Misery Mire'), - 'Map (Misery Mire)': (False, True, 'Map', 0x78, 20, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a map to Misery Mire'), - 'Small Key (Turtle Rock)': (False, False, 'SmallKey', 0xAC, 40, 'A small key to the pipe maze', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key to Turtle Rock'), - 'Big Key (Turtle Rock)': (False, False, 'BigKey', 0x93, 60, 'A big key to the pipe maze', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a big key to Turtle Rock'), - 'Compass (Turtle Rock)': (False, True, 'Compass', 0x83, 10, 'Now you can find Trinexx!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds boss again', 'a compass to Turtle Rock'), - 'Map (Turtle Rock)': (False, True, 'Map', 0x73, 20, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a map to Turtle Rock'), - 'Small Key (Ganons Tower)': (False, False, 'SmallKey', 0xAD, 40, 'A small key to the evil tower', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key to Ganon\'s Tower'), - 'Big Key (Ganons Tower)': (False, False, 'BigKey', 0x92, 60, 'A big key to the evil tower', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a big key to Ganon\'s Tower'), - 'Compass (Ganons Tower)': (False, True, 'Compass', 0x82, 10, 'Now you can find Agahnim!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds boss again', 'a compass to Ganon\'s Tower'), - 'Map (Ganons Tower)': (False, True, 'Map', 0x72, 10, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a map to Ganon\'s Tower'), - 'Small Key (Universal)': (False, True, None, 0xAF, 100, 'A small key for any door', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key'), + 'Small Key (Eastern Palace)': (False, False, 'SmallKey', 0xA2, 40, 'A small key to Armos Knights', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a Small Key to Eastern Palace'), + 'Big Key (Eastern Palace)': (False, False, 'BigKey', 0x9D, 60, 'A big key to Armos Knights', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a Big Key to Eastern Palace'), + 'Compass (Eastern Palace)': (False, True, 'Compass', 0x8D, 10, 'Now you can find the Armos Knights!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds boss again', 'a Compass to Eastern Palace'), + 'Map (Eastern Palace)': (False, True, 'Map', 0x7D, 20, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a Map to Eastern Palace'), + 'Small Key (Desert Palace)': (False, False, 'SmallKey', 0xA3, 40, 'A small key to the desert', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a Small Key to Desert Palace'), + 'Big Key (Desert Palace)': (False, False, 'BigKey', 0x9C, 60, 'A big key to the desert', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a Big Key to Desert Palace'), + 'Compass (Desert Palace)': (False, True, 'Compass', 0x8C, 10, 'Now you can find Lanmolas!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds boss again', 'a Compass to Desert Palace'), + 'Map (Desert Palace)': (False, True, 'Map', 0x7C, 20, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a Map to Desert Palace'), + 'Small Key (Tower of Hera)': (False, False, 'SmallKey', 0xAA, 40, 'A small key to Hera', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a Small Key to Tower of Hera'), + 'Big Key (Tower of Hera)': (False, False, 'BigKey', 0x95, 60, 'A big key to Hera', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a Big Key to Tower of Hera'), + 'Compass (Tower of Hera)': (False, True, 'Compass', 0x85, 10, 'Now you can find Moldorm!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds boss again', 'a Compass to Tower of Hera'), + 'Map (Tower of Hera)': (False, True, 'Map', 0x75, 20, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a Map to Tower of Hera'), + 'Small Key (Escape)': (False, False, 'SmallKey', 0xA0, 40, 'A small key to the castle', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a Small Key to Hyrule Castle'), + 'Big Key (Escape)': (False, False, 'BigKey', 0x9F, 60, 'A big key to the castle', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a Big Key to Hyrule Castle'), + 'Compass (Escape)': (False, True, 'Compass', 0x8F, 10, 'Now you can find no boss!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds null again', 'a Compass to Hyrule Castle'), + 'Map (Escape)': (False, True, 'Map', 0x7F, 10, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a Map to Hyrule Castle'), + 'Small Key (Agahnims Tower)': (False, False, 'SmallKey', 0xA4, 40, 'A small key to Agahnim', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a Small Key to Castle Tower'), + 'Big Key (Agahnims Tower)': (False, False, 'BigKey', 0x9B, 60, 'A big key to Agahnim', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a Big Key to Castle Tower'), + 'Compass (Agahnims Tower)': (False, True, 'Compass', 0x8B, 10, 'Now you can find Aga1!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds null again', 'a Compass to Castle Tower'), + 'Map (Agahnims Tower)': (False, True, 'Map', 0x7B, 10, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a Map to Castle Tower'), + 'Small Key (Palace of Darkness)': (False, False, 'SmallKey', 0xA6, 40, 'A small key to darkness', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a Small Key to Palace of Darkness'), + 'Big Key (Palace of Darkness)': (False, False, 'BigKey', 0x99, 60, 'A big key to darkness', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a Big Key to Palace of Darkness'), + 'Compass (Palace of Darkness)': (False, True, 'Compass', 0x89, 10, 'Now you can find Helmasaur King!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds boss again', 'a Compass to Palace of Darkness'), + 'Map (Palace of Darkness)': (False, True, 'Map', 0x79, 20, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a Map to Palace of Darkness'), + 'Small Key (Thieves Town)': (False, False, 'SmallKey', 0xAB, 40, 'A small key to thievery', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a Small Key to Thieves\' Town'), + 'Big Key (Thieves Town)': (False, False, 'BigKey', 0x94, 60, 'A big key to thievery', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a Big Key to Thieves\' Town'), + 'Compass (Thieves Town)': (False, True, 'Compass', 0x84, 10, 'Now you can find Blind!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds boss again', 'a Compass to Thieves\' Town'), + 'Map (Thieves Town)': (False, True, 'Map', 0x74, 20, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a Map to Thieves\' Town'), + 'Small Key (Skull Woods)': (False, False, 'SmallKey', 0xA8, 40, 'A small key to the woods', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a Small Key to Skull Woods'), + 'Big Key (Skull Woods)': (False, False, 'BigKey', 0x97, 60, 'A big key to the woods', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a Big Key to Skull Woods'), + 'Compass (Skull Woods)': (False, True, 'Compass', 0x87, 10, 'Now you can find Mothula!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds boss again', 'a Compass to Skull Woods'), + 'Map (Skull Woods)': (False, True, 'Map', 0x77, 20, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a Map to Skull Woods'), + 'Small Key (Swamp Palace)': (False, False, 'SmallKey', 0xA5, 40, 'A small key to the swamp', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a Small Key to Swamp Palace'), + 'Big Key (Swamp Palace)': (False, False, 'BigKey', 0x9A, 60, 'A big key to the swamp', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a Big Key to Swamp Palace'), + 'Compass (Swamp Palace)': (False, True, 'Compass', 0x8A, 10, 'Now you can find Arrghus!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds boss again', 'a Compass to Swamp Palace'), + 'Map (Swamp Palace)': (False, True, 'Map', 0x7A, 20, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a Map to Swamp Palace'), + 'Small Key (Ice Palace)': (False, False, 'SmallKey', 0xA9, 40, 'A small key to the iceberg', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a Small Key to Ice Palace'), + 'Big Key (Ice Palace)': (False, False, 'BigKey', 0x96, 60, 'A big key to the iceberg', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a Big Key to Ice Palace'), + 'Compass (Ice Palace)': (False, True, 'Compass', 0x86, 10, 'Now you can find Kholdstare!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds boss again', 'a Compass to Ice Palace'), + 'Map (Ice Palace)': (False, True, 'Map', 0x76, 20, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a Map to Ice Palace'), + 'Small Key (Misery Mire)': (False, False, 'SmallKey', 0xA7, 40, 'A small key to the mire', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a Small Key to Misery Mire'), + 'Big Key (Misery Mire)': (False, False, 'BigKey', 0x98, 60, 'A big key to the mire', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a Big Key to Misery Mire'), + 'Compass (Misery Mire)': (False, True, 'Compass', 0x88, 10, 'Now you can find Vitreous!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds boss again', 'a Compass to Misery Mire'), + 'Map (Misery Mire)': (False, True, 'Map', 0x78, 20, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a Map to Misery Mire'), + 'Small Key (Turtle Rock)': (False, False, 'SmallKey', 0xAC, 40, 'A small key to the pipe maze', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a Small Key to Turtle Rock'), + 'Big Key (Turtle Rock)': (False, False, 'BigKey', 0x93, 60, 'A big key to the pipe maze', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a Big Key to Turtle Rock'), + 'Compass (Turtle Rock)': (False, True, 'Compass', 0x83, 10, 'Now you can find Trinexx!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds boss again', 'a Compass to Turtle Rock'), + 'Map (Turtle Rock)': (False, True, 'Map', 0x73, 20, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a Map to Turtle Rock'), + 'Small Key (Ganons Tower)': (False, False, 'SmallKey', 0xAD, 40, 'A small key to the evil tower', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a Small Key to Ganon\'s Tower'), + 'Big Key (Ganons Tower)': (False, False, 'BigKey', 0x92, 60, 'A big key to the evil tower', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a Big Key to Ganon\'s Tower'), + 'Compass (Ganons Tower)': (False, True, 'Compass', 0x82, 10, 'Now you can find Agahnim!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds boss again', 'a Compass to Ganon\'s Tower'), + 'Map (Ganons Tower)': (False, True, 'Map', 0x72, 10, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a Map to Ganon\'s Tower'), + 'Small Key (Universal)': (False, True, None, 0xAF, 100, 'A small key for any door', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a Small Key'), 'Nothing': (False, False, None, 0x5A, 1, 'Some Hot Air', 'and the Nothing', 'the zen kid', 'outright theft', 'shroom theft', 'empty boy is bored again', 'nothing'), 'Bee Trap': (False, False, None, 0xB0, 50, 'We will sting your face a whole lot!', 'and the sting buddies', 'the beekeeper kid', 'insects for sale', 'shroom pollenation', 'bottle boy has mad bees again', 'friendship'), 'Red Potion': (False, False, None, 0x2E, 150, 'Hearty red goop!', 'and the red goo', 'the liquid kid', 'potion for sale', 'free samples', 'bottle boy has red goo again', 'a red potion'), diff --git a/Rom.py b/Rom.py index 1455f498..0237a0e8 100644 --- a/Rom.py +++ b/Rom.py @@ -33,7 +33,7 @@ from source.classes.SFX import randomize_sfx JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = 'a30bdf1086fa4304d3b422eef2587f5b' +RANDOMIZERBASEHASH = '0b849317ee6817b9e9b21a9b53fb0744' class JsonRom(object): diff --git a/data/base2current.bps b/data/base2current.bps index 5c83c8341c8ab95b8596f6a6152f6eff74da1bfe..af2a8d59701b0c06f023e325aae418215612d48e 100644 GIT binary patch delta 136 zcmV;30C)eH%mtgw1+YZ{1lLa}u!Bhfw@Cp3Y)BNg05AYQ0RI3!05yMq8-M_Rim|Mh z$w>h#DXRcD05$;s0JH!!07$3bk-Y#n063H2mkNNbFm(XD06YLN06PFXtGSmQN&%}3 qfk=~ogNZl*L6h#DKP*z05$;s06G9P07$3bk-Y#n063H2mkNN5Fm(VzlOchLI{-VYUVxV!N&%}2 oiAVtdlLUZ)L6^su)Jg$61&_C@YJj&DO9B2G2-V$01vFl7kD|dYvH$=8 From dcc20883c9a1a1de707a2cb74c671b1854a28ce9 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Mon, 7 Mar 2022 19:05:21 -0600 Subject: [PATCH 08/12] Fixed issue with mirror portal not spawning when entering OW from the DW in Crossed OWR --- Rom.py | 2 +- asm/owrando.asm | 12 ++++++++++-- data/base2current.bps | Bin 91675 -> 91686 bytes 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Rom.py b/Rom.py index 0237a0e8..7a88275e 100644 --- a/Rom.py +++ b/Rom.py @@ -33,7 +33,7 @@ from source.classes.SFX import randomize_sfx JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = '0b849317ee6817b9e9b21a9b53fb0744' +RANDOMIZERBASEHASH = '02fd6794fe7ffec6999f98d6a021d3b8' class JsonRom(object): diff --git a/asm/owrando.asm b/asm/owrando.asm index 06647861..99141495 100644 --- a/asm/owrando.asm +++ b/asm/owrando.asm @@ -48,11 +48,13 @@ jsl OWOldManSpeed ;org $09c957 ; <- 4c957 ;dw #$cb5f ; matches value on Central Bonk Rocks screen +; override world check when spawning mirror portal sprite in Crossed OWR +org $0283dc +jsl.l OWLightWorldOrCrossed + ;(replacing -> LDA $8A : AND.b #$40) org $00d8c4 ; < ? - Bank00.asm:4068 () jsl.l OWWorldCheck -org $0283dc ; < ? - Bank02.asm:816 () -jsl.l OWWorldCheck org $02aa36 ; < ? - Bank02.asm:6559 () jsl.l OWWorldCheck org $02aeca ; < ? - Bank02.asm:7257 () @@ -173,6 +175,12 @@ OWMirrorSpriteRestore: + rep #$30 : lda.w $04AC ; what we wrote over rtl } +OWLightWorldOrCrossed: +{ + lda.l OWMode+1 : and.b #!FLAG_OW_CROSSED : beq + + lda #$00 : rtl + + jsl OWWorldCheck : rtl +} OWFluteCancel: { diff --git a/data/base2current.bps b/data/base2current.bps index af2a8d59701b0c06f023e325aae418215612d48e..d8a00082629ac0be8d48d20d8fceef304dc9c531 100644 GIT binary patch delta 232 zcmV*1+YZ{1RP4^wWCP^0RgSEN&<`l1%)CmpAoaz11AIm0g1B#2#Ns^ zH)Mb$gpDHa-Jn2)-y%ekvzrOL0tFF?s$7ecUko6Vd<={k-H58{K!}|px0s+JBFUtd z9Y>n$6;_goy^|pgDG@7}iNUa-;Ef`|u%L8+n^K#zT@6(M0}BkOleG?N19Tv$vmy@x z`7EU=4~@?n!Z59@1fQ9y1E~OOA})xkYp(^9`?Uoko#_H=uLe+m$pP>Lk7}1i2mvPo i14ox`2mvGkJC~CP0Yd?3x7P>(JY5JfBj|i}>Z(8CL|F^~ delta 213 zcmV;`04o2c%mtgw1+YZ{1lLa}u%k%<0Rb+vN&<`l0;d(T+XE*A0`Z8m1PF=&5D_AR zB!rD3@7OhE{BDa{JA|lD8mK{f$>lId#iLH|) z4Ji|6QJ;yyu%O_LBEhhrbby- Date: Mon, 7 Mar 2022 19:05:46 -0600 Subject: [PATCH 09/12] More text updates --- Text.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Text.py b/Text.py index 23f4f999..b3a1856f 100644 --- a/Text.py +++ b/Text.py @@ -45,7 +45,7 @@ Uncle_texts = [ "I am leaving\nforever.\nGoodbye.", "Don't worry.\nI got this\ncovered.", "Race you to\nthe castle!", - "\n hi", + "\n Hi", "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?", @@ -98,8 +98,8 @@ Triforce_texts = [ "You have ended\nthe domination\nof Dr. Wily", " Thanks for\n playing!!!", "\n You Win!", - " Thank you!\n your quest\n is over.", - " A winner\n is\n you!", + " Thank you!\n Your quest\n is over.", + " A winner\n is you!", "\n WINNER!!", "\n I'm sorry\n\n but your\n princess is in\n another castle", "\n Success!", @@ -217,7 +217,7 @@ Ganon1_texts = [ "The Hemiptera\nor true bugs\nare an order\nof insects\ncovering 50k\nto 80k species\nlike aphids,\ncicadas, and\nshield bugs.", "Thanks for\ndropping in.\nThe first\npassengers\nin a hot\nair balloon\nwere a duck,\na sheep,\nand a rooster.", "You think you\nare so smart?\n\nI bet you\ndidn't know\nyou can't hum\nwhile holding\nyour nose\nclosed.", - "grumble,\n\ngrumble…\ngrumble,\n\ngrumble…\nSeriously, you\nwere supposed\nto bring food.", + "Grumble,\n\ngrumble…\nGrumble,\n\ngrumble…\nSeriously, you\nwere supposed\nto bring food.", "Join me hero,\nand I shall\nmake your face\nthe greatest\nin the Dark\nWorld!\n\nOr else you\nwill die!", "Why rule over\na desert full\nof stereotypes\nwhen I can\ncorrupt a\nworld into\npure evil and\nrule over\nthat instead?", "When I conquer\nthe Light\nWorld, I'll\nhold a parade\nof all my\nmonsters to\ndemonstrate my\nmight to the\npeople!", From b4c2e0df5f3d1b93bc23ecb84a3116f08ae4b33f Mon Sep 17 00:00:00 2001 From: codemann8 Date: Mon, 7 Mar 2022 20:12:47 -0600 Subject: [PATCH 10/12] Fixed mirror bonk issue incorrectly leaving a mirror portal behind --- Rom.py | 2 +- data/base2current.bps | Bin 91686 -> 91713 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Rom.py b/Rom.py index 7a88275e..d97f364a 100644 --- a/Rom.py +++ b/Rom.py @@ -33,7 +33,7 @@ from source.classes.SFX import randomize_sfx JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = '02fd6794fe7ffec6999f98d6a021d3b8' +RANDOMIZERBASEHASH = '497aac112b42e50ea66ce793340cdb18' class JsonRom(object): diff --git a/data/base2current.bps b/data/base2current.bps index d8a00082629ac0be8d48d20d8fceef304dc9c531..79f2f34a65d30e4b675c336632e5481e81c7a492 100644 GIT binary patch delta 241 zcmVhA0Tr_Y2v-CFC6ikWuo>})s_H<9 zog%lGpdup4q?R2=n(Gx-l8Mo?Bn|%hf19>}9G5|SmXi|}2Y}TOfCjJ1^M23>tlu722g*=0q_JOo#_Ip0FMSx ze`}UN2#BH31YEth3hn>`mjZ#M@C>E$$w1HssR5I!uPaBUmKO?%_3#R%peg>zmxc%d r7XoXvm!Aj$LIMz0x8n!_;sOR{fPsLg=eNrX0aIECmWkkI%;exoSz%^G delta 200 zcmV;(05|`^%mt>*1+YZ{1RP4^wWCP^0RgSEN&>hA0RgiE2v-CF5tCaCuo>Nms_H<9 zog%lGpdup4q?R2=n(Gx-l8L>uBn|%hR;#w9DG!a$8p1HGtOTE#sROA1Ya%X)s%x(W zll!#=BAw|1Yp(`Sf5`#x1dnQfnW+Ge22g)%mOu!Iq0j_ey|)VP00NhprSJ@;^2tEZ z2B`s)s;>i=lL!GN0z0*rx(ES60%%pY{s;l$0tP;SfqZ(6! C?o)XH From d23a2332fef4d626b9d342b7f7bb1aeb173cd8df Mon Sep 17 00:00:00 2001 From: codemann8 Date: Mon, 7 Mar 2022 20:20:05 -0600 Subject: [PATCH 11/12] Fixed mirror bonk issue incorrectly leaving a mirror portal behind --- asm/owrando.asm | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/asm/owrando.asm b/asm/owrando.asm index 99141495..00afe10c 100644 --- a/asm/owrando.asm +++ b/asm/owrando.asm @@ -170,9 +170,17 @@ OWMirrorSpriteMove: } OWMirrorSpriteRestore: { - lda.l OWMode+1 : and.b #!FLAG_OW_CROSSED : beq + - lda $1acf : and #$0f : sta $1acf - + rep #$30 : lda.w $04AC ; what we wrote over + lda.l OWMode+1 : and.b #!FLAG_OW_CROSSED : beq .return + lda InvertedMode : beq + + lda $7ef3ca : beq .return + bra .restorePortal + + lda $7ef3ca : bne .return + + .restorePortal + lda $1acf : and #$0f : sta $1acf + + .return + rep #$30 : lda.w $04AC ; what we wrote over rtl } OWLightWorldOrCrossed: From 6b028e5d4c065dd98bd9a1dd8dbc776c763b8d83 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Mon, 7 Mar 2022 20:20:20 -0600 Subject: [PATCH 12/12] Version bump 0.2.6.1 --- CHANGELOG.md | 6 ++++++ OverworldShuffle.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0d41ef2a..a28cb537 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +### 0.2.6.1 +- Fixed issue with mirror bonking deleting portal in Crossed OW +- Fixed issue with mirror portal not spawning when entering the OW from the DW, in Crossed OW +- Updated some text with proper capitalization/spacing +- Updated tournament winners text + ### 0.2.6.0 - New text engine font! - Fixed invisible Witch item bug diff --git a/OverworldShuffle.py b/OverworldShuffle.py index ed5e914b..b2dded81 100644 --- a/OverworldShuffle.py +++ b/OverworldShuffle.py @@ -5,7 +5,7 @@ from BaseClasses import OWEdge, WorldType, RegionType, Direction, Terrain, PolSl from Regions import mark_dark_world_regions, mark_light_world_regions from OWEdges import OWTileRegions, OWTileGroups, OWEdgeGroups, OWExitTypes, OpenStd, parallel_links, IsParallel -__version__ = '0.2.6.0-u' +__version__ = '0.2.6.1-u' def link_overworld(world, player): # setup mandatory connections