From 3f5eafb74f41507b46c32d66726f1575b8de54aa Mon Sep 17 00:00:00 2001 From: aerinon Date: Tue, 2 Jan 2024 18:01:54 -0700 Subject: [PATCH] fix: muradahla typo fix: remove warp in inverted after aga1 defeated fix: shopsanity repeatable item bug --- RELEASENOTES.md | 3 +++ Rom.py | 5 +++-- data/base2current.bps | Bin 117546 -> 117551 bytes source/enemizer/OwEnemyList.py | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 436e53be..bd95dd40 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -144,6 +144,9 @@ These are now independent of retro mode and have three options: None, Random, an * 1.4.0.1v * Key logic: Vanilla key logic fixes. Statically set some HC logic and PoD front door * Generation: Fix a broken tile pattern + * Inverted: Castle warp should not appear after defeating Aga 1 + * Murahdahla: Should not disappear after Aga 1. May fix other subtle issues. + * Shopsanity: Buying multiple of an item in the potion shop should no longer increase item count. * 1.4.0.0v * Initial support for HMG (Thanks Muffins!) * Generation: fix for bunny walk logic taking up too much memory diff --git a/Rom.py b/Rom.py index 1f533b5d..376e3695 100644 --- a/Rom.py +++ b/Rom.py @@ -40,7 +40,7 @@ from source.enemizer.Enemizer import write_enemy_shuffle_settings JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = '4d1f3e36e316077823a3e2eb5359ca17' +RANDOMIZERBASEHASH = '65b433946c72953780d82cdc0bb8fe8e' class JsonRom(object): @@ -2483,7 +2483,8 @@ def set_inverted_mode(world, player, rom): write_int16(rom, 0xDBA71 + 2 * 0x35, 0x06A4) if world.shuffle[player] in ['vanilla', 'dungeonssimple', 'dungeonsfull']: rom.write_byte(0xDBB73 + 0x35, 0x36) - rom.write_byte(snes_to_pc(0x09D436), 0xF3) # remove castle gate warp + # rom.write_byte(snes_to_pc(0x09D436), 0xF3) # remove castle gate warp + del world.data_tables[player].ow_enemy_table[0xab][5] if world.shuffle[player] in ['vanilla', 'dungeonssimple', 'dungeonsfull']: write_int16(rom, 0x15AEE + 2 * 0x37, 0x0010) # pyramid exit to new hc area rom.write_byte(0x15B8C + 0x37, 0x1B) diff --git a/data/base2current.bps b/data/base2current.bps index bce1390a3bf9807351fb15408bc4ff3547866f09..82ba7e59286cfe2e14a4d035c37e95edf38084d6 100644 GIT binary patch delta 1106 zcmWks4NOyK6z%QfwLn3{2^OuiHqwg9@6aJX3Q;mg$!w{v6~@K_PP7i06Eg_HYqc8> zS6}c$K3KyFt!OJ_EPIPD7|9shvNYKy$>tW=;?!A{^3!HI=cerKac^>R&b>J~$<4jo zEgk8W_7lWJc_B*>N5oKr8p!V=WAD3z7y8usXqRLU)U#cZ7=SuCCL9s8l|&sZ@r z!=6pr4AP7T?%*VSmi=;dH9!wiD+*#R3Ztc(>{KtZhZW}lRh2wt>SOfz%#Ms&EHb~JV67V2qi>rujfuu-@uYr2HQ4W80pU`A z9E3~!%OPCkS3o%5ABENimC%9;1)M@vK^xSfTfw)gqjKA=YTR;#NqRaTeYqtwkQXQk zln0ImS^^{Gk6KqV0{m+kNx}6+?ba06)@!J6i$IXgn!?za`cpVPv)!t}2d`N*uIMoo zzg1AeQp4D2&7)R)0u9gRtv_fCjV=($>Wdv0EKK9W)?tEh)$a=p`XU@+u@4*s;WQxG z+&XatgVN^`p$e7EX%ido`L?I^e$87($N5w~)H}|PPM~CDn=1nox<2<3>_tiQ+uR95wp#G<-);;)Bf?U(@GNC(g2Rt>voTGgQ{d2RNOpl)(WpnZN0@E06mo782xe z9RHdExlqlm)PN31*kT{5;A*unm?V}YVp%a9f)cK=7;>Xw2mV9{8=;h&(m~V8s5WD# zor*Ww%v@zPJQhc8%eLDmmLmhVzXtT0D8-vzTFuLyM(#5jN+QUbno*C8d**;ya>Xkz zdTCjk=iKYGHLg28Y0RU;{~(~H3X9jObd_Pc3%a635wb{*vIrspA(SFd@1`oLi}o) zX;Y?vGu(duMmNK_HK7C!44i*D+FhfJnHZE2_ z7<~^PFZJG6^AFUg9!#m#m(Vwl-f7%}MP+BfTsE?ON29N3Of*i5eTE6Ov(Fm|T#k1k zaC)yCxb@yR;Ih0b@P#?uUJ!H1!Uiw$Nt|v@CD17R@jzSpN$QTkqk#+e#sEi7sTK3a zsrY&0gnZI^qg&5~Xs%!BLu;vRO`E3V&ZV4g7@Y{zKn3y#YK)C*Tg)0_KXcLtsA5Q|vs z1`9#-~uDwn$%aL?jMI9)kn_cgsptEbd!3|d7 zSd~386hF5SGSHs6#N>$kW)rUd2Gb9b}fOWNicIz5RL#LXgZmHb^NFPjvP*fY#Dpn;=;=M_e zmh1cr9;9;&Q~GaxM!FGGB0=OC%*bXq!aL zri6luh)$0?lRi#*_>HN2uHpJi#t2_b9tc^tq(8$2c>3-VmFtkH3P4{cu9 zxkx$Y*o^c-vt%