From 636819ffc00c27e7befe0e9aa800ca02fc529606 Mon Sep 17 00:00:00 2001 From: aerinon Date: Tue, 14 Mar 2023 16:05:28 -0600 Subject: [PATCH] Versioning update --- Main.py | 4 +++- RELEASENOTES.md | 9 +++++++-- Rom.py | 4 +++- data/base2current.bps | Bin 93980 -> 93979 bytes 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/Main.py b/Main.py index f6631ce5..69476418 100644 --- a/Main.py +++ b/Main.py @@ -34,7 +34,9 @@ from source.overworld.EntranceShuffle2 import link_entrances_new from source.tools.BPS import create_bps_from_data from source.classes.CustomSettings import CustomSettings -__version__ = '1.2.0.12u' +version_number = '1.2.0.13' +version_branch = '-u' +__version__ = f'{version_number}{version_branch}' from source.classes.BabelFish import BabelFish diff --git a/RELEASENOTES.md b/RELEASENOTES.md index fbfdfe5c..e2c23a11 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -109,8 +109,13 @@ These are now independent of retro mode and have three options: None, Random, an # Bug Fixes and Notes -* Unreleased Version - * MultiServer can not disable forfeits if desired +* 1.2.0.13u + * Allow green/blue potion refills to be customized + * OW Map showing dungeon entrance at Snitch Lady (West) fixed (instead of @ HC Courtyard) + * Standing item data is cleared on transition to overworld (enemy drops won't bleed to overworld sprites) + * Escape assist won't give you a free quiver in retro bow mode + * Fixed an issue where a door would be opened magically (due to original pairing) + * MultiServer can now disable forfeits if desired * 1.2.0.12u * Fix for mirror portal in inverted * Yet another fix for blocked door in Standard ER diff --git a/Rom.py b/Rom.py index 2fa2dee5..49ab7804 100644 --- a/Rom.py +++ b/Rom.py @@ -37,7 +37,7 @@ from source.dungeon.RoomList import Room0127 JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = '15edc718abbbd94ee34e15ae24b219a3' +RANDOMIZERBASEHASH = '29863ca305a8474c452cd13b3f921898' class JsonRom(object): @@ -1608,6 +1608,8 @@ def patch_rom(world, rom, player, team, enemized, is_mystery=False): rom.name.extend([0] * (21 - len(rom.name))) rom.write_bytes(0x7FC0, rom.name) + rom.write_bytes(0x138010, bytearray(__version__, 'utf8')) + # set player names for p in range(1, min(world.players, 255) + 1): rom.write_bytes(0x195FFC + ((p - 1) * 32), hud_format_text(world.player_names[p][team])) diff --git a/data/base2current.bps b/data/base2current.bps index aa3b0b2195ea6804734645a963163a4ac524d11b..832779a30453f400fad4258196d067eb09eafe59 100644 GIT binary patch delta 2651 zcmW+#dstLu8b9xuE0+-lW`;o#4+m66@tPT8;b`r8EidbuspXW2u%o7}SLE`Y0|y-O zFqhBagBf*3;dmI793CvnG_>_bTf4JQ`m}3nn5B>5RiMTV+RTF7mVQHOUC@(X88E zw#qFJ+Pg(|d#jw^EVBRZ?%3t=4zd-Zyt2NP4U2LV99ic?_Ci3;Z}PMM2*`tjPy1Yx zF10hr%RX+92X_e~`{(AcofG@;4LAT}@EbHc^7ekY&?T}P-|YB%7km0znBD%FVa+GC z?e+$deG_-n&rEoIzbtjfwawcKzgv!60}Zm87uj4!prwIVww)~-i5d2X$s9#r#Q*0En6TvA6C9I(6GlW-a5XRB(JE2>np zDFw7nKGQbw(D(REGUsKT7^!{-`S_}8MU8}HkN&F279*Le^|NpNY6>i)2W11a{|8F;ep`_J3FKD<~$gYxba1OOVL!YLcIec-e22GXHda(;!!RyzKSn@L*Q0 zmz|p7t_09?SQ_21HZH||VWZJ5<0Uy#`HCS^4CrJl6JB>?80bxEZFi}8oa)iAMVzQIM) ziDJ*ylwLJWH}{C9GdAFR78EO~ZXBGo2y%Mv&Z-)rh|<-)8^P9-edVR1n!c@De`qTk za~|hU4t!x^zC+Ozi89S@RtyQT?h|B6G@J7M&}E(X(Yz`0(gC2VO;5feus52wnmkif6QI&ke8Bp}vy{n3@NGO-NO*4BOw6CRDgY{_2R*ZjKe$Pa(y#>uN1;RFCN*=m{FMyrPa5|S~XiOLd}#?+DND5?G1 zb5tDe_UY=#DGlV%nmY2S26ACJ`B4Lf8QlZZ&e6`U5_N3)!tX0^z3Y$r=`V9i$U-gT z4%<>EuQ4~$%~}T{Og5?1!aQSaQ@o8&ORNInIdvc3$LXoB?h>=&0FR*jz(%m zTQ5+|D6&8YMeqUZHjs+C-Q^9 zw6WS&j>bDMp1*-cu0Rz9taU=PT75%EPY|`$0_U$p`C6239&OiMR%f3sXMl`Z4EIQU`+OS@lLlhP<&r3 z>An-is-wQOG{UdHnuY}9b-947G{7X?%uz-ZO3Nlq24K=J;>}&Y7esIW5EV-Zm@9bv z1UYYj%H=CJ@5AM*1Ks@)*GT(pcIQbglF6>s0W$lPm+c7i&Y)&=Ah09h8_9W-QbpAv zDqbBdof7!l;nT@$tnV0<`x=PqZ7Kc3JoJ?-L3hwNj(CSblO`{(g{&iaDX_KVmM=^z z?3#%ChvL@2i%#D|g?<{Q)~h)CyiB5}&|!7_>U#8xYqPJf)Y8Z$xjV$UUdE0?en};S z>$HDb`tDh^4aE{9wEzlNkwH?2D(n4>%fpnA$0;x}dlm1%UmxG`&b1bgq*4gyU}TTP zFx?)Tonn3@Po+ZcGwG$i+ns0Q7i~jSheRqQ|69~F}wwv=FQF8MeWSZxKHfrM@3zM?~vSdB0S z?)A&|lu7osnhu~8W{@Ea68_#;J^tI<hi4IqAyVDhPkkWJ* zr<%%Og41C#txF&m(_y?Z(BeKy7Hvl7+b>t2og8NZ1Wd3bAvI08wK$N~WR(eKq%R{l zm6vo>Otokki5T-wW)CCBOfZW1&@WqS?)c@7K1W<`ea>>_O5}c?BHPv$#*gR~(%m+} zX!9_e2?d|8Jun?tt+Sxe zJTf~2md%Mtt3qukUMc8 z@F=R1C}#w~S#GBmT?}+uod>v;&Ffg<2o+m=@=;ul=a2#4^5y%3Rb(Ioo-w~s$4)=g z?A&=Gl(tEBB~ymriX9ioG%HM0&0Og1U2lb-bSX7^YA<|6 TJ0cGrF3@Xc=0Chs#n${E3=cYS delta 2633 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