From 600343683aa5798d21ace4fe52cfb42d0549fd95 Mon Sep 17 00:00:00 2001 From: aerinon Date: Thu, 10 Feb 2022 08:36:30 -0700 Subject: [PATCH] Revert SRAM changes --- Main.py | 2 +- MultiClient.py | 4 ++-- RELEASENOTES.md | 2 ++ Regions.py | 2 +- Rom.py | 2 +- data/base2current.bps | Bin 82915 -> 82774 bytes 6 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Main.py b/Main.py index 9bb9dc67..d00ed5ad 100644 --- a/Main.py +++ b/Main.py @@ -31,7 +31,7 @@ from Utils import output_path, parse_player_names from source.item.FillUtil import create_item_pool_config, massage_item_pool, district_item_pool_config -__version__ = '1.0.1.3-v' +__version__ = '1.0.1.4-v' from source.classes.BabelFish import BabelFish diff --git a/MultiClient.py b/MultiClient.py index bc496f5b..4504fed7 100644 --- a/MultiClient.py +++ b/MultiClient.py @@ -90,8 +90,8 @@ INGAME_MODES = {0x07, 0x09, 0x0b} SAVEDATA_START = WRAM_START + 0xF000 SAVEDATA_SIZE = 0x500 -POT_ITEMS_SRAM_START = WRAM_START + 0x016018 -SPRITE_ITEMS_SRAM_START = WRAM_START + 0x016268 +POT_ITEMS_SRAM_START = WRAM_START + 0x016600 +SPRITE_ITEMS_SRAM_START = WRAM_START + 0x016850 ITEM_SRAM_SIZE = 0x250 RECV_PROGRESS_ADDR = SAVEDATA_START + 0x4D0 # 2 bytes diff --git a/RELEASENOTES.md b/RELEASENOTES.md index ce764cf5..43f3786a 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -144,6 +144,8 @@ Same as above but both small keys and bigs keys of the dungeon are not allowed o #### Volatile +* 1.0.1.4 + * Reverted SRAM change (the underlying refactor isn't done yet) * 1.0.1.3 * Fixed inverted generation issues with pottery option * Moved SRAM according to SRAM standard diff --git a/Regions.py b/Regions.py index 1b5401c7..b1226401 100644 --- a/Regions.py +++ b/Regions.py @@ -1077,7 +1077,7 @@ def create_pot_location(pot, pot_index, super_tile, world, player): def pot_address(pot_index, super_tile): - return 0x7f6018 + super_tile * 2 + (pot_index << 24) + return 0x7f6600 + super_tile * 2 + (pot_index << 24) # (type, room_id, shopkeeper, custom, locked, [items]) diff --git a/Rom.py b/Rom.py index 2e7c33d6..c8a2f1c1 100644 --- a/Rom.py +++ b/Rom.py @@ -35,7 +35,7 @@ from source.item.FillUtil import valid_pot_items JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = 'a25e589ca9359e73b0ed94cab8db107d' +RANDOMIZERBASEHASH = '749534eb511d0cfeb7c7b5a81803d4bb' class JsonRom(object): diff --git a/data/base2current.bps b/data/base2current.bps index 5e4a494197020922c39617ca79965edee8d0451c..52ccfd778b51ba1371d27273a02b921c8144a021 100644 GIT binary patch delta 2008 zcmWkue^is_6@C+v5NP-z;uau+V6bsgWi2X{6cUS8LyKKkm8rkLR4{ zx%WOlw)5|{@z1R1@RZjs$vuUfACS(gfV53xmB}ebm#RzURJAl=(B|tKhyf9T2tkA3 zO5RM5F&|VVTl0%L;O*g z?Gb}bLzu0GP`So@0$E85>7$|6-EYu0-DVdj2VC6bfaOYFgW#nAO|t!{(#kf3O&K1D zVfW4iYLNf#`LU;>w)%Ns(=fGd^-S%(EXfpYsbTNKpeGk%6~(^trc)MOOOrDs+r2jI zCd&mk$p_I74NR@!q+*r9{gLP)T@SE`LMpvGChnoBV1_LgnanSMMQu5zEAF+*xYM*l z?M_=fivSHB9=-PpO2?R^n;HlQ34*l61-Tp7V(}MKj#}zF~Mg_)`RHICERDdmo=7x~(G0X+rOyMQ17N_c({H1_xfP=p)?=(~;=lc`k zS%=!6wJ8Km$bGr%!QY_vn!F}H4*=i~%{1ab#^i>f4Uhfh)WF-KW#Ve_t<2CK;we+z zormm>?tR_+dOx|ORD#EwVrzO1bSW>zJmJlX??17-@SYZ%JjC-o=%SYTo}J>G~FromrsKZ)Z{F;{v{MOtD&BflaYi)g0KV%x^)gxX;>g+xc#s7^W@ z;I-ueHZdmv^IcpgPCag_o57Vueo|fJM>M;)&0HbfC9QPjukzb2gZHT|u)$hW_mw~7 z4%%}H*19x^sQQ^oYhSw30aq}3X2E;+hQJHq*rxHq@xsFfEcop`+qm*>YBP7S>ob~3 z#!Jf)ztt=2VL4-n=QKQy-EUVT#3A&7E+TajrIRR3L}8>eVhPXWYCdW&DtJ!+2ne^l zZ%|$g%^%7_IJu^Iz`J98fZg5amKwe3FWTcJast&iR!y*iC;uDVz#Wc!+mFN!n0R`1Btd%|@R8@^ zm}xJsblM^T&xPE1cJ&d=VOhXhW`v7`5@3zYWo(y}gGvq5`2Pn59zFA~-V`0;I7T?H zgQ3+v6Fw92X0iHEU}!$nR`gf&KNmi8@DC{Ij}+41IeGXPC*f~%gI^S(aBA2X&&)DjXUnX&}|)Dl&%D`gc$z_w|UTH$9#Z4w>c zImU{|F$bF7y6+Q0H)o958Sim53wj(H@jAH{JQP?P8rw;&bjtWruvCISr?6sl^3NIF zwcWK$E!2J{iW4Q`+u%Ue;?1gnB1{oJ<&BRJuVJ9~s)C%2YHcaq}W{~_z* zdfkboflz34+jY^m2q^Ot-h|@?aHtK3L+Z-B1bj_6-k{=a3ZIRxXTm8@It|d`4iJc%LsLUIR8j^X@5d=RIoA;A4 ziv1&7)`C}$lgt)8+2>H(s~zgA@98{S&Z4S2Xo(Xw&^NNjh=THhcEXvUH)Xly5NDr9 ze6M?t9#wzsj%q>j7WblyhJ~WI?$~V7>cltFP{wS|{5BJ6gP`<8>516;gU#QgN(Sv1rMa)L zsx|aFWY38GfH+{Uc_Tn_OQx6=$5(AUy*O2G>{adU!a(YlCTM1y_7>)6LXIno`6|@ov(x{Uf6**m$YMGVMdP66`tEGHCzZw>ab}+ zh4ecqv{$b8!5F5wh%zjQerI?ojk7Jxn)C@;vOwqz{YenWL zle5+9`N*jjEU>9A7lnb?Xk4;TUkro6AoHjG_v2)!`-ax7E!8dOf+v+k5v^yW17C(^ zN+&&m0r_ttwtaC1rrF|IBQh8wulm XigOyhA9FcPN@1sLbHdYqf0gln9KM0u delta 2149 zcmWlZ3s6&68plr{f#3uPs5K(5U=$o#jf#LZNgU_WfX_Y2^moC-dHi>%IMVWQZ_7|1~-R@Um_dpg_HSylV- zjjGyr{G(`js`ouOAik~`$e85aUecF)U7-Vgx#u>q>Vb?^*S=meknsyMe}xx5!AsJ; z7I3WAy<>&f_aaoJ`CgQnlh#|(fR;I^xP_83Z@D||!oU$hwUHBz9>_&=P~5Qkrbj1PcFy%*xVX#4jD@uJ%;^k$@L^N_X|rp%Ei!hu;WyWcN)t>vFN^ z5_h-?5a{BU`I2)dYFaL*%o%pi%Ooh#F#?u&K66^D!QBK-TRlXFt$KJ}yy{^;Fu^H* z!hob^OO4^%`*lydcFp|HK*mq9-Ld<{sX!0F-nOl0mXGXfeI;5%Z?oFMLf!~XOu5Raq+;q0I*|C2D95th*iQcV*j`&(RB(DI^#5YqvzVVL# zj{ii`rYZxIK;70_GA?{BzL&7#<_j?G^@G^!3RYd@Dss_UF3Uov#or)#t0nC-3y;%D zha2D=2CTY(qYM@>rR&;TL6^~gnAJqpG}sP`m1z%JBUckBl_Ci}mu{jxbbnB?rDxVQ z7fNcR%bQOHQBo^eI1kBadY;|6Das6Wy+%rOoC~fe0|83e?BycXcwt(XUo+x0Hy*l& zYBrDJl69jL$?b%;LfNOXqAtB`)OiK0AvVBDN9m!jMx)b4sePv~pXHQ@p6=+3l{UeJ zy@u{L!oJ)KYcH%lYC&6&?LzupX$_rXN6JR}N5|YPmLy@KYw1~}pg3M173;9P5FcQ& z5yivg!6qzg$LZ}@>01dZjJ`ahnOT=PPCf?MZ*wOn-s81xN$}yyh(6Vy*UIhcbQd+@ zSWM@mzbt;Zhb1Ef?h+>@b&|X0a)#vXoL}GmQTafJ{CUr6o(G?^9zQl8jkdv;FJvFaU9_6_k=Trk-#x+CGGqs zy(e7*HKV^%Q5{@l2i@Hgqer`Az1>p)fY-v;LjG?E^qrpYb%iGjPmT*;cdfKiJCXe- z+1-SnV^LVnsPm|BOrG%lzZt&`qjmuNCaP-D>_(d3LxSh@C8(wKX9gyH=f{Of!V<}y zgumt-Hur4UW}<>kHmAl%>#;b*DnN-OGc_|6D;L@<)!>?Ee(zu>8x6umagpjs9JFc3 zIR&5&t6I8Z78AIHH-ZI$V|1xAQg4|AMo$mgLy%3X)(v?rz2Oj@LqqhDTu)a`Kr^e6 zWcZ@}G{6xYSl>4$$113s0&fH6M!pT;)^8fR^h4qa?FlWdg}QQ4xG0)_MZOI{a)OHL z!v!8(Mp%}K=6A&qR+&Trs4MO5DX6%fMH5*=no^w427d0q#oz(dWJK?Tig)^ zUJI=~!RSNA$d>@iLdIHmCKy=2sx3#M&fZ$``8j+ZS{VPu!&8|HhGPi5l63RT@RwdS zIe69j2H4d|X0T%wR@n}qFX|}X*kJ7K!F1?|&+5a^*lM5sKS1@NOy7(IK4-U=+DlnA z-e2qU>W52g2k=IM`wBnkiw`*H%%r?tLW1hnDM#%HEZbJB2O%OM%J8 zsz;M@>1+ZG;B=Cb8>#h>TV+IAgFDzrDU4j@4cps*>7wux;;jVQLD4)WN?1`oO1;Ov zCZ1VToLc2-)UtmoouLC7iA*wIvMJG)G*PSo6w&QZ6f*pI4pLgu_B&Uv#Xa}()pqi7pd`u zVN7l=Yw<}BDtdF9zY8oMw`C|Y6q;Un`8X*IbQH?Jq*ugT^xS6E0b$*$E9?A$I0OKN zBf0vUAV{a5TqC9LfJei{%0t!vi}DjuR2}$y0Y>|_pdQ~{tpv9 BzT5x+