From 14ced2435c4ae4829ee27f26198160fce25e805f Mon Sep 17 00:00:00 2001 From: aerinon Date: Mon, 6 Mar 2023 16:29:58 -0700 Subject: [PATCH 1/3] Update for enemizer bits --- RELEASENOTES.md | 3 ++- Rom.py | 4 ++-- source/classes/CustomSettings.py | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index ac51ccda..e87d4a22 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -112,8 +112,9 @@ These are now independent of retro mode and have three options: None, Random, an * Fixed an issue with lower layer doors in Standard * Fix for doors in cave state (will no longer be vanilla) * Added a logic rule for th murderdactyl near bumper ledge for OHKO purposes + * Enemizer alteration for Hovers and normal enemies in shallow water * Fix for beemizer including modes with an increased item pool - * Fix for district algoritm + * Fix for district algorithm * 1.2.0.10u * Fixed overrun issues with edge transitions * Better support for customized start_inventory with dungeon items diff --git a/Rom.py b/Rom.py index 981b554a..13b4f133 100644 --- a/Rom.py +++ b/Rom.py @@ -1684,8 +1684,8 @@ def write_custom_shops(rom, world, player): def write_enemizer_tweaks(rom, world, player): if world.enemy_shuffle[player] != 'none': - rom.write_byte(snes_to_pc(0x1DF6D8, 0)) # lets enemies walk on water instead of clipping into infinity? - rom.write_byte(snes_to_pc(0x0DB6B3, 0x82)) # hovers don't need water necessarily? + rom.write_byte(snes_to_pc(0x1DF6D8), 0) # lets enemies walk on water instead of clipping into infinity? + rom.write_byte(snes_to_pc(0x0DB6B3), 0x82) # hovers don't need water necessarily? def hud_format_text(text): output = bytes() diff --git a/source/classes/CustomSettings.py b/source/classes/CustomSettings.py index fd15253f..53105764 100644 --- a/source/classes/CustomSettings.py +++ b/source/classes/CustomSettings.py @@ -129,8 +129,8 @@ class CustomSettings(object): args.mapshuffle[p] = True args.compassshuffle[p] = True - args.shufflebosses[p] = get_setting(settings['shufflebosses'], args.shufflebosses[p]) - args.shuffleenemies[p] = get_setting(settings['shuffleenemies'], args.shuffleenemies[p]) + args.shufflebosses[p] = get_setting(settings['boss_shuffle'], args.shufflebosses[p]) + args.shuffleenemies[p] = get_setting(settings['enemy_shuffle'], args.shuffleenemies[p]) args.enemy_health[p] = get_setting(settings['enemy_health'], args.enemy_health[p]) args.enemy_damage[p] = get_setting(settings['enemy_damage'], args.enemy_damage[p]) args.shufflepots[p] = get_setting(settings['shufflepots'], args.shufflepots[p]) From 4563f96fd5d6c8066c23e3868379b1b39e6ef15a Mon Sep 17 00:00:00 2001 From: aerinon Date: Wed, 8 Mar 2023 08:25:46 -0700 Subject: [PATCH 2/3] Fix for mirror portal in inverted Yet another fix for blocked doors in Standard ER, minor alteration for the swamp entrance fix to work when blocked as well. --- RELEASENOTES.md | 3 +++ Rom.py | 2 +- data/base2current.bps | Bin 93909 -> 93952 bytes 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index e87d4a22..317db6b2 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -108,6 +108,9 @@ These are now independent of retro mode and have three options: None, Random, an * Bonk Fairy (Dark) # Bug Fixes and Notes +* 1.2.0.12u + * Fix for mirror portal in inverted + * Yet another fix for blocked door in Standard ER * 1.2.0.11u * Fixed an issue with lower layer doors in Standard * Fix for doors in cave state (will no longer be vanilla) diff --git a/Rom.py b/Rom.py index 13b4f133..0ca8e140 100644 --- a/Rom.py +++ b/Rom.py @@ -37,7 +37,7 @@ from source.dungeon.RoomList import Room0127 JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = 'badc0c787f7ab5e0ad05fb517953849a' +RANDOMIZERBASEHASH = '4faba57f154a2263bf91af041a0d8700' class JsonRom(object): diff --git a/data/base2current.bps b/data/base2current.bps index 57c2f8b618b86d3c6a8124c7723b85ac68063570..5a239f15ad6edbb9e939796d1ecad384d3162259 100644 GIT binary patch delta 1256 zcmX9)e^8TU9Dl$2#RljGylhMnpS_5V#0xbEMU5-7LOSf^N)vUFoY>5(oC}DgTt6iTHxXkKN4K*brQmKm+HNRlwZXMcGv;L}CNVWCr{e zYoWhgE6Mc4YBmq<0y+kXvI+>0aw!;f(k9o)+EOVVf8Y?w5+_>d znD%)o+uNZyvutQsR*aJ>Ud95dY{xTrjV!Rg(~X)OsD=$R4aRnoAJs4?Z|{jq?G9dw zLY*e$a_|U!;wY}9(63~s1`5h*hAeXb&IZ@5{$XLXI7Nkc3N>-8gijNRi28ZCO9t5A zjJO^N@^CE0XObijx*)SKEM`m!U%Ev{Yw)xA*svL2|9%9OY9a*fW>oBR_ zjZYu_x@EXjKrFeE1Fq~>#aP{qV~(xKBu5S#B)5KJfNX+;rreGBOKd!4zoQ=!IxXF*nV;RQTW+(U^S)>X z+T)9^M655mmjt!Iv^uBpTY-XlEoRTsfn~e2*sDM-;ZZu^di4Zf8IXx&k`A0tB3Bc{Z*@S~nDw=S@p9I}^$0+^V^R8Oa&CA=sk_Rrt0#r6(E zi_)TFzL?(K~%Uh44I#?LU*=9BU73t_5Csad_F J=fd8H%)iX72q6Ff delta 1257 zcmW+ze@s(n6n(cpXrY8sCi3+ak{ug&4llD zJksKzeSOxiv?DF(TU!iiUCpXXu;_Gax3FO%iPJcR#Dx7JdphPEE_BcRb)W`KP%8N>%?&`gvdoE`4`DYzB+I+oE#=del~YEEue!7V8qCyUjv(kduo zKmOT4>fU)i*?K?5jAaD{8uNrCSc>wwOjaoKAK%XYBhqrTn-$3c7R|WK)-vn=)a@6P z#gkg!(m(#YTf~c5RONml^HL_%mGfOW8COGT-hMaQ#01~Jkk~|K)lk{ldTH`gH!nqz zZYyHkJVGwFv4KLry15EW>s@vlarV(`CSGaGQVeA^X2JZBA}cP_^1#7;o`=Ju!VOW0 z@D$q5F%n)OHX<74r#Bhdw2AZ-LQzHg zx3tn_ACdDiq+@4B`)@ERZm2ikYE%bykxPY8lT)WJ#Y{7qDg-_B5t#;FflP9VM!a$D zWe#h{(&R)DY*4FD+olV- z9bQj)g}WC2L2ebn)|>+@{RXKgreau>`{6EUpw{LLRFLLk(e*v@Nipo#9P_z`h~*Hz zdhUmgQImjQONgoj8Z?K_1nP0Gxb``5(D|g@ zPIi@mZc84?!{?{Y9%LqscY2zJr%kDl5H@GW<~q<*pZKn`1>Fpk|_ZLEF(`!;4MvlrQfMDSX~)b@B9AT z9ik#@bkMl!Fz-~x=3L#;3C*-ATFUI0eIOw%IRXBf$u_s#nG(9`Gr0v{KW?pe(&)TD zu0qZJ_?xKBA3s8V)`4CX{9v~ZGuO4jlQsgSu&DE>O^3Z*s3ZDJ`%{GZci_s-S7~Qd znH#>wuy_W2HE;z($uwf|xY!(cyva>W=8LNYGB&_UdqNS9OPt$lpEX&E@klg%nw1 z?d|15nY!e*<^B<~!{Bg4X0%3!BhAGJBj&Ur?MOGRC*>t2c$~=-1I~BGr95Se0@w~V zP!<>FEd+X zJtU{*bVfh4ke!)H2|_rN%?jEZp^3-j;|)Gq;j*(5Jc*}>@ihrv(%oi$=BYXmpmPGS z`B73=29{jdNA^~OK_c6n?5zehfRYU8VXb;~r-MDP(iRHEYF~E;RwiflFT~2^LJiC} NDXTUj^o_@2{STKc5XJxi From 44afe50bf4ca08504006eb9ec300d0f9a14196f0 Mon Sep 17 00:00:00 2001 From: aerinon Date: Wed, 8 Mar 2023 08:26:50 -0700 Subject: [PATCH 3/3] Version bump --- Main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Main.py b/Main.py index 2a334081..f731df8a 100644 --- a/Main.py +++ b/Main.py @@ -34,7 +34,7 @@ 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.11u' +__version__ = '1.2.0.12u' from source.classes.BabelFish import BabelFish