diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 2f2258812..cb7e6522a 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,7 +1,7 @@ [bumpversion] commit = True tag = False -current_version = 5.14.74 +current_version = 5.14.77 [bumpversion:file:version.py] search = version = "{current_version}" diff --git a/base-hack/src/instances/instances.c b/base-hack/src/instances/instances.c index 97009f874..271a9e5a9 100644 --- a/base-hack/src/instances/instances.c +++ b/base-hack/src/instances/instances.c @@ -1439,13 +1439,13 @@ int change_object_scripts(behaviour_data* behaviour_pointer, int id, int index, } } else if (behaviour_pointer->current_state == 1) { if (isPlayerInRangeOfObject(40)) { - if (getPlayerObjectDistance()) { + // if (getPlayerObjectDistance()) { // Patch out the code that makes sure the player is on the front side of the wrinkly door unkObjFunction2(id, 1, 1); PauseText = 1; spawnWrinklyWrapper(behaviour_pointer, id, kong, 0); playSFXFromObject(id, 19, 255, 127, 20, 0, 0.3f); behaviour_pointer->next_state = 2; - } + // } } } else if (behaviour_pointer->current_state == 2) { if (isWrinklySpawned()) { diff --git a/randomizer/Lists/DoorLocations.py b/randomizer/Lists/DoorLocations.py index 17dfc2f7a..609535734 100644 --- a/randomizer/Lists/DoorLocations.py +++ b/randomizer/Lists/DoorLocations.py @@ -723,6 +723,7 @@ def isBarrierRemoved(spoiler, barrier_id: RemovedBarriersSelected): location=[1498.8, 438.167, 299, 270], group=11, logic=lambda l: l.can_use_vines and l.climbing, + door_type=[DoorType.wrinkly], # Note: revert in 6.0 moveless=False, ), DoorData( @@ -2933,6 +2934,7 @@ def isBarrierRemoved(spoiler, barrier_id: RemovedBarriersSelected): rx=-54.458709399833616, rz=-2.2464418296590756, door_tags=[DoorTags.Season5Door], + door_type=[DoorType.wrinkly], # Note: revert in 6.0 group=4, ), DoorData( @@ -3332,6 +3334,7 @@ def isBarrierRemoved(spoiler, barrier_id: RemovedBarriersSelected): location=[481.998441919847, 1247.9489978887038, 1112.7816908753691, -68.0916195979442], rx=-32.23957607313838, door_tags=[DoorTags.Season5Door], + door_type=[DoorType.wrinkly], # Note: revert in 6.0 group=5, ), DoorData( diff --git a/randomizer/Settings.py b/randomizer/Settings.py index 2a083fd2e..89491f41b 100644 --- a/randomizer/Settings.py +++ b/randomizer/Settings.py @@ -1291,7 +1291,7 @@ def resolve_settings(self): self.wrinkly_location_rando = True self.dos_door_rando = False self.vanilla_door_rando = False - self.tns_location_rando = False # T&S shuffle not supported on this initial implementation. It could definitely be done later. + self.tns_location_rando = True # 5.0 Seasonal shuffle also needs to cull T&S doors in Factory for technical reasons # Dos' Doors requires this to be on - it's a variant on vanilla door shuffle if self.dos_door_rando: self.vanilla_door_rando = True diff --git a/randomizer/ShuffleDoors.py b/randomizer/ShuffleDoors.py index 5585926a7..91e8973f1 100644 --- a/randomizer/ShuffleDoors.py +++ b/randomizer/ShuffleDoors.py @@ -253,6 +253,7 @@ def ShuffleSpecificDoors(spoiler): elif spoiler.settings.season5_door_rando: ShuffleHintDoorSet(spoiler, DoorTags.Season5Door) shuffled_wrinkly = True + shuffled_tns = True # Temporary until we undo the Factory T&S culling # DK Portals may be shuffled independently of the specific door shuffles, and that's done here in the main shuffle method if spoiler.settings.dk_portal_location_rando_v2 != DKPortalRando.off: ShuffleDoors(spoiler, shuffled_wrinkly, shuffled_tns) @@ -382,6 +383,15 @@ def ShuffleHintDoorSet(spoiler, door_tag: DoorTags): "Crystal Caves": {}, "Creepy Castle": {}, } + human_portal_doors = { + "Jungle Japes": {}, + "Angry Aztec": {}, + "Frantic Factory": {}, + "Gloomy Galleon": {}, + "Fungi Forest": {}, + "Crystal Caves": {}, + "Creepy Castle": {}, + } shuffled_door_data = { Levels.JungleJapes: [], Levels.AngryAztec: [], @@ -413,11 +423,26 @@ def ShuffleHintDoorSet(spoiler, door_tag: DoorTags): region = spoiler.RegionList[selected_door.logicregion] region.locations.append(LocationLogic(doorLocation, lambda l, door=selected_door, lv=level: door.logic(l) and l.canUnlockHintDoor(lv))) spoiler.LocationList[doorLocation].name = f"{level_to_name[level]} Hint Door ({selected_door.name})" + # TEMPORARY: S5 will retain vanilla T&S doors with the exception of Factory, where all but 1 T&S is culled for technical reasons. + if door_tag == DoorTags.Season5Door: + vanilla_tns_indexes = [idx for idx, door in enumerate(door_locations[level]) if DoorTags.VanillaBoss in door.door_tags] + placed_tns_count = 0 + for door_index in vanilla_tns_indexes: + vanilla_tns = door_locations[level][door_index] + if level == Levels.FranticFactory and vanilla_tns.name != "Storage Room": + vanilla_tns.placed = DoorType.null + else: + placed_tns_count += 1 + vanilla_tns.assignPortal(spoiler) + human_portal_doors[level_list[level]]["T&S #" + str(placed_tns_count)] = vanilla_tns.name + shuffled_door_data[level].append((door_index, DoorType.boss)) # Track all touched doors in a variable and put it in the spoiler because changes to the static list do not save spoiler.shuffled_door_data = shuffled_door_data # Give human text to spoiler log if spoiler.settings.wrinkly_location_rando: spoiler.human_hint_doors = human_hint_doors + if spoiler.settings.tns_location_rando: + spoiler.human_portal_doors = human_portal_doors def ClearHintDoorLogic(spoiler): diff --git a/static/patches/shrink-dk64.bps b/static/patches/shrink-dk64.bps index 6c1bb926e..a8cf756c2 100644 Binary files a/static/patches/shrink-dk64.bps and b/static/patches/shrink-dk64.bps differ diff --git a/static/patches/symbols.json b/static/patches/symbols.json index de106c766..b9e9e9581 100644 --- a/static/patches/symbols.json +++ b/static/patches/symbols.json @@ -583,504 +583,504 @@ "portalwarpfix": 2153628536, "disablediddyrddoors": 2153628592, "change_object_scripts": 2153628716, - "setobjectopacity": 2153641032, - "hideobject": 2153641056, - "getmodeltwoitemfromactor": 2153641096, - "isbonus": 2153641180, - "checkcontrolstate": 2153641288, - "standingonm2object": 2153641368, - "checkslamlocation": 2153641416, - "playsfxcontainer": 2153641524, - "getpressedswitch": 2153641644, - "meloncrategenericcode": 2153641776, - "hashelmprogmove": 2153642516, - "canopenspecificblocker": 2153642744, - "canopenxblockers": 2153642840, - "abletousemonkeyport": 2153643040, - "islesmonkeyportcode": 2153643276, - "gethelmlobbygonereqkong": 2153643744, - "activategonepad": 2153643776, - "helmlobbygonelevercode": 2153643836, - "inrangeofgong": 2153645412, - "helmlobbygonegongcode": 2153645504, - "helmlobbygonecode": 2153646436, - "getpressedrandoswitch": 2153647584, - "randomgunswitchgenericcode": 2153647788, - "randominstrumentgenericcode": 2153647868, - "haschunkyphaseslam": 2153647960, - "spritecode": 2153648140, - "nothingcode": 2153648336, - "kongdropcode": 2153648348, - "potioncode": 2153648476, - "fairyduplicatecode": 2153648540, - "shopowneritemcode": 2153648608, - "missingshopownercode": 2153648700, - "crankycodehandler": 2153648904, - "funkycodehandler": 2153648952, - "candycodehandler": 2153649000, - "getmodeltwoscale": 2153649048, - "snidecodehandler": 2153649124, - "fakekeycode": 2153649172, - "fakegbcode": 2153649220, - "fakefairycode": 2153649268, - "mermaidcheck": 2153649316, - "fairyqueencutsceneinit": 2153649424, - "fairyqueencutscenecheck": 2153649496, - "fairyqueencheckspeedup": 2153649720, - "setuphook": 2153649760, - "checkkasplatspawnbitfield": 2153650536, - "isflaggedwatermelon": 2153650868, - "canitempersist": 2153650964, - "isapenabled": 2153651456, - "initap": 2153651476, - "initapcounter": 2153651544, - "saveapcounter": 2153651620, - "sendtrap": 2153651700, - "handlesentitem": 2153651720, - "sendtraplink": 2153652164, - "canreceiveitem": 2153652208, - "canreceiveshopkeeperitem": 2153652324, - "candie": 2153652376, - "handlearchipelagofeed": 2153652520, - "senddeath": 2153653092, - "displayapconnection": 2153653160, - "getcollisionsquare_new": 2153653864, - "writeitemscale": 2153653984, - "writeitemactorscale": 2153654176, - "getitemrequiredkong": 2153654216, - "iscollidingwithsphere": 2153654256, - "iscollidingwithcylinder": 2153654412, - "isvalidkongcollision": 2153654812, - "checkmodeltwoitemcollision": 2153654880, - "checkforvalidcollision": 2153655548, - "initactordefs": 2153656148, - "setactordamage": 2153656196, - "swapkremlingmodel": 2153656220, - "getbpcountstats": 2153656328, - "getturnedcount": 2153656424, - "turnedallin": 2153656524, - "hasturnedinatleast": 2153656560, - "getfirstemptysnidereward": 2153656632, - "fixed_bug_collision": 2153656756, - "fixed_klap_collision": 2153656780, - "fixed_dice_collision": 2153656876, - "fixed_scarab_collision": 2153657020, - "fixed_shockwave_collision": 2153657068, - "setenemydbpopulation": 2153657104, - "populateenemymapdata": 2153657116, - "getenemyitem": 2153657316, - "getenemyflag": 2153657352, - "wipeenemyspawnbitfield": 2153657400, - "setspawnbitfield": 2153657436, - "setspawnbitfieldfromflag": 2153657512, - "canspawnenemyreward": 2153657584, - "getrngwithinrange": 2153657704, - "rendersparkles": 2153657788, - "indicatecollectionstatus": 2153658052, - "fireballenemydeath": 2153658248, - "rulerenemydeath": 2153658324, - "tomatodeath": 2153658408, - "resetscreenflip": 2153659548, - "resettaganywhere": 2153659564, - "resetanimalbuttons": 2153659588, - "customdamagecode": 2153659596, - "trapplayer_new": 2153659736, - "renderspritesonplayer": 2153660012, - "wipereplenishibles": 2153660240, - "initicetrap": 2153660380, - "slippeelcode": 2153661144, - "reseticetrapbuttons": 2153661308, - "queueicetrap": 2153661372, - "isbannedtrapmap": 2153661400, - "canloadicetrap": 2153661472, - "handleicetrapbuttons": 2153661736, - "istrapmodel": 2153662140, - "cancelicetrapsong": 2153662168, - "playicetrapsong": 2153662216, - "callicetrap": 2153662272, - "refreshpads": 2153662856, - "ismodeltwotiedflag_new": 2153663180, - "displaymedaloverlay": 2153663776, - "banana_medal_check": 2153664672, - "gethalfmedalrequirement": 2153664740, - "banana_medal_acquisition": 2153664840, - "getflagindex_corrected": 2153665108, - "giveitemfromsend": 2153665164, - "giveitemfromkongdata": 2153665292, - "givefairyitem": 2153665340, - "iscavesbeetlereward": 2153665404, - "candanceskip": 2153665472, - "forcedance": 2153665764, - "balloonshoot": 2153665860, - "getitem": 2153665940, - "getobjectcollectability": 2153667436, - "iscollectable": 2153667876, - "handlemodeltwoopacity": 2153668188, - "getflagmappingdata": 2153668272, - "updateitemtotalshandler": 2153668368, - "giveitem": 2153671828, - "giveitemfrompacket": 2153673744, - "getitemcount_new": 2153673780, - "getkongownershipfromflag": 2153674692, - "givekongfromflag": 2153674752, - "hasflagmove": 2153674872, - "setflagmove": 2153674964, - "getshopflag": 2153675064, - "grabfileparameters_fileinfo": 2153675208, - "inititemrandopointer": 2153675312, - "readitemsfromfile": 2153675332, - "saveitemstofile": 2153675844, - "file_info_expansion": 2153676416, - "spawnactorwithflaghandler": 2153676844, - "spawnweirdreward": 2153676992, - "spawnweirdreward0": 2153677096, - "spawnbonusreward": 2153677188, - "spawnrewardatactor": 2153677344, - "spawnminecartreward": 2153677576, - "spawncrownreward": 2153677732, - "spawnbossreward": 2153677900, - "spawndirtpatchreward": 2153678228, - "spawncharspawneractor": 2153678452, - "meloncrateitemhandler": 2153678696, - "updatekegids": 2153679196, - "isvalidboulderobject": 2153679412, - "spawnboulderobject": 2153679536, - "renderbouldersparkles": 2153679724, - "handledynamicitemtext": 2153679972, - "gettextdata": 2153680056, - "getcharwidthmask": 2153680132, - "caves_beetle": 2153680180, - "aztec_beetle": 2153680212, - "renderget": 2153680248, - "wonarena": 2153680512, - "resolvebonuscontainer": 2153680536, - "warpoutofarenas": 2153680604, - "failtraining": 2153680728, - "warpoutoftraining": 2153680828, - "arenatagkongcode": 2153680996, - "arenaearlycompletioncheck": 2153681296, - "getminecartmayhemcoinreq": 2153681440, - "rendergetwrapper": 2153681508, - "wonminecartmayhem": 2153681612, - "initmmayhem": 2153681660, - "mayhem_minecart_size": 2153681816, - "updateskipcheck": 2153681860, - "iscutsceneskipped": 2153681916, - "cancelcutsceneinternals": 2153681960, - "clearqueuedcutscenefunctions": 2153682040, - "presstoskip": 2153682092, - "clearskipcache": 2153682220, - "pressskiphandler": 2153682252, - "updateskippablecutscenes": 2153682296, - "renderscreentransitioncheck": 2153682400, - "beaverextrahithandle": 2153682540, - "handlecrowntimerinternal": 2153682628, - "handlecrowntimer": 2153682888, - "klumpcrownhandler": 2153682964, - "handlebugenemy": 2153683028, - "kioskbugend": 2153683392, - "stomphandler": 2153683516, - "kioskbugcode": 2153683640, - "spawnenemydrops": 2153684564, - "loadexits": 2153685560, - "wipetrackercache": 2153685704, - "getenabledstate": 2153685804, - "updateenabledstates": 2153686096, - "inittracker": 2153686448, - "resettracker": 2153686460, - "modifytrackerimage": 2153686472, - "display_file_images": 2153687216, - "display_text": 2153687492, - "displayhash": 2153687988, - "correctkongfaces": 2153688340, - "wipefilemod": 2153688520, - "enterfileprogress": 2153688576, - "givecollectables": 2153688620, - "setalldefaultflags": 2153688812, - "startfile": 2153688912, - "testpasswordsequence": 2153689472, - "wipepassword": 2153689528, - "handlepassword": 2153689572, - "password_screen_code": 2153689760, - "password_screen_init": 2153690004, - "password_screen_gfx": 2153690148, - "file_progress_screen_code": 2153690572, - "displayinverted": 2153690800, - "setprevsavemap": 2153690872, - "quitgame": 2153690892, - "updateleveligt": 2153690920, - "changefileselectaction": 2153691228, - "changefileselectaction_0": 2153691508, - "pregiven_status": 2153691700, - "k_rool_text": 2153692600, - "getmemorychallengetype": 2153692900, - "isdarkworld": 2153692984, - "alterchunklighting": 2153693140, - "alterchunkdata": 2153693420, - "shinelight": 2153693556, - "isskyworld": 2153693764, - "displaynogeochunk": 2153693844, - "setfalldamageimmunity": 2153693964, - "handlefalldamageimmunity": 2153693976, - "transformbarrelimmunity": 2153694044, - "factoryshedfallimmunity": 2153694072, - "falldamagewrapper": 2153694108, - "spawnstalactite": 2153694156, - "spawnkroollankyballoon": 2153694392, - "popexistingballoon": 2153694488, - "handlekrooldirecting": 2153694576, - "inchitcounter": 2153694864, - "parsecontrollerinput": 2153694920, - "hitlessdeath": 2153695056, - "sethardpathspeed": 2153695144, - "cansavehelmhurry": 2153695268, - "addhelmtime": 2153695392, - "checktotalcache": 2153695472, - "finishhelmhurry": 2153695532, - "inithelmhurry": 2153695584, - "savehelmhurrytime": 2153695708, - "inithuddirection": 2153695852, - "allocatehud": 2153695984, - "gethudsprite_complex": 2153696904, - "updatebarriercounts": 2153697212, - "displaybarrierhud": 2153697360, - "canusedpad": 2153697420, - "drawdpad": 2153697672, - "handledpadfunctionality": 2153698604, - "item_db": 2153700048, - "adjustgunbone": 2153701236, - "getcutscenemodeltableindex": 2153701384, - "fixcutscenemodels": 2153701436, - "adjustanimationtables": 2153701660, - "krushaslide": 2153702292, - "adaptkrushazbanimation_punchostand": 2153702376, - "adaptkrushazbanimation_charge": 2153702656, - "diddyswimfix": 2153702884, - "minecartjumpfix": 2153703044, - "minecartjumpfix_0": 2153703064, - "setkrushaammocolor": 2153703136, - "orangeguncode": 2153703260, - "gethinttextindex": 2153704576, - "isgoodtextbox": 2153704796, - "getmovehint": 2153704908, - "purchase_hint_text_items": 2153705092, - "resetdisplayedmusic": 2153705332, - "speedupmusic": 2153705344, - "initsongdisplay": 2153705764, - "detectsongchange": 2153706084, - "displaysongnamehandler": 2153706424, - "playmusicdontstop": 2153706956, - "curseremoved": 2153707100, - "haspermalossgrace": 2153707112, - "determinekongunlock": 2153707140, - "unlockkongpermaloss": 2153707304, - "givekongmoves": 2153707412, - "isdeathstate": 2153707480, - "kong_has_died": 2153707520, - "determinestartkong_permalossmode": 2153708028, - "transitionkong": 2153708180, - "fixgracecheese": 2153708472, - "changekongontransition_permaloss": 2153708644, - "forcebosskong": 2153708740, - "preventbosscheese": 2153708948, - "issharedmove": 2153709028, - "getcounteritem": 2153709268, - "getmovecountinshop": 2153709316, - "wipecounterimagecache": 2153709572, - "loadinternaltexture": 2153709620, - "loadfonttexture_counter": 2153709784, - "updatecounterdisplay": 2153709948, - "getactormodeltwodist": 2153710104, - "getclosestshop": 2153710232, - "getshopscale": 2153710568, - "newcountercode": 2153710700, - "handlefootprogress": 2153712188, - "setkongigt": 2153712640, - "updatepercentagekongstat": 2153712692, - "updatetagstat": 2153712952, - "updatefairystat": 2153713052, - "updateenemykillstat": 2153713088, - "createendseqcreditsfile": 2153713292, - "displaynumberonobject": 2153714124, - "shiftbrokenjapesportal": 2153714320, - "displaynumberontns": 2153714432, - "writewti": 2153714940, - "handle_wti": 2153714980, - "warptoisles": 2153715152, - "beatgame": 2153715256, - "finalizebeatgame": 2153715332, - "hasbeatendkrapwincon": 2153715432, - "canaccesswincondition": 2153715668, - "checkseedvictory": 2153716056, - "winrabbitseed": 2153716132, - "safeguardrabbitreward": 2153716160, - "checkvictory_flaghook": 2153716220, - "issnapenemyinrange": 2153716248, - "getpkmnsnapdata": 2153716732, - "pokemonsnapmode": 2153716852, - "arcadeexit": 2153717244, - "determinearcadelevel": 2153717456, - "handlearcadevictory": 2153717648, - "spawnoverlaytext": 2153717824, - "overlay_mod_bonus": 2153718184, - "overlay_mod_boss": 2153718440, - "overlay_changes": 2153718696, - "parsecutscenedata": 2153718920, - "loadjetpacsprites_handler": 2153719364, - "exitjetpac": 2153719432, - "completejetpac": 2153719468, - "patchcrankycode": 2153719524, - "overlay_mod_menu": 2153719672, - "overlay_mod_race": 2153719916, - "updatepausescreenwheel": 2153719972, - "newpausespritecode": 2153720052, - "totalssprite": 2153720752, - "checkssprite": 2153720760, - "initcarousel_onpause": 2153720768, - "pause_items": 2153720988, - "initprogressivetimer": 2153721200, - "renderprogressivesprite": 2153721216, - "playprogressiveding": 2153721292, - "inithints": 2153721320, - "wipehintcache": 2153721660, - "drawhinttext": 2153721736, - "drawsplitstring": 2153722264, - "gethintrequirement": 2153722580, - "handleprogressiveindicator": 2153722620, - "resetprogressive": 2153722804, - "displaycbcount": 2153722824, - "gethintitemregion": 2153723020, - "showhint": 2153723044, - "displaybubble": 2153723164, - "inithintflags": 2153723324, - "initdimtimer": 2153723496, - "renderdimsprite": 2153723512, - "checkdimcache": 2153723588, - "getitemname": 2153723852, - "drawhintscreen": 2153723992, - "drawitemlocationscreen": 2153724812, - "initlockout": 2153725592, - "handlehintscreenlockout": 2153725748, - "item_name_plural": 2153726212, - "item_names": 2153726228, - "itemloc_flags": 2153726312, - "unknown_hints": 2153727392, - "hint_region_names": 2153727452, - "getlevelpoints": 2153728996, - "printleveligt": 2153729172, - "getlevelofdropsanity": 2153729688, - "inititemcheckdenominators": 2153729732, - "checkitemdb": 2153730080, - "handlecshifting": 2153731140, - "pausescreen3and4header": 2153731248, - "drawtextpointers": 2153731820, - "pausescreen3and4itemname": 2153731972, - "pausescreen3and4counter": 2153732120, - "changepausescreen": 2153732372, - "changeselectedlevel": 2153732516, - "updatefilevariables": 2153732600, - "handleoutofcounters": 2153732636, - "exitmap": 2153732816, - "sethintregion": 2153734244, - "storehintregion": 2153735120, - "gethintregiontext": 2153735228, - "displayhintregion": 2153735360, - "getworldoffset": 2153736100, - "setblockerhead": 2153736148, - "displayblockeritemonhud": 2153736272, - "getcountofblockerrequireditem": 2153736344, - "displaycountonblockerteeth": 2153736388, - "cc_enable_drunky": 2153736480, - "cc_disable_drunky": 2153736544, - "cc_allower_rockfall": 2153736588, - "cc_allower_balloon": 2153736604, - "cc_allower_backflip": 2153736656, - "cc_enabler_ice": 2153736704, - "cc_disabler_ice": 2153736728, - "cc_allower_mini": 2153736772, - "cc_allower_boulder": 2153736816, - "cc_allower_crate": 2153736868, - "cc_disabler_paper": 2153736916, - "cc_allower_time": 2153737008, - "cc_allower_water": 2153737056, - "cc_enabler_icetrap": 2153737112, - "cc_allower_icetrap": 2153737148, - "cc_enabler_warptorap": 2153737200, - "cc_disabler_warptorap": 2153737284, - "displaygetoutreticle": 2153737412, - "cc_enable_getout": 2153737736, - "cc_enabler_doabackflip": 2153737924, - "cc_enabler_rockfall": 2153738008, - "cc_enabler_boulder": 2153738264, - "cc_enabler_crate": 2153738340, - "cc_enabler_balloon": 2153738416, - "cc_allower_spawnkop": 2153738552, - "cc_enabler_spawnkop": 2153738640, - "cc_enabler_slip": 2153738808, - "cc_allower_animals": 2153738880, - "cc_allower_tag": 2153738940, - "cc_enabler_tag": 2153739048, - "cc_enabler_animals": 2153739244, - "cc_disabler_animals": 2153739492, - "cc_enabler_paper": 2153739564, - "cc_enabler_time": 2153739740, - "cc_enabler_water": 2153739976, - "cc_allower_generic": 2153740236, - "handlegamemodewrapper": 2153740392, - "skipdktv": 2153740464, - "fakegetout": 2153740548, - "dummyguardcode": 2153741048, - "cc_setscale": 2153741292, - "cc_enabler_mini": 2153741340, - "cc_disabler_mini": 2153741412, - "cc_effect_handler": 2153741424, - "blastwarpgetter": 2153742504, - "blastwarphandler": 2153742592, - "blast_entrances": 2153742720, - "replacement_lobby_exits_array": 2153742744, - "replacement_lobbies_array": 2153742764, - "swap_ending_cutscene_model": 2153742784, - "completeboss": 2153743016, - "fixkroolkong": 2153743728, - "handlekroolsaveprogress": 2153743828, - "writehudamount": 2153744320, - "coinhudelements": 2153744488, - "displaymovetext": 2153744532, - "movetransplant": 2153744844, - "isshopempty": 2153744912, - "getinstrumentlevel": 2153745020, - "getprice": 2153745076, - "getnextmovepurchase": 2153745228, - "purchasemove": 2153745568, - "checkfirstmovepurchase": 2153746184, - "purchasefirstmovehandler": 2153746340, - "setlocation": 2153746408, - "setlocationstatus": 2153746436, - "getlocationstatus": 2153746672, - "getnextmovetext": 2153746700, - "displaybfimovetext": 2153749132, - "showpostmovetext": 2153749260, - "instrumentupgnames": 2153750520, - "instrumentnames": 2153750528, - "ammobeltnames": 2153750536, - "gunupgnames": 2153750540, - "gunnames": 2153750544, - "specialmovesnames": 2153750552, - "simianslamnames": 2153750592, - "destroybonus": 2153750600, - "completebonus": 2153750632, - "helminit": 2153750736, - "helmbarrelcode": 2153751548, - "crowndoorcheck": 2153751916, - "coindoorcheck": 2153751928, - "unlockmoves": 2153752044, - "starting_item_data": 2153752468, - "auto_turn_keys": 2153752532, - "qualityoflife_shorteners": 2153752664, - "fastwarp": 2153752756, - "fastwarp_playmusic": 2153752788, - "fastwarpshockwavefix": 2153752816, - "clearvulturecutscene": 2153752920, + "setobjectopacity": 2153641016, + "hideobject": 2153641040, + "getmodeltwoitemfromactor": 2153641080, + "isbonus": 2153641164, + "checkcontrolstate": 2153641272, + "standingonm2object": 2153641352, + "checkslamlocation": 2153641400, + "playsfxcontainer": 2153641508, + "getpressedswitch": 2153641628, + "meloncrategenericcode": 2153641760, + "hashelmprogmove": 2153642500, + "canopenspecificblocker": 2153642728, + "canopenxblockers": 2153642824, + "abletousemonkeyport": 2153643024, + "islesmonkeyportcode": 2153643260, + "gethelmlobbygonereqkong": 2153643728, + "activategonepad": 2153643760, + "helmlobbygonelevercode": 2153643820, + "inrangeofgong": 2153645396, + "helmlobbygonegongcode": 2153645488, + "helmlobbygonecode": 2153646420, + "getpressedrandoswitch": 2153647568, + "randomgunswitchgenericcode": 2153647772, + "randominstrumentgenericcode": 2153647852, + "haschunkyphaseslam": 2153647944, + "spritecode": 2153648124, + "nothingcode": 2153648320, + "kongdropcode": 2153648332, + "potioncode": 2153648460, + "fairyduplicatecode": 2153648524, + "shopowneritemcode": 2153648592, + "missingshopownercode": 2153648684, + "crankycodehandler": 2153648888, + "funkycodehandler": 2153648936, + "candycodehandler": 2153648984, + "getmodeltwoscale": 2153649032, + "snidecodehandler": 2153649108, + "fakekeycode": 2153649156, + "fakegbcode": 2153649204, + "fakefairycode": 2153649252, + "mermaidcheck": 2153649300, + "fairyqueencutsceneinit": 2153649408, + "fairyqueencutscenecheck": 2153649480, + "fairyqueencheckspeedup": 2153649704, + "setuphook": 2153649744, + "checkkasplatspawnbitfield": 2153650520, + "isflaggedwatermelon": 2153650852, + "canitempersist": 2153650948, + "isapenabled": 2153651440, + "initap": 2153651460, + "initapcounter": 2153651528, + "saveapcounter": 2153651604, + "sendtrap": 2153651684, + "handlesentitem": 2153651704, + "sendtraplink": 2153652148, + "canreceiveitem": 2153652192, + "canreceiveshopkeeperitem": 2153652308, + "candie": 2153652360, + "handlearchipelagofeed": 2153652504, + "senddeath": 2153653076, + "displayapconnection": 2153653144, + "getcollisionsquare_new": 2153653848, + "writeitemscale": 2153653968, + "writeitemactorscale": 2153654160, + "getitemrequiredkong": 2153654200, + "iscollidingwithsphere": 2153654240, + "iscollidingwithcylinder": 2153654396, + "isvalidkongcollision": 2153654796, + "checkmodeltwoitemcollision": 2153654864, + "checkforvalidcollision": 2153655532, + "initactordefs": 2153656132, + "setactordamage": 2153656180, + "swapkremlingmodel": 2153656204, + "getbpcountstats": 2153656312, + "getturnedcount": 2153656408, + "turnedallin": 2153656508, + "hasturnedinatleast": 2153656544, + "getfirstemptysnidereward": 2153656616, + "fixed_bug_collision": 2153656740, + "fixed_klap_collision": 2153656764, + "fixed_dice_collision": 2153656860, + "fixed_scarab_collision": 2153657004, + "fixed_shockwave_collision": 2153657052, + "setenemydbpopulation": 2153657088, + "populateenemymapdata": 2153657100, + "getenemyitem": 2153657300, + "getenemyflag": 2153657336, + "wipeenemyspawnbitfield": 2153657384, + "setspawnbitfield": 2153657420, + "setspawnbitfieldfromflag": 2153657496, + "canspawnenemyreward": 2153657568, + "getrngwithinrange": 2153657688, + "rendersparkles": 2153657772, + "indicatecollectionstatus": 2153658036, + "fireballenemydeath": 2153658232, + "rulerenemydeath": 2153658308, + "tomatodeath": 2153658392, + "resetscreenflip": 2153659532, + "resettaganywhere": 2153659548, + "resetanimalbuttons": 2153659572, + "customdamagecode": 2153659580, + "trapplayer_new": 2153659720, + "renderspritesonplayer": 2153659996, + "wipereplenishibles": 2153660224, + "initicetrap": 2153660364, + "slippeelcode": 2153661128, + "reseticetrapbuttons": 2153661292, + "queueicetrap": 2153661356, + "isbannedtrapmap": 2153661384, + "canloadicetrap": 2153661456, + "handleicetrapbuttons": 2153661720, + "istrapmodel": 2153662124, + "cancelicetrapsong": 2153662152, + "playicetrapsong": 2153662200, + "callicetrap": 2153662256, + "refreshpads": 2153662840, + "ismodeltwotiedflag_new": 2153663164, + "displaymedaloverlay": 2153663760, + "banana_medal_check": 2153664656, + "gethalfmedalrequirement": 2153664724, + "banana_medal_acquisition": 2153664824, + "getflagindex_corrected": 2153665092, + "giveitemfromsend": 2153665148, + "giveitemfromkongdata": 2153665276, + "givefairyitem": 2153665324, + "iscavesbeetlereward": 2153665388, + "candanceskip": 2153665456, + "forcedance": 2153665748, + "balloonshoot": 2153665844, + "getitem": 2153665924, + "getobjectcollectability": 2153667420, + "iscollectable": 2153667860, + "handlemodeltwoopacity": 2153668172, + "getflagmappingdata": 2153668256, + "updateitemtotalshandler": 2153668352, + "giveitem": 2153671812, + "giveitemfrompacket": 2153673728, + "getitemcount_new": 2153673764, + "getkongownershipfromflag": 2153674676, + "givekongfromflag": 2153674736, + "hasflagmove": 2153674856, + "setflagmove": 2153674948, + "getshopflag": 2153675048, + "grabfileparameters_fileinfo": 2153675192, + "inititemrandopointer": 2153675296, + "readitemsfromfile": 2153675316, + "saveitemstofile": 2153675828, + "file_info_expansion": 2153676400, + "spawnactorwithflaghandler": 2153676828, + "spawnweirdreward": 2153676976, + "spawnweirdreward0": 2153677080, + "spawnbonusreward": 2153677172, + "spawnrewardatactor": 2153677328, + "spawnminecartreward": 2153677560, + "spawncrownreward": 2153677716, + "spawnbossreward": 2153677884, + "spawndirtpatchreward": 2153678212, + "spawncharspawneractor": 2153678436, + "meloncrateitemhandler": 2153678680, + "updatekegids": 2153679180, + "isvalidboulderobject": 2153679396, + "spawnboulderobject": 2153679520, + "renderbouldersparkles": 2153679708, + "handledynamicitemtext": 2153679956, + "gettextdata": 2153680040, + "getcharwidthmask": 2153680116, + "caves_beetle": 2153680164, + "aztec_beetle": 2153680196, + "renderget": 2153680232, + "wonarena": 2153680496, + "resolvebonuscontainer": 2153680520, + "warpoutofarenas": 2153680588, + "failtraining": 2153680712, + "warpoutoftraining": 2153680812, + "arenatagkongcode": 2153680980, + "arenaearlycompletioncheck": 2153681280, + "getminecartmayhemcoinreq": 2153681424, + "rendergetwrapper": 2153681492, + "wonminecartmayhem": 2153681596, + "initmmayhem": 2153681644, + "mayhem_minecart_size": 2153681800, + "updateskipcheck": 2153681844, + "iscutsceneskipped": 2153681900, + "cancelcutsceneinternals": 2153681944, + "clearqueuedcutscenefunctions": 2153682024, + "presstoskip": 2153682076, + "clearskipcache": 2153682204, + "pressskiphandler": 2153682236, + "updateskippablecutscenes": 2153682280, + "renderscreentransitioncheck": 2153682384, + "beaverextrahithandle": 2153682524, + "handlecrowntimerinternal": 2153682612, + "handlecrowntimer": 2153682872, + "klumpcrownhandler": 2153682948, + "handlebugenemy": 2153683012, + "kioskbugend": 2153683376, + "stomphandler": 2153683500, + "kioskbugcode": 2153683624, + "spawnenemydrops": 2153684548, + "loadexits": 2153685544, + "wipetrackercache": 2153685688, + "getenabledstate": 2153685788, + "updateenabledstates": 2153686080, + "inittracker": 2153686432, + "resettracker": 2153686444, + "modifytrackerimage": 2153686456, + "display_file_images": 2153687200, + "display_text": 2153687476, + "displayhash": 2153687972, + "correctkongfaces": 2153688324, + "wipefilemod": 2153688504, + "enterfileprogress": 2153688560, + "givecollectables": 2153688604, + "setalldefaultflags": 2153688796, + "startfile": 2153688896, + "testpasswordsequence": 2153689456, + "wipepassword": 2153689512, + "handlepassword": 2153689556, + "password_screen_code": 2153689744, + "password_screen_init": 2153689988, + "password_screen_gfx": 2153690132, + "file_progress_screen_code": 2153690556, + "displayinverted": 2153690784, + "setprevsavemap": 2153690856, + "quitgame": 2153690876, + "updateleveligt": 2153690904, + "changefileselectaction": 2153691212, + "changefileselectaction_0": 2153691492, + "pregiven_status": 2153691684, + "k_rool_text": 2153692584, + "getmemorychallengetype": 2153692884, + "isdarkworld": 2153692968, + "alterchunklighting": 2153693124, + "alterchunkdata": 2153693404, + "shinelight": 2153693540, + "isskyworld": 2153693748, + "displaynogeochunk": 2153693828, + "setfalldamageimmunity": 2153693948, + "handlefalldamageimmunity": 2153693960, + "transformbarrelimmunity": 2153694028, + "factoryshedfallimmunity": 2153694056, + "falldamagewrapper": 2153694092, + "spawnstalactite": 2153694140, + "spawnkroollankyballoon": 2153694376, + "popexistingballoon": 2153694472, + "handlekrooldirecting": 2153694560, + "inchitcounter": 2153694848, + "parsecontrollerinput": 2153694904, + "hitlessdeath": 2153695040, + "sethardpathspeed": 2153695128, + "cansavehelmhurry": 2153695252, + "addhelmtime": 2153695376, + "checktotalcache": 2153695456, + "finishhelmhurry": 2153695516, + "inithelmhurry": 2153695568, + "savehelmhurrytime": 2153695692, + "inithuddirection": 2153695836, + "allocatehud": 2153695968, + "gethudsprite_complex": 2153696888, + "updatebarriercounts": 2153697196, + "displaybarrierhud": 2153697344, + "canusedpad": 2153697404, + "drawdpad": 2153697656, + "handledpadfunctionality": 2153698588, + "item_db": 2153700032, + "adjustgunbone": 2153701220, + "getcutscenemodeltableindex": 2153701368, + "fixcutscenemodels": 2153701420, + "adjustanimationtables": 2153701644, + "krushaslide": 2153702276, + "adaptkrushazbanimation_punchostand": 2153702360, + "adaptkrushazbanimation_charge": 2153702640, + "diddyswimfix": 2153702868, + "minecartjumpfix": 2153703028, + "minecartjumpfix_0": 2153703048, + "setkrushaammocolor": 2153703120, + "orangeguncode": 2153703244, + "gethinttextindex": 2153704560, + "isgoodtextbox": 2153704780, + "getmovehint": 2153704892, + "purchase_hint_text_items": 2153705076, + "resetdisplayedmusic": 2153705316, + "speedupmusic": 2153705328, + "initsongdisplay": 2153705748, + "detectsongchange": 2153706068, + "displaysongnamehandler": 2153706408, + "playmusicdontstop": 2153706940, + "curseremoved": 2153707084, + "haspermalossgrace": 2153707096, + "determinekongunlock": 2153707124, + "unlockkongpermaloss": 2153707288, + "givekongmoves": 2153707396, + "isdeathstate": 2153707464, + "kong_has_died": 2153707504, + "determinestartkong_permalossmode": 2153708012, + "transitionkong": 2153708164, + "fixgracecheese": 2153708456, + "changekongontransition_permaloss": 2153708628, + "forcebosskong": 2153708724, + "preventbosscheese": 2153708932, + "issharedmove": 2153709012, + "getcounteritem": 2153709252, + "getmovecountinshop": 2153709300, + "wipecounterimagecache": 2153709556, + "loadinternaltexture": 2153709604, + "loadfonttexture_counter": 2153709768, + "updatecounterdisplay": 2153709932, + "getactormodeltwodist": 2153710088, + "getclosestshop": 2153710216, + "getshopscale": 2153710552, + "newcountercode": 2153710684, + "handlefootprogress": 2153712172, + "setkongigt": 2153712624, + "updatepercentagekongstat": 2153712676, + "updatetagstat": 2153712936, + "updatefairystat": 2153713036, + "updateenemykillstat": 2153713072, + "createendseqcreditsfile": 2153713276, + "displaynumberonobject": 2153714108, + "shiftbrokenjapesportal": 2153714304, + "displaynumberontns": 2153714416, + "writewti": 2153714924, + "handle_wti": 2153714964, + "warptoisles": 2153715136, + "beatgame": 2153715240, + "finalizebeatgame": 2153715316, + "hasbeatendkrapwincon": 2153715416, + "canaccesswincondition": 2153715652, + "checkseedvictory": 2153716040, + "winrabbitseed": 2153716116, + "safeguardrabbitreward": 2153716144, + "checkvictory_flaghook": 2153716204, + "issnapenemyinrange": 2153716232, + "getpkmnsnapdata": 2153716716, + "pokemonsnapmode": 2153716836, + "arcadeexit": 2153717228, + "determinearcadelevel": 2153717440, + "handlearcadevictory": 2153717632, + "spawnoverlaytext": 2153717808, + "overlay_mod_bonus": 2153718168, + "overlay_mod_boss": 2153718424, + "overlay_changes": 2153718680, + "parsecutscenedata": 2153718904, + "loadjetpacsprites_handler": 2153719348, + "exitjetpac": 2153719416, + "completejetpac": 2153719452, + "patchcrankycode": 2153719508, + "overlay_mod_menu": 2153719656, + "overlay_mod_race": 2153719900, + "updatepausescreenwheel": 2153719956, + "newpausespritecode": 2153720036, + "totalssprite": 2153720736, + "checkssprite": 2153720744, + "initcarousel_onpause": 2153720752, + "pause_items": 2153720972, + "initprogressivetimer": 2153721184, + "renderprogressivesprite": 2153721200, + "playprogressiveding": 2153721276, + "inithints": 2153721304, + "wipehintcache": 2153721644, + "drawhinttext": 2153721720, + "drawsplitstring": 2153722248, + "gethintrequirement": 2153722564, + "handleprogressiveindicator": 2153722604, + "resetprogressive": 2153722788, + "displaycbcount": 2153722808, + "gethintitemregion": 2153723004, + "showhint": 2153723028, + "displaybubble": 2153723148, + "inithintflags": 2153723308, + "initdimtimer": 2153723480, + "renderdimsprite": 2153723496, + "checkdimcache": 2153723572, + "getitemname": 2153723836, + "drawhintscreen": 2153723976, + "drawitemlocationscreen": 2153724796, + "initlockout": 2153725576, + "handlehintscreenlockout": 2153725732, + "item_name_plural": 2153726196, + "item_names": 2153726212, + "itemloc_flags": 2153726296, + "unknown_hints": 2153727376, + "hint_region_names": 2153727436, + "getlevelpoints": 2153728980, + "printleveligt": 2153729156, + "getlevelofdropsanity": 2153729672, + "inititemcheckdenominators": 2153729716, + "checkitemdb": 2153730064, + "handlecshifting": 2153731124, + "pausescreen3and4header": 2153731232, + "drawtextpointers": 2153731804, + "pausescreen3and4itemname": 2153731956, + "pausescreen3and4counter": 2153732104, + "changepausescreen": 2153732356, + "changeselectedlevel": 2153732500, + "updatefilevariables": 2153732584, + "handleoutofcounters": 2153732620, + "exitmap": 2153732800, + "sethintregion": 2153734228, + "storehintregion": 2153735104, + "gethintregiontext": 2153735212, + "displayhintregion": 2153735344, + "getworldoffset": 2153736084, + "setblockerhead": 2153736132, + "displayblockeritemonhud": 2153736256, + "getcountofblockerrequireditem": 2153736328, + "displaycountonblockerteeth": 2153736372, + "cc_enable_drunky": 2153736464, + "cc_disable_drunky": 2153736528, + "cc_allower_rockfall": 2153736572, + "cc_allower_balloon": 2153736588, + "cc_allower_backflip": 2153736640, + "cc_enabler_ice": 2153736688, + "cc_disabler_ice": 2153736712, + "cc_allower_mini": 2153736756, + "cc_allower_boulder": 2153736800, + "cc_allower_crate": 2153736852, + "cc_disabler_paper": 2153736900, + "cc_allower_time": 2153736992, + "cc_allower_water": 2153737040, + "cc_enabler_icetrap": 2153737096, + "cc_allower_icetrap": 2153737132, + "cc_enabler_warptorap": 2153737184, + "cc_disabler_warptorap": 2153737268, + "displaygetoutreticle": 2153737396, + "cc_enable_getout": 2153737720, + "cc_enabler_doabackflip": 2153737908, + "cc_enabler_rockfall": 2153737992, + "cc_enabler_boulder": 2153738248, + "cc_enabler_crate": 2153738324, + "cc_enabler_balloon": 2153738400, + "cc_allower_spawnkop": 2153738536, + "cc_enabler_spawnkop": 2153738624, + "cc_enabler_slip": 2153738792, + "cc_allower_animals": 2153738864, + "cc_allower_tag": 2153738924, + "cc_enabler_tag": 2153739032, + "cc_enabler_animals": 2153739228, + "cc_disabler_animals": 2153739476, + "cc_enabler_paper": 2153739548, + "cc_enabler_time": 2153739724, + "cc_enabler_water": 2153739960, + "cc_allower_generic": 2153740220, + "handlegamemodewrapper": 2153740376, + "skipdktv": 2153740448, + "fakegetout": 2153740532, + "dummyguardcode": 2153741032, + "cc_setscale": 2153741276, + "cc_enabler_mini": 2153741324, + "cc_disabler_mini": 2153741396, + "cc_effect_handler": 2153741408, + "blastwarpgetter": 2153742488, + "blastwarphandler": 2153742576, + "blast_entrances": 2153742704, + "replacement_lobby_exits_array": 2153742728, + "replacement_lobbies_array": 2153742748, + "swap_ending_cutscene_model": 2153742768, + "completeboss": 2153743000, + "fixkroolkong": 2153743712, + "handlekroolsaveprogress": 2153743812, + "writehudamount": 2153744304, + "coinhudelements": 2153744472, + "displaymovetext": 2153744516, + "movetransplant": 2153744828, + "isshopempty": 2153744896, + "getinstrumentlevel": 2153745004, + "getprice": 2153745060, + "getnextmovepurchase": 2153745212, + "purchasemove": 2153745552, + "checkfirstmovepurchase": 2153746168, + "purchasefirstmovehandler": 2153746324, + "setlocation": 2153746392, + "setlocationstatus": 2153746420, + "getlocationstatus": 2153746656, + "getnextmovetext": 2153746684, + "displaybfimovetext": 2153749116, + "showpostmovetext": 2153749244, + "instrumentupgnames": 2153750504, + "instrumentnames": 2153750512, + "ammobeltnames": 2153750520, + "gunupgnames": 2153750524, + "gunnames": 2153750528, + "specialmovesnames": 2153750536, + "simianslamnames": 2153750576, + "destroybonus": 2153750584, + "completebonus": 2153750616, + "helminit": 2153750720, + "helmbarrelcode": 2153751532, + "crowndoorcheck": 2153751900, + "coindoorcheck": 2153751912, + "unlockmoves": 2153752028, + "starting_item_data": 2153752452, + "auto_turn_keys": 2153752516, + "qualityoflife_shorteners": 2153752648, + "fastwarp": 2153752740, + "fastwarp_playmusic": 2153752772, + "fastwarpshockwavefix": 2153752800, + "clearvulturecutscene": 2153752904, "codeend": 2153754112, "copyfunc": 2153756496, "regularframeloop": 2153759408, diff --git a/version.py b/version.py index 86a260fc4..a156f0ad8 100644 --- a/version.py +++ b/version.py @@ -1,3 +1,3 @@ """Holds the version for DK64 Rando.""" -version = "5.14.74" +version = "5.14.77" diff --git a/wiki/article_markdown/custom_locations/CustomLocationsDoors.MD b/wiki/article_markdown/custom_locations/CustomLocationsDoors.MD index ae65b6de4..1fb9bb402 100644 --- a/wiki/article_markdown/custom_locations/CustomLocationsDoors.MD +++ b/wiki/article_markdown/custom_locations/CustomLocationsDoors.MD @@ -59,7 +59,7 @@ | Japes Under Ground | Chunky underground - right wall | Boss, Dk_Portal, Wrinkly | `self.logic = lambda _: True` | | Japes Under Ground | Chunky underground - Kasplat platform | Wrinkly | `l.can_use_vines and l.pineapple and l.ischunky` | | Jungle Japes | Next to the baboon blast pad | Boss, Dk_Portal, Wrinkly | `self.logic = lambda _: True` | -| Jungle Japes | Entrance door switch | Boss, Dk_Portal, Wrinkly | `l.can_use_vines and l.climbing` | +| Jungle Japes | Entrance door switch | Wrinkly | `l.can_use_vines and l.climbing` | | Jungle Japes | Next to level entrance | Boss, Dk_Portal, Wrinkly | `self.logic = lambda _: True` | | Jungle Japes | Against the mountain | Dk_Portal, Wrinkly | `self.logic = lambda _: True` | | Jungle Japes | Slope to Kong Cage | Boss, Dk_Portal, Wrinkly | `self.logic = lambda _: True` | @@ -287,7 +287,7 @@ | Fungi Forest | Mill front side - right | Boss, Dk_Portal, Wrinkly | `self.logic = lambda _: True` | | Fungi Forest | Mill right side - left | Boss, Dk_Portal, Wrinkly | `self.logic = lambda _: True` | | Fungi Forest | Mill right side - right | Boss, Dk_Portal, Wrinkly | `self.logic = lambda _: True` | -| Fungi Forest | Mill Roof - Sloped | Boss, Dk_Portal, Wrinkly | `self.logic = lambda _: True` | +| Fungi Forest | Mill Roof - Sloped | Wrinkly | `self.logic = lambda _: True` | | Fungi Forest | Mill Roof - tower | Boss, Dk_Portal, Wrinkly | `self.logic = lambda _: True` | | Fungi Forest | Boxes outside of Rafters Barn | Boss, Dk_Portal, Wrinkly | `self.logic = lambda _: True` | | Fungi Forest | Behind Night Thorns - right | Boss, Wrinkly | `self.logic = lambda _: True` | @@ -326,7 +326,7 @@ | Forest Mill Back | Mill - back side - In the hay | Boss, Wrinkly | `self.logic = lambda _: True` | | Forest Mill Back | Mill - back side - Crates near spider entrance | Boss, Wrinkly | `self.logic = lambda _: True` | | Forest Giant Mushroom | Giant mushroom - Top towards tag barrel | Boss, Dk_Portal, Wrinkly | `self.logic = lambda _: True` | -| Fungi Forest | Top of Giant Mushroom Exterior Exit | Boss, Dk_Portal, Wrinkly | `self.logic = lambda _: True` | +| Fungi Forest | Top of Giant Mushroom Exterior Exit | Wrinkly | `self.logic = lambda _: True` | | Fungi Forest | Night door in the owl tree | Boss, Wrinkly | `l.TimeAccess(Regions.HollowTreeArea, Time.Night) and l.jetpack and l.isdiddy` | | Forest Lanky Mushrooms Room | Lanky's colored mushrooms room | Dk_Portal, Wrinkly | `self.logic = lambda _: True` | | Forest Thornvine Barn | DK's Barn - Second floor | Boss, Wrinkly | `self.logic = lambda _: True` |